From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
index bec9df9..70872cb 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
@@ -9,17 +9,25 @@
   import * as echarts from 'echarts'
   export default {
     name: 'conparativeAnalysisPie',
-    propa:{},
+    props:{ dataList:''},
     data(){
       return{
         closeRate:0,
         openRate:0,
         usedRate:0,
         waitRate:0,
+        RateList:[]
       }
     },
     created(){
 
+    },
+    watch:{
+      dataList(val){
+        this.RateList = val
+        console.log(val)
+        this.drawTu()
+      },
     },
     mounted() {
       this.drawTu()
@@ -105,6 +113,30 @@
               {value: 0, name: '鍏虫満鐜�'}]
           }]
         };
+        if(this.RateList != null){
+          this.closeRate =[]
+          this.openRate =[]
+          this.usedRate = []
+          this.waitRate = []
+          if(this.RateList.length>0){
+            this.closeRate=this.RateList[0].closeRate
+            this.openRate=this.RateList[0].openRate
+            this.usedRate=this.RateList[0].processRate
+            this.waitRate=this.RateList[0].waitRate
+            pieCompChartOption1.series[0].data = [{value:(this.openRate * 100).toFixed(2), name:'寮�鏈虹巼'},{value:(this.closeRate * 100).toFixed(2), name:'鍏虫満鐜�'}];
+            pieCompChartOption2.series[0].data = [{value:(this.usedRate * 100).toFixed(2), name:'鍔犲伐鐜�'},{value:(this.waitRate * 100).toFixed(2), name:'寰呮満鐜�'},{value:(this.closeRate * 100).toFixed(2), name:'鍏虫満鐜�'}];
+            pieCompChart1.setOption(pieCompChartOption1);
+            pieCompChart2.setOption(pieCompChartOption2);
+          }else{
+            pieCompChart1.setOption(pieCompChartOption1);
+            pieCompChart2.setOption(pieCompChartOption2);
+          }
+
+        }else{
+          pieCompChart1.setOption(pieCompChartOption1);
+          pieCompChart2.setOption(pieCompChartOption2);
+        }
+
         pieCompChart1.setOption(pieCompChartOption1);
         pieCompChart2.setOption(pieCompChartOption2);
         window.addEventListener('resize', function() {

--
Gitblit v1.9.3