From 5ba4c612b2f85f07a558e7ecad9488907b7dee41 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Mon, 15 May 2023 11:42:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:CN-971=20=201.=E5=8D=A1=E7=89=87=E4=B8=AD?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E3=80=81id=E5=92=8C=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80=E8=B7=9F=E8=AE=BE=E8=AE=A1=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E8=B7=9Fid=E4=B9=8B=E9=97=B4=E6=9C=89?=
 =?UTF-8?q?=E8=BE=83=E5=A4=A7=E7=9A=84=E9=97=B4=E9=9A=94=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=9D=A5=E5=8C=BA=E5=88=86head=E5=92=8C=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E3=80=82=20=20=20=20=20=20=20=20=20=20=20=20=202.=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E5=88=B0=E9=9D=9E=E7=AC=AC=E4=B8=80=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9F=A5=E8=AF=86=E5=BA=93=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?cancel=E6=88=96save=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B0=E7=BC=96=E8=BE=91=E5=89=8D=E9=A1=B5=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/setting/knowledgeBase.scss          |  3 +-
 src/components/common/Pagination.vue          |  3 +-
 .../table/setting/KnowledgeBaseTable.vue      |  2 ++
 src/mixins/data-list.js                       |  2 +-
 src/utils/constants.js                        |  4 +--
 src/views/setting/KnowledgeBaseForm.vue       | 32 +++++++++++++++----
 6 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/assets/css/components/views/setting/knowledgeBase.scss b/src/assets/css/components/views/setting/knowledgeBase.scss
index 83c80c71..c84ed45d 100644
--- a/src/assets/css/components/views/setting/knowledgeBase.scss
+++ b/src/assets/css/components/views/setting/knowledgeBase.scss
@@ -415,7 +415,8 @@
               font-size: 12px;
               color: #999999;
               font-weight: 400;
-              margin-bottom:6px;
+              margin-bottom:16px;
+              line-height: 12px;
             }
             .card-desc {
               //font-family: NotoSansSChineseRegular;
diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
index 286c0a95..9e898ca1 100644
--- a/src/components/common/Pagination.vue
+++ b/src/components/common/Pagination.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pagination">
+  <div class="pagination" >
     <el-pagination
         ref="page"
         @size-change="size"
@@ -60,7 +60,6 @@ export default {
     const { query } = useRoute()
     const pageSize = ref(defaultPageSize)
     const currentPageNo = ref(props.storePageNoOnUrl ? (query.pageNo || (props.pageObj.pageNo || 1)) : (props.pageObj.pageNo || 1))
-
     return {
       pageSize,
       currentPageNo
diff --git a/src/components/table/setting/KnowledgeBaseTable.vue b/src/components/table/setting/KnowledgeBaseTable.vue
index 20fc1304..16c59eea 100644
--- a/src/components/table/setting/KnowledgeBaseTable.vue
+++ b/src/components/table/setting/KnowledgeBaseTable.vue
@@ -129,10 +129,12 @@ export default {
       this.$emit('delete', data)
     },
     edit (id) {
+      const pageNo = this.$router.currentRoute.value.query.pageNo
       this.$router.push({
         path: '/knowledgeBase/edit',
         query: {
           t: +new Date(),
+          pageNoForTable: pageNo || 1,
           id: id
         }
       })
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index 1c77b9d4..186e932b 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -20,7 +20,7 @@ export default {
       pageObj: { // 分页对象
         pageNo: 1,
         pageSize: defaultPageSize,
-        total: 0
+        total: null//total为0时，elment分页组件pagination,修改当前页无效。修改为null即可解决此问题
       },
       /* 工具参数 */
       tools: {
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 96b56f67..4192c0e3 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -58,9 +58,9 @@ export const panelTypeAndRouteMapping = {
   networkOverviewDrillDown: 13,
   networkAppPerformance: 2,
   dnsServiceInsights: 3,
-/*  ipEntityDetail: 4,
+  /*  ipEntityDetail: 4,
   domainEntityDetail: 5,
-  appEntityDetail: 6,*/
+  appEntityDetail: 6, */
   ipEntityDetail: 21,
   domainEntityDetail: 22,
   appEntityDetail: 23,
diff --git a/src/views/setting/KnowledgeBaseForm.vue b/src/views/setting/KnowledgeBaseForm.vue
index 6c1ac5da..a963be0f 100644
--- a/src/views/setting/KnowledgeBaseForm.vue
+++ b/src/views/setting/KnowledgeBaseForm.vue
@@ -411,7 +411,8 @@ export default {
       timer: null,
       isShowUploadTips: false,
       isPreviewChange: false,
-      isClick: false
+      isClick: false,
+      pageNoForTable: 1
     }
   },
   methods: {
@@ -602,6 +603,7 @@ export default {
       this.isPreviewChange = true
     },
     cancel () {
+      const self = this
       if (this.isPreviewChange) {
         this.$confirm(this.$t('tip.leavePage'), {
           confirmButtonText: this.$t('tip.confirm'),
@@ -614,13 +616,19 @@ export default {
         }).then(() => {
           this.$router.push({
             path: '/knowledgeBase',
-            t: +new Date()
+            query: {
+              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+              t: +new Date()
+            }
           })
         }).catch(() => {})
       } else {
         this.$router.push({
           path: '/knowledgeBase',
-          t: +new Date()
+          query: {
+            pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+            t: +new Date()
+          }
         })
       }
     },
@@ -680,6 +688,7 @@ export default {
                       d.itemList = Array.from(d.itemList)
                     })
                     postData.remark = this.editObject.remark
+                    const self = this
                     if (!this.editObject.id) {
                       axios.post(this.url, postData).then(response => {
                         if (response.data.code === 200) {
@@ -690,7 +699,10 @@ export default {
                           })
                           this.$router.push({
                             path: '/knowledgeBase',
-                            t: +new Date()
+                            query: {
+                              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+                              t: +new Date()
+                            }
                           })
                         } else {
                           this.errorMsgHandler(response)
@@ -712,7 +724,10 @@ export default {
                           })
                           this.$router.push({
                             path: '/knowledgeBase',
-                            t: +new Date()
+                            query: {
+                              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+                              t: +new Date()
+                            }
                           })
                         } else {
                           this.errorMsgHandler(response)
@@ -852,6 +867,8 @@ export default {
     }
   },
   mounted () {
+    const pageNo = this.$router.currentRoute.value.query.pageNoForTable
+    this.pageNoForTable = pageNo || 1
     const div = document.getElementsByClassName('el-upload-dragger')[0]
     const self = this
     div.addEventListener('click', function (event) {
@@ -886,7 +903,10 @@ export default {
         this.$message.error(this.errorMsgHandler(e))
         this.$router.push({
           path: '/knowledgeBase',
-          t: +new Date()
+          query: {
+            pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+            t: +new Date()
+          }
         })
       })
     }