Merge branch 'master' of ssh://172.16.23.188:9022/tian-group/skyeye-admin-fe

src/views/cameras/overview/components/AddCameraBySRS.vue

@@ -37,6 +37,7 @@
             v-model="CameraSRSData.principal"
             placeholder="请输入工位负责人"
             style="width: 200px"
+            :disabled="true"
           />
         </el-form-item>
         <el-form-item label="rsp地址：" prop="rtspurl">

src/views/cameras/preview/components/CameraTree/CameraTree.vue

@@ -8,37 +8,38 @@
         :suffix-icon="Search"
         class="filterTextInput"
       />
-
-      <el-tree
-        :data="props.cameraTree"
-        :props="defaultProps"
-        @node-click="handleNodeClick"
-        node-key="code"
-        :default-expand-all="true"
-        :filter-node-method="filterNode"
-        ref="treeRef"
-        v-loading="props.loading"
-      >
-        <template #default="{ node, data }">
-          <span class="custom-tree-node">
-            <span
-              class="cameraCommon"
-              :class="{
-                cameraSelect: isSelect(data),
-              }"
-            ></span>
-            <el-icon
-              v-if="data.nodeType === CameraTreeNodeType.camera"
-              class="cameraIcon"
-              :class="{
-                iconSelect: isSelect(data),
-              }"
-              ><VideoCamera
-            /></el-icon>
-            {{ node.label }}
-          </span>
-        </template>
-      </el-tree>
+      <el-scrollbar class="tree-scroll">
+        <el-tree
+          :data="props.cameraTree"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+          node-key="code"
+          :default-expand-all="true"
+          :filter-node-method="filterNode"
+          ref="treeRef"
+          v-loading="props.loading"
+        >
+          <template #default="{ node, data }">
+            <span class="custom-tree-node">
+              <span
+                class="cameraCommon"
+                :class="{
+                  cameraSelect: isSelect(data),
+                }"
+              ></span>
+              <el-icon
+                v-if="data.nodeType === CameraTreeNodeType.camera"
+                class="cameraIcon"
+                :class="{
+                  iconSelect: isSelect(data),
+                }"
+                ><VideoCamera
+              /></el-icon>
+              {{ node.label }}
+            </span>
+          </template>
+        </el-tree>
+      </el-scrollbar>
     </div>
   </div>
 </template>
@@ -101,6 +102,10 @@
     margin-right: 6px;
   }
 
+  .tree-scroll {
+    height: calc(100vh - 64px - 170px);
+  }
+
   .cameraSelect {
     width: 6px;
     height: 6px;

src/views/login/newLogin2.vue

@@ -4,18 +4,24 @@
       <div class="account-wrap-logo">
         <img src="@/assets/images/login/comnova-EYES2.png" alt="" />
       </div>
-      <div class="account-wrap-login">
-        <div class="login-pic">
-          <div>
-            <img src="~@/assets/images/login/login-pic.png" alt="" />
+      <div class="content-detail">
+        <div class="account-wrap-login">
+          <div class="login-pic">
+            <div>
+              <img src="~@/assets/images/login/login-pic.png" alt="" />
+            </div>
           </div>
-        </div>
-        <div class="login-form">
-          <div class="login-form-container">
-            <!-- <div class="account-top"> 欢迎您进入<br />安全管控开放平台 </div> -->
-            <img src="~@/assets/images/login/login-Yubei-admin.png" alt="" />
-            <LoginForm v-if="tab === 'login'" ref="LoginFormRef" @go-register="changeGoRegister" />
-            <RegisterForm v-else ref="RegisterFormRef" @back-login="changeBackLogin" />
+          <div class="login-form">
+            <div class="login-form-container">
+              <!-- <div class="account-top"> 欢迎您进入<br />安全管控开放平台 </div> -->
+              <img src="~@/assets/images/login/login-Yubei-admin.png" alt="" />
+              <LoginForm
+                v-if="tab === 'login'"
+                ref="LoginFormRef"
+                @go-register="changeGoRegister"
+              />
+              <RegisterForm v-else ref="RegisterFormRef" @back-login="changeBackLogin" />
+            </div>
           </div>
         </div>
       </div>
@@ -127,4 +133,11 @@
     //   }
     // }
   }
