分屏全屏

src/components/UserSelectForm/index.vue

@@ -8,7 +8,6 @@
             :data="deptTree"
             :expand-on-click-node="false"
             :props="defaultProps"
-            default-expand-all
             highlight-current
             node-key="id"
             @node-click="handleNodeClick"
@@ -42,8 +41,8 @@
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
-import {companyLevelChildrenDepts} from "@/api/system/dept";
-import {companyDeptsEmployee} from "@/api/system/user";
+import { companyLevelChildrenDepts } from '@/api/system/dept'
+import { companyDeptsEmployee } from '@/api/system/user'
 
 defineOptions({ name: 'UserSelectForm' })
 const emit = defineEmits<{
@@ -86,10 +85,10 @@ const open = async (id: number, selectedList?: any[]) => {
   deptList.value = deptData // 保存扁平结构的部门数据
   deptTree.value = handleTree(deptData) // 转换成树形结构
   // userList.value = await UserApi.getSimpleUserList()
-  const ids = deptData.map(item => item.id)
+  const ids = deptData.map((item) => item.id)
   const params = {
     deptIds: ids
-  };
+  }
   debugger
   userList.value = await UserApi.companyDeptsEmployee(params)
 

src/views/pms/video_center/sip/splitview.vue

@@ -3,7 +3,7 @@
     <el-card
       id="devicePosition"
       shadow="never"
-      style="height: calc(100%); border: 0; width: 100vw"
+      style="height: calc(100%); border: 0"
       :body-style="{ padding: '0px' }"
       class="border-none"
     >
@@ -143,14 +143,38 @@ const setPlayerRef = (el, index) => {
 
 // 计算属性 - 直播样式
 const liveStyle = computed(() => {
-  let style = { width: '81%', height: '99%' }
-  switch (spilt.value) {
-    case 4:
-      style = { width: '40%', height: '49%' }
-      break
-    case 9:
-      style = { width: '27%', height: '32%' }
-      break
+  let style = {}
+  // switch (spilt.value) {
+  //   case 4:
+  //     style = { width: '40%', height: '49%' }
+  //     break
+  //   case 9:
+  //     style = { width: '27%', height: '32%' }
+  //     break
+  // }
+
+  if (spilt.value === 1) {
+    if (isFullscreen.value) {
+      style = { width: '100%', height: '100%' }
+    } else {
+      style = { width: '81%', height: '99%', 'margin-right': '5px' }
+    }
+  }
+
+  if (spilt.value === 4) {
+    if (isFullscreen.value) {
+      style = { width: '50%', height: '50%' }
+    } else {
+      style = { width: '40%', height: '49%', 'margin-right': '5px' }
+    }
+  }
+
+  if (spilt.value === 9) {
+    if (isFullscreen.value) {
+      style = { width: '33.3%', height: '33.3%' }
+    } else {
+      style = { width: '27%', height: '32%', 'margin-right': '5px' }
+    }
   }
 
   nextTick(() => {
@@ -609,7 +633,7 @@ const clear = (idx) => {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-right: 10px;
+  /* margin-right: 10px; */
   position: relative;
   /* border-radius: 5px; */
 }
@@ -658,14 +682,15 @@ const clear = (idx) => {
 
 .fullscreen-layout {
   height: 100vh !important;
-  width: 100% !important;
+  width: 100vw !important;
   margin: 0 !important;
   padding: 0 !important;
   position: fixed !important;
   top: 0 !important;
   left: 0 !important;
+  right: 0 !important;
   overflow: hidden !important;
-  max-width: 100% !important;
-  max-height: 105vh !important;
+  max-width: 100vw !important;
+  max-height: 100vh !important;
 }
 </style>