3672

src/views/dashboard/components/AirInfo.vue

@@ -66,6 +66,7 @@ export default {
         { icon: new URL('../../../assets/images/north.png', import.meta.url).href, indicatorValue: null, indicatorName: '风向' },
         { icon: new URL('../../../assets/images/atmosPressure.png', import.meta.url).href, indicatorValue: null, indicatorName: '大气压力' },
         { icon: new URL('../../../assets/images/airHumidity.png', import.meta.url).href, indicatorValue: null, indicatorName: '空气湿度' },
+        { icon: new URL('../../../assets/images/rainfall.png', import.meta.url).href, indicatorValue: null, indicatorName: '降雨量' },
         { icon: new URL('../../../assets/images/airTemperature.png', import.meta.url).href, indicatorValue: null, indicatorName: '空气温度' }],
       innerMonitorOptions: {
         // width: '256px',
@@ -90,14 +91,14 @@ export default {
 
     const initPlayer = (innerUrl, outerUrl) => {
       const inner = {
-        width: '256px',
-        height: '198px',
+        width: '273px',
+        height: '200px',
         source: innerUrl,
         isLive: true
       }
       const outer = {
-        width: '256px',
-        height: '198px',
+        width: '273px',
+        height: '200px',
         source: outerUrl,
         isLive: true
       }
@@ -114,7 +115,7 @@ export default {
         getAirportInfo(data.detail.id)
           .then(res => {
             if (res.code === 0) {
-              // console.log(res, '机场详情')
+              console.log(res.data, '机场详情')
               data.mountedName = res.data.mountName
               const status = parseFloat(res.data.status)
               switch (status) {
@@ -130,7 +131,7 @@ export default {
                     item.indicatorValue = res.data.wspd
                     break
                   case 1:
-                    item.indicatorValue = res.data.wdir
+                    item.indicatorValue = res.data.wdirName
                     break
                   case 2:
                     item.indicatorValue = res.data.hpa
@@ -139,7 +140,12 @@ export default {
                     item.indicatorValue = res.data.hum
                     break
                   case 4:
+                    item.indicatorValue = res.data.rainfull
+                    break
+                  case 5:
                     item.indicatorValue = res.data.tmp
+                    break
+                  default:
                 }
               })
             }
@@ -232,8 +238,8 @@ td{
   justify-content: space-around;
   .innerMonitor {
     position: relative;
-    width: 275px;
-    height: 198px;
+    width: 280px;
+    height: 200px;
     .monitorName {
       position: absolute;
       bottom: 8px;

src/views/dashboard/components/Extend.vue

@@ -103,7 +103,7 @@ import { cameraList } from '@/api/basic/monitor.js'
 import { materialList } from '@/api/basic/material.js'
 import { formatDate } from '@/utils/index.js'
 import { QUESTION_TYPE } from '@/utils/dictionary.js'
-import personnel_icon from '@/assets/images/personnelActivities.png'
+import smoke_icon from '@/assets/images/smoke.png'
 import problemSpot_icon from '@/assets/images/problemSpot.png'
 import deadTree_icon from '@/assets/images/deadTree.png'
 import fireHazard_icon from '@/assets/images/fireHazard.png'
@@ -115,7 +115,7 @@ const ICON_LIST = {
   '002000': problemSpot_icon,
   '002001': deadTree_icon,
   '002003': fireHazard_icon,
-  '002004': personnel_icon
+  '002004': smoke_icon
 }
 export default {
   name: 'MapExtend',