Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/AirInfo.vue

@@ -29,7 +29,7 @@
     <div class="monitorList">
       <div class="innerMonitor">
         <div class="monitorName">机场内部监控</div>
-        <img src="../../../assets/images/webScreen.png" @click="videoShowStyle">
+        <!-- <img src="../../../assets/images/webScreen.png" @click="videoShowStyle"> -->
         <videoPlay
           v-bind="innerMonitorOptions"
           style="z-index:1"
@@ -37,7 +37,7 @@
       </div>
       <div class="innerMonitor">
         <div class="monitorName">机场外部监控</div>
-        <img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle">
+        <!-- <img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle"> -->
         <videoPlay
           v-bind="outsideMonitorOptions"
           style="z-index:1"
@@ -75,17 +75,25 @@ export default {
       innerMonitorOptions: {
         width: '256px',
         height: '198px',
-        controls: false,
-        src: '',
-        webFullScreen: false
+        control: true, // 是否显示控制
+        controlBtns: [
+
+          'fullScreen'
+        ], // 显示所有按钮,
+
+        src: ''
 
       },
       outsideMonitorOptions: {
         width: '256px',
         height: '198px',
-        controls: false,
-        src: '',
-        webFullScreen: false
+        control: true, // 是否显示控制
+        controlBtns: [
+
+          'fullScreen'
+        ], // 显示所有按钮,
+        src: ''
+
       }
 
     })
@@ -126,6 +134,8 @@ 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

src/views/dashboard/components/OneMap.vue

@@ -4,17 +4,7 @@
       class="map-container"
       :="getMapOptions"
     />
-    <!-- <div class="layer-management">
-    <div class="list-manage">
-      <p>列表</p>
-      <n-switch v-model:value="listShow" />
-    </div>
-    <div class="air-manage">
-      <p>机场</p>
-      <n-switch v-model:value="airShow"
-                @update:value="airShowHide" />
-    </div>
-  </div> -->
+
     <div
 
       id="airOverlay"
@@ -47,9 +37,7 @@
           type="line"
           animated
         >
-          <!-- <n-tab-pane name="task" tab="任务">
-          任务
-        </n-tab-pane> -->
+
           <n-tab-pane
             name="question"
             tab="问题"
@@ -61,14 +49,7 @@
               :default-value="[Date.now() - 6.048e8, Date.now()]"
               :is-date-disabled="disablePreviousDate"
             />
-          <!-- <n-checkbox-group :value="cities" @update:value="handleUpdateValue">
-            <n-space style="display: block;">
-              <n-checkbox value="Beijing" label="北京" />
-              <n-checkbox value="Shanghai" label="上海" />
-              <n-checkbox value="Guangzhou" label="广州" />
-              <n-checkbox value="Shenzen" label="深圳" />
-            </n-space>
-          </n-checkbox-group> -->
+
           </n-tab-pane>
         </n-tabs>
       </n-card>
@@ -99,11 +80,8 @@
             style="display:flex;font-size:14px"
           >
             <div style="width:145px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ item.taskName }}</div>
-            <div style="42px">{{ item.statusInfo }}</div>
-            <!-- <div v-if="item.status==1"
-               @click="performTask(item)">立即执行</div> -->
-            <!-- <n-button v-if="item.status==1"
-                    @click="handleConfirm">立即执行</n-button> -->
+            <div style="width:42px">{{ item.statusInfo }}</div>
+
             <n-popconfirm
               v-if="item.status==1"
               @positive-click="handlePositiveClick(item)"
@@ -622,11 +600,12 @@ export default {
     const initTaskList = () => {
       getMissionList({
         page: data.page,
-        limit: 12
+        limit: 8
       }).then(res => {
         if (res.code === 0) {
           data.taskList = res.data.records
           data.pageCount = res.data.pages
+          // console.log(data.pageCount, '页数')
           data.taskList.map((item) => {
             const arr = item.executionStartTime.split(/[ ]+/)// 以空格分开
             item.taskName = arr[0] + item.name
@@ -766,8 +745,8 @@ export default {
   overflow:hidden;
 }
 .map-container {
-  width: 100%;
-  height:100%;
+  width:100vw;
+  height:100vh;
 }
 
 .layer-management {
@@ -853,8 +832,8 @@ export default {
       li {
         display: flex;
         justify-content: space-between;
-        padding: 8px 2px;
-        margin-bottom: 15px;
+        padding: 5px 2px;
+        margin-bottom: 10px;
       }
     }
   }