Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/OneMap.vue

@@ -41,7 +41,7 @@
             {{ item.date }}  {{ item.taskName }}
           </div>
           <div style="margin-right: 30px">{{ item.statusInfo }}</div>
-          <div v-if="item.status == 1" style="float: left;width:56px">
+          <div v-if="item.status == 1" style="float: left; width: 56px">
             <n-popconfirm
               @positive-click="handlePositiveClick(item)"
               @negative-click="handleNegativeClick"
@@ -53,7 +53,13 @@
             </n-popconfirm>
           </div>
 
-          <div v-else style="color: #1890ff;float:left;width:56px" @click="liveShow(item)">直播</div>
+          <div
+            v-else
+            style="color: #1890ff; float: left; width: 56px"
+            @click="liveShow(item)"
+          >
+            直播
+          </div>
         </li>
       </ul>
       <n-pagination
@@ -485,7 +491,10 @@ export default {
     }
     // 添加问题图层
     const addproblemLayer = (narr) => {
+      console.log(narr, '问题图层数据')
+      // 如果存在问题图层,就将问题图层给删掉
       if (data.problemlayer !== null) {
+        console.log('有图层')
         data.map.removeLayer(data.problemlayer)
       }
       data.problemOverlay = new Overlay({
@@ -494,9 +503,10 @@ export default {
         // autoPan: true,
         offset: [10, 10]
       })
+      data.problemLayerList = []
       narr.map((item) => {
         const Features = []
-        data.problemLayerList = []
+
         if (item.fraction.length > 0) {
           item.fraction.map((iitem) => {
             const problem = iitem
@@ -573,9 +583,11 @@ export default {
             switch (item.status) {
               case 1:
                 item.statusInfo = '待执行'
+                item.toIndexRoute = false
                 break
               case 2:
                 item.statusInfo = '执行中'
+                item.toIndexRoute = true
                 break
             }
           })
@@ -632,7 +644,7 @@ export default {
      */
     const liveShow = (rowInfo) => {
       rowInfo = JSON.stringify(rowInfo)
-      rowInfo.toIndexRoute = true
+
       router.push({
         path: '/taskManage/all',
         query: { rowInfo: rowInfo }
@@ -689,6 +701,7 @@ export default {
         })
       },
       handlePositiveClick(row) {
+        console.log(row, '该行数据')
         $message.info('机场设备开始自检，请稍等')
         implement(row.id).then((res) => {
           if (res.code === 0) {
@@ -803,8 +816,8 @@ export default {
         margin-bottom: 3px;
         div {
           float: left;
-          height:100%;
-          height:30px;
+          height: 100%;
+          height: 30px;
         }
       }
     }

src/views/task-manage/all-task/index.vue

@@ -123,7 +123,7 @@ export default {
     onMounted(() => {
       if (rowInfo) {
         data.rowData = JSON.parse(rowInfo)
-
+      
         data.liveDrawer = true
       }
     })