|
@@ -383,7 +383,22 @@ import { calculateOption } from "../../common/options"
|
|
|
return arr.find(_=>_.source == item.source || _.source == item.source2);
|
|
|
},
|
|
|
handleEditCal(v){ //编辑状态
|
|
|
- this.calculationItem = v;
|
|
|
+ const getManySourseJump = (item) => {
|
|
|
+ let i = this.checkedLinkList.find(_=>_.RId == this.activeItem.RId);
|
|
|
+ if(i && i.calculationMethod && i.calculationMethod.length > 0){
|
|
|
+ let calItem = i.calculationMethod.find(_=>_.source == item.source || _.source == item.source2);
|
|
|
+ let _ = !calItem ? item : {
|
|
|
+ ...item,
|
|
|
+ source:calItem.source
|
|
|
+ }
|
|
|
+ return _;
|
|
|
+ } else {
|
|
|
+ return item;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ let hasManySource = v.source2 ? true : false;
|
|
|
+ this.calculationItem = !hasManySource ? v : getManySourseJump(v);
|
|
|
this.isOpenCalculationDia = true;
|
|
|
this.dialogDisplayNone = true;
|
|
|
},
|
|
@@ -549,7 +564,9 @@ import { calculateOption } from "../../common/options"
|
|
|
const chartTypeMap = {
|
|
|
7: this.initBarData, //柱形图
|
|
|
10: this.initSectionScatterData, //截面散点
|
|
|
- 11: this.initRadarData(res.Data)
|
|
|
+ // (res.Data)
|
|
|
+ 11: this.initRadarData, //雷达图
|
|
|
+ 14:this.initSectionalCombinationChart, //截面组合图
|
|
|
}
|
|
|
chartTypeMap[this.chartInfo.ChartType] && chartTypeMap[this.chartInfo.ChartType](res.Data);
|
|
|
|