Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/AirInfo.vue

@@ -29,17 +29,12 @@
     <div class="monitorList">
       <div class="innerMonitor">
         <div class="monitorName">机场内部监控</div>
-        <!-- <img src="../../../assets/images/webScreen.png" @click="videoShowStyle"> -->
-        <!-- <videoPlay
-          v-bind="innerMonitorOptions"
-          style="z-index:1"
-        /> -->
-        <!-- <EasyPlayer style="z-index=1" :video-url="innerVideoSrc" /> -->
+
         <easy-player :video-url="innerVideoSrc" live="true" stretch="true" />
       </div>
       <div class="innerMonitor">
         <div class="monitorName">机场外部监控</div>
-        <!-- <img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle"> -->
+
         <easy-player :video-url="outVideoSrc" live="true" stretch="true" />
       </div>
 
@@ -102,8 +97,9 @@ export default {
         data.detail = props.data
         // data.innerMonitorOptions.video-url = data.detail.internalMonitorUrl
         data.innerVideoSrc = data.detail.internalMonitorUrl
-        data.outVideoSrc = data.detail.externalMonitorUrl
 
+        data.outVideoSrc = data.detail.externalMonitorUrl
+      
         getAirportInfo({
           airportId: data.detail.id
         })
@@ -141,18 +137,10 @@ export default {
           })
       }
     })
-    const videoShowStyle = () => {
-      data.innerMonitorOptions.webFullScreen = !data.innerMonitorOptions.webFullScreen
-      // data.innerMonitorOptions.width = '500px'
-      // data.innerMonitorOptions.webFullScreen = true
-    }
-    const outerVideoShowStyle = () => {
-      data.outsideMonitorOptions.webFullScreen = !data.outsideMonitorOptions.webFullScreen
-    }
+
     return {
-      ...toRefs(data),
-      videoShowStyle,
-      outerVideoShowStyle
+      ...toRefs(data)
+
     }
   }
 }

src/views/dashboard/components/OneMap.vue

@@ -35,25 +35,25 @@
               white-space: nowrap;
               overflow: hidden;
               text-overflow: ellipsis;
-              margin-right:20px;
+              margin-right: 20px;
             "
           >
             {{ item.date }}  {{ item.taskName }}
           </div>
-          <div style="margin-right:30px">{{ item.statusInfo }}</div>
+          <div style="margin-right: 30px">{{ item.statusInfo }}</div>
+          <div v-if="item.status == 1" style="float: left;width:56px">
+            <n-popconfirm
+              @positive-click="handlePositiveClick(item)"
+              @negative-click="handleNegativeClick"
+            >
+              <template #trigger>
+                <span style="color: #22d33d">立即执行</span>
+              </template>
+              是否立即开始执行任务?
+            </n-popconfirm>
+          </div>
 
-          <n-popconfirm
-            v-if="item.status == 1"
-            style="float:left"
-            @positive-click="handlePositiveClick(item)"
-            @negative-click="handleNegativeClick"
-          >
-            <template #trigger>
-              <span style="color: #22d33d">立即执行</span>
-            </template>
-            是否立即开始执行任务?
-          </n-popconfirm>
-          <div v-else style="color: #1890ff" @click="liveShow(item)">直播</div>
+          <div v-else style="color: #1890ff;float:left;width:56px" @click="liveShow(item)">直播</div>
         </li>
       </ul>
       <n-pagination
@@ -631,9 +631,11 @@ export default {
      * 展示直播视频
      */
     const liveShow = (rowInfo) => {
+      rowInfo = JSON.stringify(rowInfo)
+      rowInfo.toIndexRoute = true
       router.push({
         path: '/taskManage/all',
-        query: { rowInfo: JSON.stringify(rowInfo), toIndexRoute: true }
+        query: { rowInfo: rowInfo }
       })
     }
     onMounted(() => {
@@ -797,11 +799,12 @@ export default {
     padding: 10px 19px;
     ul {
       li {
-
         padding: 5px 2px;
         margin-bottom: 3px;
-        div{
-          float:left;
+        div {
+          float: left;
+          height:100%;
+          height:30px;
         }
       }
     }

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

@@ -79,7 +79,7 @@ export default {
   setup() {
     const route = useRoute()
     const rowInfo = route.query.rowInfo
-    const toIndexRoute = route.query.toIndexRoute
+
     getAirOptions()
     const searchRef = ref()
     const data = reactive({
@@ -123,8 +123,7 @@ export default {
     onMounted(() => {
       if (rowInfo) {
         data.rowData = JSON.parse(rowInfo)
-        // 有toIndexTRoute的话就关闭直播页面跳回首页
-        data.rowData.toIndexRoute = toIndexRoute
+
         data.liveDrawer = true
       }
     })