项目修改2

src/api/substation/substation.js

@@ -75,6 +75,13 @@ export const queryLimitSpaceApi = (data) => {
   })
 }
 
+// 查询有限空间监测设备 - new
+export const queryNewLimitSpaceApi = (data) => {
+  return request.get(`/base/screen/info/getPitDevAttributeRecordByDay`, {
+    params: data
+  })
+}
+
 // 查询组塔监测设备 - 当日监测
 export const queryTowerTodayApi = (data) => {
   return request.get(`/base/screen/info/getTowerDevAttributeRecordByDay`, {

src/components/substation/envirDetect.vue

@@ -140,7 +140,8 @@ import * as echarts from 'echarts'
 import {
   queryDeviceByProApi,
   queryEnvironmentInfoByIdApi,
-  queryChartsInfoByIdApi
+  queryChartsInfoByIdApi,
+  queryWarnInfoByIdApi
 } from '@/api/substation/substation'
 export default {
   components: {

src/components/substation/pitDetect.vue

@@ -5,7 +5,7 @@
         <div class="inner-tit">
           <div>
             <img src="../../assets/img/lef-badge.png" alt="">
-            组塔检测
+            基坑检测
           </div>
           <div style="display: flex; justify-content: right">
             <el-select
@@ -35,22 +35,22 @@
                     <span>{{ item.tit }}</span>
                   </div>-->
           <div class="single-icon">
-            <span style="color: #3BC7E3">37<span style="font-size: 18px">%VOL</span></span>
+            <span style="color: #3BC7E3">{{ environmentInfoList ? environmentInfoList[0].jcValue : '' }}<span style="font-size: 18px">%VOL</span></span>
             <span>含氧量</span>
             <img src="../../assets/img/O2.png" alt="">
           </div>
           <div class="single-icon">
-            <span style="color: #7588FF">37<span style="font-size: 18px">%PPM</span></span>
+            <span style="color: #7588FF">{{ environmentInfoList ? environmentInfoList[1].jcValue : '' }}<span style="font-size: 18px">%PPM</span></span>
             <span>一氧化碳</span>
             <img src="../../assets/img/CO.png" alt="">
           </div>
           <div class="single-icon">
-            <span style="color: #62C560">37<span style="font-size: 18px">%LEL</span></span>
+            <span style="color: #62C560">{{ environmentInfoList ? environmentInfoList[2].jcValue : '' }}<span style="font-size: 18px">%LEL</span></span>
             <span>可燃气体</span>
             <img src="../../assets/img/fire.png" alt="">
           </div>
           <div class="single-icon">
-            <span style="color: #F68F84">37<span style="font-size: 18px">%PPM</span></span>
+            <span style="color: #F68F84">{{ environmentInfoList ? environmentInfoList[3].jcValue : '' }}<span style="font-size: 18px">%PPM</span></span>
             <span>硫化氢</span>
             <img src="../../assets/img/H2S.png" alt="">
           </div>
@@ -78,23 +78,23 @@
           </div>
           <div class="lef-tower-pic">
             <div
-              :class="['single-tower', { isActive: currentPit === item.id } ]"
+              :class="['single-tower', { isActive: currentPit === item.devId } ]"
               v-for="item in pitList"
-              :key="item.id"
-              @click="selPit(item)"
+              :key="item.devId"
+              @click="selPit(item.devId)"
             >
               <img
-                v-if="item.status === 0"
+                v-if="item.devStatus === 0"
                 src="../../assets/img/pit-offline.png"
                 alt=""
               />
               <img
-                v-if="item.status === 1"
+                v-if="item.devWarn === 1"
                 src="../../assets/img/pit-alerting.png"
                 alt=""
               />
               <img
-                v-if="item.status === 2"
+                v-if="item.devStatus === 1 && item.devWarn === 0"
                 src="../../assets/img/pit-online.png"
                 alt=""
               />
@@ -175,7 +175,9 @@
 import {
   queryDeviceByProApi,
   queryPitDataApi,
-  queryLimitSpaceApi
+  queryLimitSpaceApi,
+  queryNewLimitSpaceApi,
+  queryEnvironmentInfoByIdApi
 } from '@/api/substation/substation'
 import * as echarts from 'echarts'
 export default {
@@ -191,21 +193,13 @@ export default {
   name: 'pitDetect',
   data() {
     return {
-      currentPit: 1,
+      environmentInfoList: undefined,
+      currentPit: undefined,
       pitVal: undefined,
       pitRange: [],
       // 暂定 0离线 1报警 2在线
       pitList: [
-        { id: 1, status: 1 },
-        { id: 2, status: 2 },
-        { id: 3, status: 0 },
-        { id: 4, status: 0 },
-        { id: 5, status: 2 },
-        { id: 6, status: 2 },
-        { id: 7, status: 1 },
-        { id: 8, status: 1 },
-        { id: 9, status: 2 },
-        { id: 10, status: 2 },
+
       ],
       todayRecordList: []
     }
@@ -228,15 +222,23 @@ export default {
       })
       if(res.data.data.length !== 0) {
         this.pitVal = res.data.data[0].devId
+        this.pitList = res.data.data
         this.pitRange = res.data.data.map(item => {
           return {
             label: item.devName,
             value: item.devId
           }
         })
+        await this.getEnvironmentData(this.pitVal)
         await this.getPitData(this.pitVal)
       }
     },
+    async getEnvironmentData(devId) {
+      let res = await queryEnvironmentInfoByIdApi({
+        devId
+      })
+      this.environmentInfoList = res.data.data
+    },
     async getPitData(devId) {
       let res = await queryPitDataApi({
         devId
@@ -244,16 +246,19 @@ export default {
       this.generateCharts(res.data)
     },
     async getLimitData(proId) {
-      let res = await queryLimitSpaceApi({
+      let res = await queryNewLimitSpaceApi({
         proId
       })
       this.todayRecordList = res.data
     },
-    selPit(val) {
-      this.currentPit = val.id
+    selPit(v) {
+      this.currentPit = v
+      this.getEnvironmentData(v)
+      this.getPitData(v)
     },
     pitChange(e) {
       console.log(e)
+      this.getEnvironmentData(e)
       this.getPitData(e)
     },
     rowStyle(scope) {
@@ -690,11 +695,12 @@ export default {
           display: flex;
           justify-content: space-around;
           flex-wrap: wrap;
+          overflow-y: auto;
 
           .single-tower{
 
             width: 35%;
-            height: 19%;
+            height: 25%;
             border-radius: 20px;
             cursor: pointer;
             display: flex;

src/components/substation/towerDetect.vue

@@ -24,23 +24,23 @@
           <span>倾角监测设备</span>
           <div class="lef-tower-pic">
             <div
-              :class="['single-tower', { isActive: currentAngleTower === item.id } ]"
+              :class="['single-tower', { isActive: currentAngleTower === item.devId } ]"
               v-for="item in towerAngleList"
-              :key="item.id"
+              :key="item.devId"
               @click="selTowerAngle(item)"
             >
               <img
-                v-if="item.status === 0"
+                v-if="item.devStatus === 0"
                 src="../../assets/img/offline.png"
                 alt=""
               />
               <img
-                v-if="item.status === 1"
+                v-if="item.devWarn === 1"
                 src="../../assets/img/alerting.png"
                 alt=""
               />
               <img
-                v-if="item.status === 2"
+                v-if="item.devStatus === 1 && item.devWarn === 0"
                 src="../../assets/img/inline.png"
                 alt=""
               />
@@ -49,23 +49,23 @@
           <span>拉力监测设备</span>
           <div class="lef-tower-pic">
             <div
-              :class="['single-tower', { isActive: currentPullTower === item.id } ]"
+              :class="['single-tower', { isActive: currentPullTower === item.devId } ]"
               v-for="item in towerPullList"
-              :key="item.id"
+              :key="item.devId"
               @click="selTowerPull(item)"
             >
               <img
-                v-if="item.status === 0"
+                v-if="item.devStatus === 0"
                 src="../../assets/img/offline.png"
                 alt=""
               />
               <img
-                v-if="item.status === 1"
+                v-if="item.devWarn === 1"
                 src="../../assets/img/alerting.png"
                 alt=""
               />
               <img
-                v-if="item.status === 2"
+                v-if="item.devStatus === 1 && item.devWarn === 0"
                 src="../../assets/img/inline.png"
                 alt=""
               />
@@ -84,22 +84,25 @@
               <img src="../../assets/img/dip-angle.png" alt=""/>
               <div>
                 <span>倾角</span>
-                <span style="color: #854DFA">30°</span>
+                <span style="color: #854DFA">{{ angleFirst }}°</span>
               </div>
             </div>
             <div class="lower-info">
-              <div>
+              <div
+                v-for="item in angleList"
+                :key="item.jcName"
+              >
+                <span>{{ item.jcTime }}</span>
+                <span>{{ item.jcValue }}{{ item.jcUnit }}</span>
+              </div>
+<!--              <div>
                 <span>2024.08.02 12:01</span>
                 <span>30°</span>
               </div>
               <div>
                 <span>2024.08.02 12:01</span>
                 <span>30°</span>
-              </div>
-              <div>
-                <span>2024.08.02 12:01</span>
-                <span>30°</span>
-              </div>
+              </div>-->
             </div>
           </div>
           <div class="pull-force">
@@ -113,22 +116,25 @@
               <img src="../../assets/img/pull.png" alt=""/>
               <div>
                 <span>拉力</span>
-                <span style="color: #418CFF">30N</span>
+                <span style="color: #418CFF">{{ pullFirst }}N</span>
               </div>
             </div>
             <div class="lower-info">
-              <div>
+              <div
+                v-for="item in pullList"
+                :key="item.jcName"
+              >
+                <span>{{ item.jcTime }}</span>
+                <span>{{ item.jcValue }}{{ item.jcUnit }}</span>
+              </div>
+<!--              <div>
                 <span>2024.08.02 12:01</span>
                 <span>30N</span>
               </div>
               <div>
                 <span>2024.08.02 12:01</span>
                 <span>30N</span>
-              </div>
-              <div>
-                <span>2024.08.02 12:01</span>
-                <span>30N</span>
-              </div>
+              </div>-->
             </div>
           </div>
         </div>
@@ -219,8 +225,10 @@
 
 <script>
 import {
+  queryDeviceByProApi,
   queryTowerTodayApi,
-  queryTowerWarnApi
+  queryTowerWarnApi,
+  queryEnvironmentInfoByIdApi
 } from '@/api/substation/substation'
 export default {
   components: {
@@ -235,35 +243,21 @@ export default {
   name: 'towerDetect',
   data() {
     return {
-      currentAngleTower: 1,
-      currentPullTower: 1,
-      // 暂定 0离线 1报警 2在线
+      currentAngleTower: undefined,
+      currentPullTower: undefined,
+      // 暂定 0离线 1在线
       towerAngleList: [
-        { id: 1, status: 1 },
-        { id: 2, status: 2 },
-        { id: 3, status: 0 },
-        { id: 4, status: 0 },
-        { id: 5, status: 2 },
-        { id: 6, status: 2 },
-        { id: 7, status: 1 },
-        { id: 8, status: 1 },
-        { id: 9, status: 2 },
-        { id: 10, status: 2 },
+
       ],
       towerPullList: [
-        { id: 1, status: 1 },
-        { id: 2, status: 2 },
-        { id: 3, status: 0 },
-        { id: 4, status: 0 },
-        { id: 5, status: 2 },
-        { id: 6, status: 2 },
-        { id: 7, status: 1 },
-        { id: 8, status: 1 },
-        { id: 9, status: 2 },
-        { id: 10, status: 2 },
+
       ],
       detectList: [],
-      alertList: []
+      alertList: [],
+      angleFirst: undefined,
+      pullFirst: undefined,
+      angleList: [],
+      pullList: []
     }
   },
   created() {
@@ -272,19 +266,32 @@ export default {
 
   mounted() {
     console.log(this.sendMsg)
+    this.getDeviceData(this.sendMsg.projectId)
     this.getTowerTodayData(this.sendMsg.projectId)
     this.getTowerWarnData(this.sendMsg.projectId)
   },
   methods: {
+    async getDeviceData(proId) {
+      let angleRes = await queryDeviceByProApi({
+        proId,
+        devType: 117
+      })
+      this.towerAngleList = angleRes.data.data
+      let pullRes = await queryDeviceByProApi({
+        proId,
+        devType: 118
+      })
+      this.towerPullList = pullRes.data.data
+    },
     async getTowerWarnData(proId) {
       let res = await queryTowerWarnApi({
         proId
       })
       res.data.forEach(item => {
-        if(item.devType === 'angle') {
-          item.angle = item.jcValue
-        } else if(item.dev === 'pull') {
-          item.pull = item.jcValue
+        if(item.devType === '117') {
+          item.angle = item.jcValue + '°'
+        } else if(item.dev === '118') {
+          item.pull = item.jcValue + 'N'
         }
       })
       this.alertList = res.data
@@ -294,19 +301,34 @@ export default {
         proId
       })
       res.data.forEach(item => {
-        if(item.devType === 'angle') {
-          item.angle = item.jcValue
-        } else if(item.dev === 'pull') {
-          item.pull = item.jcValue
+        if(item.devType === '117') {
+          item.angle = item.jcValue + '°'
+        } else if(item.dev === '118') {
+          item.pull = item.jcValue + 'N'
         }
       })
       this.detectList = res.data
     },
+    async getEnvironmentData(devId, type) {
+      let res = await queryEnvironmentInfoByIdApi({
+        devId
+      })
+      if(type === '117') {
+        this.angleFirst = res.data.data[0].jcValue
+        this.angleList = res.data.data.filter(item => item.jcUnit === '°')
+      } else if(type === '118') {
+        this.pullFirst = res.data.data[0].jcValue
+        this.pullList = res.data.data.filter(item => item.jcUnit === 'N')
+      }
+    },
     selTowerAngle(val) {
-      this.currentAngleTower = val.id
+      console.log(val)
+      this.currentAngleTower = val.devId
+      this.getEnvironmentData(val.devId, val.devType)
     },
     selTowerPull(val) {
-      this.currentPullTower = val.id
+      this.currentPullTower = val.devId
+      this.getEnvironmentData(val.devId, val.devType)
     },
     rowStyle(scope) {
       if(scope.rowIndex % 2 === 0) {
@@ -526,15 +548,16 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: space-around;
+            overflow-y: auto;
 
             div{
 
               width: 100%;
               box-sizing: border-box;
-              padding: 15px;
+              padding: 15px 50px;
               border-bottom: 1px dashed #CCCFD4;
               display: flex;
-              justify-content: space-around;
+              justify-content: space-between;
               align-items: center;
 
               span:first-child{