Эх сурвалжийг харах

认可准则条款核查——评审前核查计划编制列表——进度视图bug修复

shenqilong 6 сар өмнө
parent
commit
2523fab4d3

+ 17 - 7
src/views/system/jbdScan/approve/approveJS.js

@@ -26,7 +26,7 @@ export default {
     getPosition() {
       const { deptList = [] } = this.$store.getters || {}
       this.positionList = deptList
-        .filter((i) => i.depth === '4')
+        .filter((i) => i.depth === 4)
         .map((i) => i.positionName)
     },
     getColorRe(list) {
@@ -195,7 +195,12 @@ export default {
             return item.value === 0 ? '' : item.value
           })
           const accept = echarts.init(this.$refs.Echart2)
-          accept.setOption({ ...this.barData(list1, list2, list3, list4) })
+          const deptList = data4.map((item) => {
+            return item.name
+          })
+          accept.setOption({
+            ...this.barData(list1, list2, list3, list4, deptList)
+          })
         }
       })
     },
@@ -232,7 +237,12 @@ export default {
             return item.value === 0 ? '' : item.value
           })
           const accept = echarts.init(this.$refs.Echart2)
-          accept.setOption({ ...this.barDataPlan(list1, list2, list3) })
+          const deptList = data1.map((item) => {
+            return item.name
+          })
+          accept.setOption({
+            ...this.barDataPlan(list1, list2, list3, deptList)
+          })
         }
       })
     },
@@ -314,7 +324,7 @@ export default {
       accept.setOption(JSON.parse(JSON.stringify(option)))
       // this.show1 = true
     },
-    barData(data1, data2, data3, data4) {
+    barData(data1, data2, data3, data4, deptList) {
       const barDataTy = {
         // 图例设置
         legend: {
@@ -338,7 +348,7 @@ export default {
         xAxis: {
           name: '部门',
           type: 'category',
-          data: this.positionList,
+          data: deptList,
           axisTick: {
             alignWithLabel: true
           },
@@ -420,7 +430,7 @@ export default {
       }
       return barDataTy
     },
-    barDataPlan(data1, data2, data3) {
+    barDataPlan(data1, data2, data3, deptList) {
       const barDataTy = {
         // 图例设置
         legend: {
@@ -444,7 +454,7 @@ export default {
         xAxis: {
           name: '部门',
           type: 'category',
-          data: this.positionList,
+          data: deptList,
           axisTick: {
             alignWithLabel: true
           },