From dd09ea9ab90c89bf5ef78236d02a33bafdcad591 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 18 三月 2025 17:18:03 +0800
Subject: [PATCH] 新增走航融合模块网格融合功能（待完成）
---
src/model/Factor.js | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/model/Factor.js b/src/model/Factor.js
index 1aaa149..5a720c1 100644
--- a/src/model/Factor.js
+++ b/src/model/Factor.js
@@ -51,6 +51,7 @@
this.factorId;
this.heights = []; //3d鍦板浘褰撳墠灞曠ず鍧愭爣鐐瑰搴旂殑楂樺害鏁扮粍
this.colors = []; // 3d鍦板浘褰撳墠灞曠ず鍧愭爣鐐瑰搴旂殑棰滆壊鏁扮粍
+ this.bottomColors = []; //鏈�灏忓�煎搴旂殑鍥句緥鑹叉暟缁�
this.bottomColor; //鏈�灏忓�煎搴旂殑鍥句緥鑹�
this.min = -1; // 褰撳墠鏄剧ず鐨勬渶灏忓��
this.max = -1; // 褰撳墠鏄剧ず鐨勬渶澶у��
@@ -60,21 +61,32 @@
this.standardMax = -1; //鐩戞祴鍥犲瓙绫诲瀷瀵瑰簲鐨勬爣鍑嗘渶澶у��
this.legendType = Legend.S_TYPE; //鍥句緥妯″紡
+ // this.legendType = Legend.D_TYPE; //鍥句緥妯″紡
- if (options != undefined) {
- this.datas = options.datas;
- this.heights = options.heights;
- this.min = options.min;
- this.max = options.max;
- this.originMin = options.originMin;
- this.originMax = options.originMax;
+ if (typeof options === 'object') {
+ for (const key in options) {
+ if (Object.prototype.hasOwnProperty.call(options, key)) {
+ const value = options[key];
+ this[key] = value;
+ }
+ }
- this.factorName = options.factorName;
- this.factorId = options.factorId;
- this.colors = options.colors;
- this.bottomColor = options.bottomColor;
- this.standardMin = options.standardMin;
- this.standardMax = options.standardMax;
+ // this.datas = options.datas;
+ // this.heights = options.heights;
+ // this.min = options.min;
+ // this.max = options.max;
+ // this.originMin = options.originMin;
+ // this.originMax = options.originMax;
+
+ // this.factorName = options.factorName;
+ // this.factorId = options.factorId;
+ // this.colors = options.colors;
+ // this.bottomColors = options.bottomColors;
+ // this.bottomColor = options.bottomColor;
+ // this.standardMin = options.standardMin;
+ // this.standardMax = options.standardMax;
+
+ // this.legendType = options.legendType;
}
}
@@ -125,12 +137,12 @@
this.heights = [];
this.colors = [];
this.datas.forEach((d) => {
- var h = getFactorHeight(d.factorId, d.factorData, [this.min, this.max]);
+ let h = getFactorHeight(d.factorId, d.factorData, [this.min, this.max]);
if (d.factorData == -1) {
h = -1;
}
this.heights.push(h);
- var c = Legend.getColor(
+ const c = Legend.getColor(
this.factorName,
this.legendType,
d.factorData,
@@ -138,6 +150,8 @@
this.max
);
this.colors.push(c);
+ const b = Legend.getPreviousColor(this.factorName, this.legendType, c);
+ this.bottomColors.push(b);
// this.heights.push(d.factorData)
});
this.bottomColor = Legend.getColor(
@@ -182,6 +196,7 @@
originMax: this.originMax,
factorName: this.factorName,
colors: this.colors,
+ bottomColors: this.bottomColors,
bottomColor: this.bottomColor,
standardMin: this.standardMin,
standardMax: this.standardMax
--
Gitblit v1.9.3