+
+  .content-detail {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>

src/views/map-config/mini-map/MiniMapConfig.vue

@@ -209,20 +209,21 @@
   };
 
   const getShopContent = (code: string) => {
-    getShowCameras(code);
-    getMapLayout(code).then((res) => {
-      if (!res) {
-        return;
-      }
-      hasBg.value = true;
-      isMap.value = res.isUploadBg;
-      if (res.isUploadBg) {
-        isUploadBg.value = true;
-        konvaMap.value.createMap(res);
-      } else {
-        hasBg.value = false;
-        isUploadBg.value = res.isUploadBg;
-      }
+    getShowCameras(code).then(() => {
+      getMapLayout(code).then((res) => {
+        if (!res) {
+          return;
+        }
+        hasBg.value = true;
+        isMap.value = res.isUploadBg;
+        if (res.isUploadBg) {
+          isUploadBg.value = true;
+          konvaMap.value.createMap(res);
+        } else {
+          hasBg.value = false;
+          isUploadBg.value = res.isUploadBg;
+        }
+      });
     });
   };
 

src/views/map-config/mini-map/use-mini-map.ts

@@ -35,9 +35,9 @@ export const useMiniMap = defineStore('mini-map', () => {
 
     if (!id) {
       ElMessage.error('摄像头code未找到对应信息');
-      return;
+      return Promise.resolve();
     }
-    getCameraList(id).then((res) => {
+    return getCameraList(id).then((res) => {
       res.forEach((space) => {
         if (space.cameraList && space.cameraList.length > 0) {
           space.cameraList.forEach((camera) => {

src/views/page-config/PageConfig.vue

@@ -16,7 +16,7 @@
         </el-button>
       </div>
     </el-card>
-    <el-card shadow="never" class="flex-1" style="margin-top: 8px">
+    <el-card shadow="never" class="flex-1" style="margin-top: 8px; overflow: auto">
       <PageMain />
     </el-card>
   </div>

src/views/system-config/scene-manage/SceneManage.vue

@@ -1,12 +1,13 @@
 <template>
   <page-wrapper>
-    <el-card :bordered="false" class="proCard" style="position: relative">
+    <el-card :bordered="false" class="proCard">
       <BasicTable
         :columns="colomns"
-        :data-source="tableData"
+        :data-source="showTableData"
         :row-key="(row) => row.name"
         :action-column="actionColumn"
         :expend-row="expendRowKeys"
+        :pagination="{ total: total, pageSize: size, hideOnSinglePage: false }"
         :tableSetting="{
           width: 200,
           size: false,
@@ -20,7 +21,6 @@
         @order-change="orderByItem"
         @page-num-change="handlePageNumChange"
         @page-size-change="handlePageSizeChange"
-        style="height: 800px"
       >
         <template #tableTitle>
           <div>
@@ -107,6 +107,7 @@
   import useSceneTemplete from './use-sence-templete';
   import { useRouter } from 'vue-router';
   import { storeToRefs } from 'pinia';
+  import { cloneDeep } from 'lodash-es';
 
   const router = useRouter();
 
@@ -118,6 +119,14 @@
   const expendRowKeys = ref(['']);
 
   const showDrawer = ref<DrawerType | null>(null);
+  const showTableData = computed(() => {
+    const temp = cloneDeep(tableData.value);
+    return temp.splice((page.value - 1) * size.value, page.value * size.value);
+  });
+
+  const page = ref(1);
+  const size = ref(10);
+  const total = computed(() => tableData.value.length);
 
   //改变el-drawer公司的状态
   const handleUpdateTableCom = () => {
@@ -159,8 +168,12 @@
   }
 
   const orderByItem = () => {};
-  const handlePageNumChange = () => {};
-  const handlePageSizeChange = () => {};
+  const handlePageNumChange = (pageNum) => {
+    page.value = pageNum;
+  };
+  const handlePageSizeChange = (pageSize) => {
+    size.value = pageSize;
+  };
 
   const companyAdd = () => {
     showDrawer.value = DrawerType.company;
@@ -414,6 +427,11 @@
 </script>
 
 <style scoped>
+  .proCard {
+    position: relative;
+    height: calc(100vh - 64px - 12px);
+  }
+
   .tag-select {
     margin-right: 10px;
     margin-bottom: 10px;