Explorar o código

fix:
1. 修复分屏界面全屏给你

kindring %!s(int64=2) %!d(string=hai) anos
pai
achega
64980ad748

+ 1 - 0
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/aiLib/AiControl.java

@@ -185,6 +185,7 @@ public class AiControl {
         hbUploads(upload3, upload4, upload5, upload6, uploads);
         if(upload7!=null&&!upload7.isEmpty()){ uploads.add(upload7); }
         if (deviceId==null||deviceId.isEmpty() || deviceId==""){
+            logger.warn("没有设备id");
             return WVPResult.fail(ErrorCode.ERROR400.getCode(),"没有设备id");
         }
         channelId = (channelId==null||channelId.isEmpty())?"":channelId;

+ 3 - 3
web_src/src/components/live.vue

@@ -1,7 +1,7 @@
 <template>
-  <div id="devicePosition" style="width:100vw; height: 91vh">
-    <el-container v-loading="loading" style="height: 91vh;" element-loading-text="拼命加载中">
-      <el-aside width="300px" style="background-color: #ffffff">
+  <div id="devicePosition" :style="`width:100vw; height: ${isFullScreen?'100vh':'91vh'}`"  ref="container">
+    <el-container v-loading="loading" style="height: 100%;" element-loading-text="拼命加载中" >
+      <el-aside width="300px" v-show="asideHide" :style="`background-color: ${isFullScreen?'#eee':'#ffffff'}`">
         <DeviceTree :clickEvent="clickEvent" :contextMenuEvent="contextMenuEvent"></DeviceTree>
       </el-aside>
       <el-container>