Browse Source

相关性图表新增编辑入口替换

cxmo 10 months ago
parent
commit
eee2b6f9c5

+ 1 - 1
src/views/chartRelevance_manage/relevance/components/multipleIndForm.vue

@@ -482,7 +482,7 @@ export default {
         },
         },
         checkLimitFactor(){
         checkLimitFactor(){
             let total = 0
             let total = 0
-            this.factorList.forEach(i=>total += i.EdbMappings+)
+            this.factorList.forEach(i=>total += i.EdbMappings)
             return total<=100
             return total<=100
         },
         },
         //格式化因子系列计算方式的格式
         //格式化因子系列计算方式的格式

+ 2 - 1
src/views/chartRelevance_manage/relevance/list.vue

@@ -402,7 +402,8 @@ export default {
     /* 添加图表 */
     /* 添加图表 */
     goAddChart() {
     goAddChart() {
       if (!this.treeData.length) return this.$message.warning("请先添加分类");
       if (!this.treeData.length) return this.$message.warning("请先添加分类");
-      this.$router.push({ path: "/relevancechartEditor" });
+      //this.$router.push({ path: "/relevancechartEditor" });
+      this.$router.push({ path: "/relevancechartEditorV2" });
     },
     },
 
 
     /* 获取分类 */
     /* 获取分类 */

+ 4 - 2
src/views/mychart_manage/components/chartDetailDia.vue

@@ -1318,7 +1318,8 @@ export default {
       }else if([2,5].includes(this.chartInfo.Source)){
       }else if([2,5].includes(this.chartInfo.Source)){
         path='/addCommodityChart'
         path='/addCommodityChart'
       }else if([3,4].includes(this.chartInfo.Source)){
       }else if([3,4].includes(this.chartInfo.Source)){
-        path='/relevancechartEditor'
+        //path='/relevancechartEditor'
+        path='/relevancechartEditorV2'
       }else if(this.chartInfo.Source===6){
       }else if(this.chartInfo.Source===6){
         path='/fittingEquationChartEditor'
         path='/fittingEquationChartEditor'
       }else if([7,8,9].includes(this.chartInfo.Source)) {
       }else if([7,8,9].includes(this.chartInfo.Source)) {
@@ -1332,7 +1333,8 @@ export default {
         path,
         path,
         query: {
         query: {
           code: this.chartInfo.UniqueCode,
           code: this.chartInfo.UniqueCode,
-          from: 'mychart'
+          from: 'mychart',
+          type:this.relevanceChartData.CorrelationChartInfo.AnalysisMode
         }
         }
       })
       })
       window.open(href,'_blank');
       window.open(href,'_blank');