预算执行优化

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -831,6 +831,7 @@ import ProjectImportListModal from '../projectImportList/modules/ProjectImportLi
         console.log(record)
         this.$refs.xushi.open(record)
       },
+      // 对比禁选判断
       onSelect(record, selected, selectedRows, nativeEvent){
         console.log(record, selected, selectedRows, nativeEvent)
         console.log(record.children)

src/views/module_kzks/projectXushiContrast/contrastGraph.vue

@@ -25,89 +25,52 @@ export default {
         console.log(1111,record)
         this.model = Object.assign({}, record);
         console.log(22222,this.model)
+        var yusuan = []
+        var zhixing = []
+        yusuan.push(this.model.clys)
+        yusuan.push(this.model.wxys)
+        var a = this.model.wxys + this.model.clys
+        yusuan.push(a)
+        zhixing.push(this.model.clf)
+        zhixing.push(this.model.wxf)
+        var b = this.model.wxf + this.model.clf
+        zhixing.push(b)
+        console.log(7777,yusuan,zhixing)
         let that = this
         this.zheChart.setOption({
+            yAxis: [
+                {
+                type: 'category',
+                data: ['材料费','外协费','总计']
+                }
+            ],
             series: [
                 {
                 name: '预算',
                 type: 'bar',
-                data: [that.model.estimationcoat],
-                emphasis: {
-                    focus: 'series'
-                },
-                },
-                {
-                name: '材料费',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.clf]
-                },
-                {
-                name: '专用费',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.zyf]
-                },
-                {
-                name: '外协费',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.wxf]
-                },
-                {
-                name: '事务费',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.swf]
-                },
-                {
-                name: '管理费',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.glf]
-                },
-                {
-                name: '燃料动力费',
-                type: 'bar',
-                stack: 'Ad',
+                data: yusuan,
                 emphasis: {
                     focus: 'series'
                 },
-                data: [that.model.rldlf]
                 },
                 {
-                name: '工资及劳务费',
+                name: '执行',
                 type: 'bar',
                 stack: 'Ad',
                 emphasis: {
                     focus: 'series'
                 },
-                data: [that.model.gzjlwf]
-                },
-                {
-                name: '装机成本',
-                type: 'bar',
-                stack: 'Ad',
-                emphasis: {
-                    focus: 'series'
-                },
-                data: [that.model.zjcb]
-                },
+                data: zhixing
+                },
+                // {
+                // name: '外协费',
+                // type: 'bar',
+                // stack: 'Ad',
+                // emphasis: {
+                //     focus: 'series'
+                // },
+                // data: [that.model.wxf]
+                // },
             ]
         });
     },
@@ -137,12 +100,12 @@ export default {
                 type: 'value',
                 }
             ],
-            yAxis: [
-                {
-                type: 'category',
-                data: ['Mon']
-                }
-            ],
+            // yAxis: [
+            //     {
+            //     type: 'category',
+            //     data: ['Mon']
+            //     }
+            // ],
         };
         option && this.zheChart.setOption(option);
     },