From 5d9e24ae9b9fc431b5c0e9c15ea5d8158f5afb0f 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 15:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=AE=A1=E7=90=86):=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E4=BB=8A=E6=97=A5=E6=8A=A5=E8=AD=A6=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/envirManage/centerTop.vue             | 36 +++++++++++++++++++
 .../jlw/envirManage/rightCenter.vue           | 24 ++++++++++---
 .../safeManage/v2/projectSelfInspection.vue   |  2 ++
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/views/projectAdmin/jlw/envirManage/centerTop.vue b/src/views/projectAdmin/jlw/envirManage/centerTop.vue
index 3849fe69..8e1414dd 100644
--- a/src/views/projectAdmin/jlw/envirManage/centerTop.vue
+++ b/src/views/projectAdmin/jlw/envirManage/centerTop.vue
@@ -8,6 +8,7 @@
 
 <script>
 import echarts from 'echarts4';
+// import { getRealTimeDustNoiseDataApi } from "@/assets/js/api/environmentManage";
 export default {
 
   props: {
@@ -72,8 +73,43 @@ export default {
   },
   mounted(){
     this.createCenterChart();
+    // this.getRealTimeDustNoiseData();
   },
   methods:{
+        //获取环境设备详情数据
+    // getRealTimeDustNoiseData() {
+    //   let data = {
+    //     deviceId: this.currentDevDetail.deviceId,
+    //     projectSn: this.projectSn,
+    //   };
+    //   console.log(data);
+    //   getRealTimeDustNoiseDataApi(data).then((res) => {
+    //     console.log(res);
+    //     if (res.code == 200) {
+    //       console.log(res.result)
+    //       if (res.result) {
+    //         this.plantCap = res.result;
+    //       } else {
+    //         this.plantCap = {
+    //           crc: "--",
+    //           humidity: "--",
+    //           noise: "--",
+    //           plateHumidity: "--",
+    //           plateTemperature: "--",
+    //           pm10: "--",
+    //           pm25: "--",
+    //           pressure: "--",
+    //           temperature: "--",
+    //           tsp: "--",
+    //           voltage: "--",
+    //           winddirectionName: "--",
+    //           windspeed: "--",
+    //         };
+    //       }
+    //       // this.createCenterChart();
+    //     }
+    //   });
+    // },
      //环境监测实时数据--图表
     createCenterChart() {
       let centerChart = echarts.init(this.$refs.centerChart);
diff --git a/src/views/projectAdmin/jlw/envirManage/rightCenter.vue b/src/views/projectAdmin/jlw/envirManage/rightCenter.vue
index 0be12628..51ecd8e2 100644
--- a/src/views/projectAdmin/jlw/envirManage/rightCenter.vue
+++ b/src/views/projectAdmin/jlw/envirManage/rightCenter.vue
@@ -8,6 +8,7 @@
 
 <script>
 import echarts from "echarts4";
+import {selectEnvironmentAlarmCountTotalApi} from "@/assets/js/api/dataBoard"
 export default {
 
   props: {
@@ -18,13 +19,26 @@ export default {
   },
   data() {
     return {
-
+      alarmData:{
+        totalAlarm:'',
+        noiseNum:'',
+        pm25Num:'',
+      }
     };
   },
    mounted(){
-    this.initMyChart();
+    this.countTotal();
   },
   methods:{
+    countTotal(){
+      selectEnvironmentAlarmCountTotalApi({
+        sn: this.$store.state.projectSn,
+      }).then((res) => {
+        this.alarmData=res.result
+        // console.log('报警统计',res.result);
+        this.initMyChart();
+      });
+    },
      initMyChart() {
       const myChart = echarts.init(this.$refs.myChart);
       const option = {
@@ -32,7 +46,7 @@ export default {
           textAlign: 'center',
           x: '29%',
           y: '38%',
-          text:'27',
+          text:this.alarmData.totalAlarm,
           textStyle: {
             fontSize: 20,
             fontWeight: 'normal',
@@ -91,8 +105,8 @@ export default {
               show: false,
             },
             data: [
-              { value: 13, name: "扬尘噪声报警 : 13" },
-              { value: 14, name: "PM2.5超标报警 : 14" },
+              { value: this.alarmData.noiseNum, name: `扬尘噪声报警 :  ${this.alarmData.noiseNum}`},
+              { value: this.alarmData.pm25Num, name: `PM2.5超标报警 : ${this.alarmData.pm25Num}`},
             ],
           },
         ],
diff --git a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
index 92ef0eb1..a39db410 100644
--- a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
@@ -372,6 +372,7 @@ export default {
             let json = this.addEditForm;
             json.inspectUser = json.inspectUser.join(",");
             json.createUser = this.$store.state.userInfo.userId;
+            console.log('--------新增参数',json)
             addinspectTaskRecordApi(json).then((result) => {
               this.$message.success("添加成功！");
               this.checkDaterange = [];
@@ -387,6 +388,7 @@ export default {
       });
     },
     loadList() {
+      console.log('------查询条件',this.searchForm)
       getinspectTaskRecordListApi(this.searchForm).then((result) => {
         this.rocordList = result.result.records;
         this.pageTotal = result.result.total;