From 2c320079200e4041ae60071a9f2eb9be3fb51fe6 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 14:13:43 +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=E8=B4=A8=E9=87=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8F=8A=E9=97=AE=E9=A2=98=E8=B6=8B=E5=8A=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                         |  2 +-
 .../jlw/jChart/line/JLineChart.vue            | 20 +++++++++++++++
 .../jlw/jChart/pie/JRingChart.vue             | 20 +++++++++++++++
 .../jlw/qualityManage/leftCenter.vue          |  6 ++---
 .../jlw/qualityManage/rightBottom.vue         | 25 +++++++++++++++++++
 .../jlw/qualityManage/rightTop.vue            |  4 +--
 .../safeManage/v2/projectSelfInspection.vue   |  2 ++
 7 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 31f71790..3a208d87 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -44,7 +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://q59pa4.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/jlw/jChart/line/JLineChart.vue b/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue
index 8b974d04..1b4935a5 100644
--- a/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue
+++ b/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue
@@ -36,6 +36,26 @@ export default {
   data() {
     return { JLineChart: null }
   },
+  watch:{
+    xData:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    },
+    series:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    }
+  },
   methods: {
     createChart() {
       const { title, grid, color, xData, series } = this
diff --git a/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue b/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
index 922821f9..35432e35 100644
--- a/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
+++ b/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
@@ -31,6 +31,26 @@ export default {
   mounted() {
     this.createRingChart()
   },
+  watch:{
+    data:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createRingChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    },
+    title:{
+      handler(newVal,oldVal){
+         if(newVal != oldVal){
+          this.createRingChart();
+         }
+       },
+       deep:true,
+       immediate:true,
+    }
+  },
   methods: {
     createRingChart() {
       const jRingChart = echarts.init(this.$refs.jRingChart)
diff --git a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
index 4419e1f5..64b35cd7 100644
--- a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue
@@ -39,9 +39,9 @@ export default {
   data() {
     return {
       total:{
-        totalNum:3412,
-        jyUrgentLevelNum:26,
-        ybUrgentLevelNum:58,
+        totalNum:'',
+        jyUrgentLevelNum:'',
+        ybUrgentLevelNum:'',
       }
     }
   },
diff --git a/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue b/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue
index e31c6334..e57e26da 100644
--- a/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/rightBottom.vue
@@ -9,6 +9,7 @@
 
 <script>
 import JLineChart from '../jChart/line/JLineChart.vue'
+import { selectDangerTypeQualityCountApi } from '@/assets/js/api/dataBoard'
 export default {
   components: { JLineChart },
   props: {
@@ -32,6 +33,30 @@ export default {
         }
       ]
     }
+  },
+  mounted() {
+    this.getData(2);
+  },
+  methods: {
+    getData(opType) {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        opType: opType
+      };
+      selectDangerTypeQualityCountApi(data).then(res => {
+        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.series.data = ydata;
+        }
+      });
+    }
   }
 }
 </script>
diff --git a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
index d3b3f4be..3812abde 100644
--- a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
@@ -14,7 +14,7 @@
       </div>
       <div class="chart">
         <JRingChart
-          :title="{ text: total.ratioNum, subTitle: '即时整改问题' }"
+          :title="{ text: total.ratioNum, subTitle: '即时整改问题率' }"
           :color="['#557DEE', '#43D7B5']"
           :data="[
             { value: 1, name: '' },
@@ -59,11 +59,9 @@ export default {
         projectSn: this.projectSn
       }
       selectQualityStatisticsApi(data).then(res => {
-        console.log('-------',res)
         this.total = res.result.total
         let ratio = this.total.totalNum ? ((this.total.closeNum / this.total.totalNum) * 100).toFixed(2) : 0 
         this.total.ratioNum = ratio + '%'
-        console.log('------------',this.ratioNum)
       })
     }
   }
diff --git a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
index e61c58d8..92ef0eb1 100644
--- a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
@@ -176,6 +176,7 @@
               :controls="false"
             >
             </el-input-number>
+            <!-- 检查频次  选择单位 -->
             <el-select
               class="smallInput"
               v-model="addEditForm.frequencyType"
@@ -256,6 +257,7 @@ export default {
   data() {
     return {
       searchForm: {
+        frequencyType:'', // frequencyType ==7  班检  frequencyType ==6 季检
         inspectTypeId: "",
         startTime: "",
         endTime: "",