Merge branch 'develop' of gitadmin/tuoheng_lc_web into release

src/views/dashboard/components/AirInfo.vue

@@ -3,16 +3,16 @@
     <table>
       <tr>
         <th class="title">机场名称:</th>
-        <th>机场A</th>
+        <th>{{ detail.name }}</th>
 
       </tr>
       <tr>
         <th class="title">机场状态:</th>
-        <th>正常</th>
+        <th>{{ status }}</th>
       </tr>
       <tr>
         <th class="title">可选挂载:</th>
-        <th>高清相机、多光谱相机、喊话器</th>
+        <th>{{ mountedName }}</th>
       </tr>
     </table>
     <div class="deviceInfo">
@@ -70,7 +70,7 @@ export default {
         { icon: new URL('../../../assets/images/north.png', import.meta.url).href, indicatorValue: '正北', indicatorName: '风向' },
         { icon: new URL('../../../assets/images/atmosPressure.png', import.meta.url).href, indicatorValue: '0.1Mpa', indicatorName: '大气压力' },
         { icon: new URL('../../../assets/images/airHumidity.png', import.meta.url).href, indicatorValue: '25rh', indicatorName: '空气湿度' },
-        { icon: new URL('../../../assets/images/rainfall.png', import.meta.url).href, indicatorValue: '5ml', indicatorName: '降雨量' },
+
         { icon: new URL('../../../assets/images/airTemperature.png', import.meta.url).href, indicatorValue: '25­°C', indicatorName: '空气温度' }],
       innerMonitorOptions: {
         width: '256px',
@@ -84,6 +84,8 @@ export default {
         src: ''
 
       },
+      status: null,
+      mountedName: null,
       outsideMonitorOptions: {
         width: '256px',
         height: '198px',
@@ -109,7 +111,16 @@ export default {
         })
           .then(res => {
             if (res.code === 0) {
-              // console.log('机场详情')
+              console.log(res, '机场详情')
+              data.mountedName = res.data.mountName
+              const status = parseFloat(res.data.status)
+              switch (status) {
+                case 1:
+                  data.status = '空闲'
+                  break
+                case 2:
+                  data.status = '执行飞行中'
+              }
               data.indicatorList.map((item, index) => {
                 switch (index) {
                   case 0:

src/views/dashboard/components/OneMap.vue

@@ -581,10 +581,11 @@ export default {
           data.taskList = res.data.records
           data.pageCount = res.data.pages
           // console.log(data.pageCount, '页数')
-          data.taskList.map((item) => {
+          data.taskList.map((item, index) => {
             const arr = item.executionStartTime.split(/[ ]+/)// 以空格分开
             item.date = arr[0]
             item.taskName = item.name
+
             switch (item.status) {
               case 1:
                 item.statusInfo = '待执行'
@@ -814,7 +815,7 @@ export default {
         display: flex;
         justify-content: space-between;
         padding: 5px 2px;
-        margin-bottom: 10px;
+        margin-bottom: 3px;
       }
     }
   }