浏览代码

逻辑图bug修复

cldu 4 月之前
父节点
当前提交
973af0ecab

+ 4 - 0
src/views/sandbox_manage/common/customize.js

@@ -173,6 +173,7 @@ export default {
                   : this.$store.state.sand.styleConfig.dataTextColor,
             },
           },
+          zIndex:0,
           data: linkItem,
         });
         childNodeCells.push(currentNode)
@@ -186,6 +187,7 @@ export default {
                   stroke:this.$store.state.sand.styleConfig.lineColor
                 }
               },
+              zIndex:0,
               source: {
                 cell: select_cell.id,
                 anchor: {
@@ -233,6 +235,7 @@ export default {
                 fill: this.$store.state.sand.styleConfig.titleTextColor ,
               },
             },
+            zIndex:0,
             data: linkItem,
           });
           cells.push(titleNode);
@@ -287,6 +290,7 @@ export default {
                   "pointer-events": "none",
                 },
               },
+              zIndex:0,
               data: item,
             });
             cells.push(innerNode)

+ 4 - 0
src/views/sandbox_manage/common/mindmap.js

@@ -858,6 +858,7 @@ export default {
                   fill:data.type == 'datanode-title' ? this.$store.state.sand.styleConfig.titleTextColor  :  'transparent',
                 }
               },
+              zIndex:0,
               data:data.data,
             })
             cells.push(wrapNode);
@@ -886,6 +887,7 @@ export default {
                     'pointer-events': 'none',
                   }
                 },
+                zIndex:0,
                 data:data.data,
               })
               cells.push(currentNode);
@@ -913,6 +915,7 @@ export default {
                     fill:this.$store.state.sand.styleConfig.titleTextColor 
                   }
                 },
+                zIndex:0,
                 data:data.data,
               });
               cells.push(titleNode);
@@ -959,6 +962,7 @@ export default {
                       'pointer-events': 'none',
                     },
                   },
+                  zIndex:0,
                   data:v,
                 });
                 cells.push(innerNode);

+ 19 - 2
src/views/sandbox_manage/sandFlowNew/components/addLInkDia.vue

@@ -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);