From 879b43cea5ef71e187dd8b25f3c6e9c346c44752 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 21 Nov 2022 18:22:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=88=95=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BA=8B=E4=BB=B6=EF=BC=9B=E4=BF=AE=E6=94=B9UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  |  1 +
 .../views/home/components/KnowledgeBase.vue   |  5 +++
 .../home/detailsPageInfrastructureTreeXha.vue |  7 ++--
 front/src/views/home/infrastructurePage.vue   | 33 ++++++++++++++-----
 .../src/views/home/infrastructurePageXha.vue  |  2 +-
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index dcc77b9b..2f3cdf55 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -143,6 +143,7 @@
           show-size-changer
           show-less-items
           show-quick-jumper
+          :showTotal="total => `共 ${total} 项`"
           :total="resourceTotal"
           :page-size-options="pageSizeOptions"
           @change="pageChange"
diff --git a/front/src/views/home/components/KnowledgeBase.vue b/front/src/views/home/components/KnowledgeBase.vue
index 74842d04..0408b64e 100644
--- a/front/src/views/home/components/KnowledgeBase.vue
+++ b/front/src/views/home/components/KnowledgeBase.vue
@@ -40,6 +40,10 @@
             :pageSize="5"
             :total="props.resourceTotal"
             show-less-items
+            show-size-changer
+            show-quick-jumper
+            :page-size-options="pageSizeOptions"
+            :showTotal="total => `共 ${total} 项`"
             @change="handleCurrentChange"
             :showSizeChanger="false"
           />
@@ -56,6 +60,7 @@
     resourceList: { type: Array, default: null },
     resourceTotal: { type: String, default: '' },
   })
+  const pageSizeOptions = ref(['5', '10', '20', '50'])
   console.log('props==========>', props)
   // 知识库
   const zskState = reactive({
diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
index 964cddf8..9387dcb6 100644
--- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue
+++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
@@ -191,7 +191,10 @@ export default defineComponent({
     mybus.on('getDeptList', () => {
       init()
     })
-
+    mybus.on('clearChoose', () => {
+      selectId.value=''
+      chooseId.value=''
+    })
     const onSelect = async (item, val, child) => {
       let res = {}
       if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
@@ -270,7 +273,7 @@ export default defineComponent({
   },
   beforeUnmount() {
     mybus.off('getDeptList')
-    console.log('getDeptList销毁~~~~~~~~~~~~~~~~~~~')
+    mybus.off('clearChoose')
   },
   components: {
     UpOutlined,
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index ea531868..a8d4616d 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -128,16 +128,21 @@
             预约
           </a-button>
         </div>
+        
+        <!-- <div class="flex-space" style="justify-content: center;display:flex;height:40px;align-items:center;"> -->
         <a-pagination
           v-model:current="roomPage"
           v-model:pageSize="roomLimit"
           show-quick-jumper
+          :showTotal="total => `共 ${total} 项`"
           :total="roomTotal"
           :page-size-options="pageSizeOptions"
           @change="onRoomChange"
           @showSizeChange="onShowSizeChange"
           show-size-changer
-        />
+        /> 
+        <!-- <el-button @click="onOkChange" class="queding" >确认</el-button>
+</div> -->
       </div>
       <div v-if="roomResult" style="display: grid">
         <a-table
@@ -1440,10 +1445,14 @@
     }
   }
   //分页
-  const onRoomChange = (pageNumber) => {
+  const onRoomChange = () => {
     roomPage.value = pageNumber
     searchData()
   }
+  const onOkChange = () => {
+    current.value = roomPage.value
+    searchData()
+  }
   const onShowSizeChange = (current, pageSize) => {
     roomLimit.value = pageSize
     searchData()
@@ -2471,6 +2480,16 @@
   })
 </script>
 <style lang="less" scoped>
+.queding{
+  margin-left: 16px;
+    cursor: pointer;
+    background: #0058e1;
+    color: #ffffff;
+    width: 56px;
+    border-radius: 2px;
+    border: 1px #0058e1 solid;
+    margin-top: 17px;
+  }
   .infrastructrueBox {
     padding: 0.2rem;
     background: #ffffff;
@@ -2803,13 +2822,11 @@
       }
     }
 
-    :deep(.ant-pagination) {
-      float: right;
-    }
 
-    :deep(.ant-pagination) {
-      text-align: end;
-    }
+
+    // :deep(.ant-pagination) {
+    //   text-align: end;
+    // }
   }
   :deep(.ant-table-thead > tr > th) {
     color: #5580f7 !important;
diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue
index e2c75bb9..2c20db0e 100644
--- a/front/src/views/home/infrastructurePageXha.vue
+++ b/front/src/views/home/infrastructurePageXha.vue
@@ -2579,7 +2579,7 @@
     }
 
     :deep(.ant-pagination) {
-      float: right;
+      float: center;
     }
 
     :deep(.ant-pagination) {