Prechádzať zdrojové kódy

fix: 场景分页修改

sunhongyao341504 2 rokov pred
rodič
commit
d2b5238a7e

+ 2 - 1
src/views/cameras/preview/components/CameraTree/CameraTree.vue

@@ -8,7 +8,7 @@
         :suffix-icon="Search"
         class="filterTextInput"
       />
-
+      <!-- <el-scrollbar> -->
       <el-tree
         :data="props.cameraTree"
         :props="defaultProps"
@@ -39,6 +39,7 @@
           </span>
         </template>
       </el-tree>
+      <!-- </el-scrollbar> -->
     </div>
   </div>
 </template>

+ 24 - 11
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>

+ 23 - 5
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;