From e04d72d58dcacc1565abc1b219663af7037b32e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 10 Aug 2022 12:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E7=AE=A1=E7=90=86):=E7=BB=84=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=91=E5=90=AC=20=E9=A2=91=E7=B9=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8F=8A=E5=8D=A0=E6=AF=94=E6=95=B0=E6=8D=AE=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i18n/langs/cn/laborManage/laborDev.js     |  2 +-
 src/assets/js/http.js                         |  1 +
 .../projectHuScreen/jChart/bar/JBarChart.vue  |  1 +
 .../projectAdmin/jlw/jChart/bar/JBarChart.vue | 20 +++++++
 .../jlw/jChart/bar/JProgressChart.vue         | 11 ++++
 .../jlw/qualityManage/leftBottom.vue          | 57 +++++++++++--------
 .../jlw/qualityManage/leftCenter.vue          |  2 +-
 .../jlw/qualityManage/leftTop.vue             | 27 +++++++++
 .../safeManage/v2/projectSelfInspection.vue   |  1 +
 9 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js
index 475423eb..3d840885 100644
--- a/src/assets/i18n/langs/cn/laborManage/laborDev.js
+++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js
@@ -57,7 +57,7 @@ export default {
         'VR安全教育',
         '班前教育',
         '日常教育（日常违规教育)',
-        '每日交底（方案交底）',
+        '每日交底（专项方案交底）',
         '每日交底（安全技术交底）',
         '每日交底（大工程交底）',
     ],
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 8f0233b3..31f71790 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -44,6 +44,7 @@ if (process.env.NODE_ENV == 'development') {
     // tag: 本地
     // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
     axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1
+    // axios.defaults.baseURL = 'http://sp36hf.natappfree.cc/'; //杨
     // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
     // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
     // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
index ed48d0b3..7dc9617b 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
@@ -45,6 +45,7 @@ export default {
   data() {
     return { jBarChart: null }
   },
+
   methods: {
     createChart() {
       const { title, tooltip, grid, color, xData, yData, series } = this
diff --git a/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue b/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue
index ed48d0b3..f7b5e135 100644
--- a/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue
@@ -45,6 +45,26 @@ export default {
   data() {
     return { jBarChart: null }
   },
+  watch:{
+    xData:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    },
+    yData:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    }
+  },
   methods: {
     createChart() {
       const { title, tooltip, grid, color, xData, yData, series } = this
diff --git a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue
index d0e90317..353098fa 100644
--- a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue
+++ b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue
@@ -28,6 +28,17 @@ export default {
   data() {
     return { JProgressChart: null }
   },
+  watch:{
+    seriesData:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    }
+  },
   methods: {
     createChart() {
       const { grid, seriesData, yData } = this
diff --git a/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue b/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue
index 5eccb065..a9ad8903 100644
--- a/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue
@@ -9,49 +9,58 @@
 </template>
 
 <script>
-import JBarChart from '../jChart/bar/JBarChart.vue'
-import { selectDangerTypeQualityCountApi } from '@/assets/js/api/dataBoard'
+import JBarChart from "../jChart/bar/JBarChart.vue";
+import { selectDangerTypeQualityCountApi } from "@/assets/js/api/dataBoard";
 export default {
   components: { JBarChart },
   props: {
     title: {
       type: String,
-      default: 'default title'
+      default: "default title"
     }
   },
   data() {
     return {
-      xData: ['地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师'],
+      xData: [
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师",
+        "地理老师"
+      ],
       yData: [100, 235, 232, 532, 112, 532, 449, 269, 998, 33]
-    }
+    };
   },
-  mounted(){
+  mounted() {
     this.getData(2);
   },
-  methods:{
-    getData(opType){
+  methods: {
+    getData(opType) {
       let data = {
         projectSn: this.$store.state.projectSn,
         opType: opType
-      }
+      };
       selectDangerTypeQualityCountApi(data).then(res => {
-        console.log('-----------',res)
-        var arr = res.result.list
-        var xdata = []
-        var ydata=[]
-        arr.forEach(item => {
-          xdata.push(item.dangerName)
-          ydata.push(item.num)
-        })
-        this.xData = xdata
-        this.yData = ydata
-        console.log('xdata',this.xData)
-        console.log('ydata',this.yData)
-      })
+        var arr = res.result.list;
+        if (arr != null) {
+          var xdata = [];
+          var ydata = [];
+          arr.forEach(item => {
+            xdata.push(item.dangerName);
+            ydata.push(item.num);
+          });
+          this.xData = xdata;
+          this.yData = ydata;
+        }
+      });
     }
-    
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
index ac4896a3..4419e1f5 100644
--- a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
@@ -55,7 +55,7 @@ export default {
         projectSn: this.projectSn
       }
       selectQualityStatisticsApi(data).then(res => {
-        console.log('-------',res)
+        console.log('问题占比',res)
         this.total = res.result.total
       })
     }
diff --git a/src/views/projectAdmin/jlw/qualityManage/leftTop.vue b/src/views/projectAdmin/jlw/qualityManage/leftTop.vue
index cdabe809..a3bbef9a 100644
--- a/src/views/projectAdmin/jlw/qualityManage/leftTop.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/leftTop.vue
@@ -9,6 +9,7 @@
 
 <script>
 import JProgressChart from '../jChart/bar/JProgressChart.vue'
+import { selectDangerTypeQualityCountApi } from '@/assets/js/api/dataBoard'
 export default {
   components: { JProgressChart },
   props: {
@@ -22,6 +23,32 @@ export default {
       yData: ['地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师'],
       seriesData: [100, 235, 232, 532, 112, 532, 449, 269, 998, 33]
     }
+  },
+  mounted(){
+    this.getData(2);
+  },
+  methods:{
+    getData(opType){
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        opType: opType
+      }
+      selectDangerTypeQualityCountApi(data).then(res => {
+        console.log('-----------',res)
+        var arr = res.result.list
+        var xdata = []
+        var ydata=[]
+        arr.forEach(item => {
+          xdata.push(item.dangerName)
+          ydata.push(item.num)
+        })
+        this.yData = xdata
+        this.seriesData = ydata
+        console.log('xdata',this.yData)
+        console.log('ydata',this.seriesData)
+      })
+    }
+    
   }
 }
 </script>
diff --git a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
index ed4c1d76..e61c58d8 100644
--- a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
@@ -358,6 +358,7 @@ export default {
       getInspectTypeListApi({
         sn: this.$store.state.userInfo.headquartersSn,
       }).then((result) => {
+        console.log('检查类型',result)
         this.checkType = result.result;
       });
     },