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>{{ detail.name }}</th>
+        <td>{{ detail.name }}</td>
 
       </tr>
       <tr>
         <th class="title">机场状态:</th>
-        <th>{{ status }}</th>
+        <td> {{ status }}</td>
       </tr>
       <tr>
         <th class="title">可选挂载:</th>
-        <th>{{ mountedName }}</th>
+        <td>{{ mountedName }}</td>
       </tr>
     </table>
     <div class="deviceInfo">
@@ -181,6 +181,9 @@ th {
   color: white;
   font-weight: 400;
 }
+td{
+  padding-left:10px;
+}
 .deviceInfo {
   margin-top: 5px;
   width: 100%;
@@ -188,6 +191,7 @@ th {
   background: #2c2c2c;
   display: flex;
   justify-content: space-between;
+  padding:0 25px;
   .item {
     color: white;
     display: flex;
@@ -209,7 +213,7 @@ th {
   }
 }
 .monitorList {
-  margin-top: 10px;
+  margin-top: 5px;
   display: flex;
   justify-content: space-around;
   .innerMonitor {

src/views/dashboard/components/OneMap.vue

@@ -64,6 +64,7 @@
         </li>
       </ul>
       <n-pagination
+
         v-model:page="page"
         :page-count="pageCount"
         :page-slot="7"
@@ -232,7 +233,8 @@ export default {
       airportSelected: true,
       problemLayerList: [],
       airportPopupShow: false,
-      lastSevenDateList: []
+      lastSevenDateList: [],
+      paginationShow: false
     })
     watch(
       () => data.page,
@@ -569,8 +571,8 @@ export default {
               geometry: new Point(fromLonLat([problem.lng, problem.lat]))
             })
             let icon
-         
-            switch (iitem.code) {
+
+            switch (iitem.type) {
               case '002000':
                 icon = problemSpot_icon
                 break
@@ -628,6 +630,11 @@ export default {
           data.taskList = res.data.records
 
           data.pageCount = res.data.pages
+          if (data.pageCount == 1) {
+            data.paginationShow = false
+          } else {
+            data.paginationShow = true
+          }
           data.taskList.map((item, index) => {
             const arr = item.executionStartTime.split(/[ ]+/) // 以空格分开
             item.date = arr[0]
@@ -872,12 +879,14 @@ export default {
     padding: 10px 19px;
     ul {
       li {
-        padding: 5px 2px;
-        margin-bottom: 3px;
+        padding: 0 2px;
+
+        height:24px;
+        margin-bottom:10px;
         div {
           float: left;
-          height: 100%;
-          height: 30px;
+
+          height:100%;
         }
       }
     }