Prechádzať zdrojové kódy

[Mod 0000] 优化瓦斯钻孔视频识别页面视频播放功能

hongrunxia 4 týždňov pred
rodič
commit
bbf9945e01

+ 3 - 1
src/views/vent/gas/gasZk/index.vue

@@ -5,7 +5,7 @@
       <div class="left-box">
         <div class="video">
           <video controls autoplay muted loop fluent style="height: 100%; width: 100%; padding: 30px 20px">
-            <!-- <source src="/sys/common/static/output_video.mp4" /> -->
+            <source :src="`${baseApiUrl}/sys/common/static/gif/output_video.mp4`" type="video/mp4" />
           </video>
         </div>
       </div>
@@ -39,6 +39,7 @@
   const videoPlayTime = ref(0); //视频开始播放时间
   const curStatus = ref(''); //当前状态
   const usedCount = ref(''); //钻孔计数
+  const videoUrl = ref('');
   let timer: IntervalHandle; //定时器
   //时间轮询
   const startPolling = () => {
@@ -115,6 +116,7 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
+      margin-top: 80px;
       .left-box {
         flex: 3;
         height: 100%;

+ 1 - 18
src/views/vent/monitorManager/deviceCameraMonitor/index.vue

@@ -304,10 +304,6 @@ const scroll = reactive({
   y: 180,
 });
 let departmentInfo: Null | Object = null;
-let gaspatrol = ref(null);
-let gasreport = ref(null);
-let gasreportcount = ref(null);
-let station = ref(null);
 function tabChange(activeKeyVal) {
   activeKey.value = activeKeyVal;
 }
@@ -321,20 +317,7 @@ function getMonitor(flag?) {
     if (Object.prototype.toString.call(timer) === '[object Null]') {
       timer = setTimeout(
         async () => {
-          if (deviceType.value.startsWith('gasDay_normal') && gaspatrol.value) {
-            gaspatrol.value.queryNowGasInsInfoList(); //人工瓦斯巡检
-          } else if (deviceType.value.startsWith('gasDayReport')) {
-            if (glob.sysOrgCode == 'sdmtjtbetmk') {
-              gasreportcount.value.getSearchReport();
-            } else {
-              gasreport.value.getSearchReport(); //瓦斯日报
-            }
-          } else if (deviceType.value.startsWith('substation') && station.value) {
-            //分站
-            station.value.getStationList();
-          } else {
-            await getDataSource();
-          }
+          await getDataSource();
           if (timer) {
             getMonitor();
           }

+ 2 - 3
src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.hlg.vue

@@ -677,10 +677,9 @@
         //     deviceId: 1754025882387599364,
         //   },
         // ];
+
         deviceList.value = newDataSource as any[];
-         if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+        activeDeviceID.value = newActiveID as string;
         // activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
         maxTemp.value = 0;
         newDataSource?.forEach((item: any, index) => {