From d8cb4851d0794107712dc8f0717a230d00097bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 24 Oct 2022 10:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B(=E6=8C=87=E6=8C=A5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83)=EF=BC=9A=E7=8E=AF=E5=A2=83=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/zhongjianFourth.js          |  3 ++
 src/assets/js/http.js                         |  4 +-
 .../fourEngin/command/leftThree.vue           | 37 +++++++++++--------
 .../fourEngin/command/leftThree/Process.vue   |  8 +---
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js
index 4fa7bff5..c91503fe 100644
--- a/src/assets/js/api/zhongjianFourth.js
+++ b/src/assets/js/api/zhongjianFourth.js
@@ -17,6 +17,9 @@ export const listQualityManagement = params => get('xmgl/dangerTypeRecord/getBig
 export const getEpidemicBroadcastApi = params => get('/xmgl/api/getEpidemicBroadcast', params);
 // 亮点展示
 export const windowDisplayApi = params => get('/xmgl/windowDisplay/list', params);
+// 环境监测
+export const getDustNoiseDataApi = data => post('/xmgl/dustNoiseData/getRealTimeDustNoiseData', data);
+
 
 /* --------------指挥中心------------ */
 // 安全巡检-安全隐患
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index cf7dc76f..a7a12b69 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -40,7 +40,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc'  // 邱平毅vpn本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
@@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-  axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue
index 1c14f253..a39bd06e 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue
@@ -40,17 +40,18 @@
 
 <script>
 import Card from '../components/Card'
-// import { selectDustNoisePageListApi } from '@/assets/js/api/environmentManage'
+import { getDustNoiseDataApi } from '@/assets/js/api/zhongjianFourth'
 export default {
   components: { Card },
   data() {
     return {
       // 左边的列表
       leftList: {
-        'PM2.5': { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') },
-        'PM10': { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
-        '噪音': { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
+        a: { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') },
+        b: { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
+        c: { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
       },
+      tableData:[],
       // 右边的列表
       rightList: {
         temperature: { label: '温度', value: 22, unit: '℃', image: require('../assets/images/command-center/icon-temperature.png') },
@@ -77,18 +78,22 @@ export default {
   },
   methods: {
     selectDustNoisePageList(){
-            // let data = {
-            //     deviceId: this.devSn,
-            //     projectSn: this.$store.state.projectSn,
-            //     pageNo: this.pageNo,
-            //     pageSize: this.pageSize,
-            // }
-            // selectDustNoisePageListApi(data).then(res=>{
-            //     console.log(res)
-            //     if(res.success){
-            //         this.tableData = res.result.records
-            //     }
-            // })
+            let data = {
+                // deviceId: this.devSn,
+                projectSn: this.$store.state.projectSn,
+            }
+            getDustNoiseDataApi(data).then(res=>{
+                console.log('环境监测',res)
+                if(res.code == 200){
+                  this.leftList.a.value = res.result.pm25
+                  this.leftList.b.value = res.result.pm10
+                  this.leftList.c.value = res.result.noise
+                  this.rightList.temperature.value = res.result.temperature
+                  this.rightList.humidity.value = res.result.humidity
+                  this.rightList.windSpeed.value = res.result.windspeed
+                  this.rightList.windDirection.value = res.result.winddirectionName
+                }
+            })
         },
   }
 }
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
index 26bdd4ae..b68e7e27 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
@@ -1,7 +1,7 @@
 <!-- 步骤条 -->
 <template>
   <div class="list progress">
-    <div ref="stageScroll" :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index">
+    <div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index">
       <div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div>
       <div class="info">
         <span class="label">{{ item.name }}</span>
@@ -42,12 +42,6 @@ export default {
         if (res.code == 200) {
           console.log('查询进度',res)
           this.projectData = res.result
-          if (parseInt(this.projectData.constructionStage) > 4) {
-            this.$refs['stageScroll'].scrollTo(
-              { x: (this.projectData.constructionStage - 4) * 230 },
-              500
-            )
-          }
         }
       })
     },