From 7bc7169bd15fa44f8cd8d7d62743beb1ac12afd9 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 29 Dec 2022 11:52:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6=E7=BB=93=E6=9E=84=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=8F=B3=E4=BE=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/dataCenter/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index acaa7ded5..d4ad32350 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -603,9 +603,10 @@ export default {
         this.treeList = list1
       }
     },
-    treeClick(treeNode) {
+    treeClick(treeNode,a,b) {
       this.selectSarMenu = treeNode
       this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.dataCenterSearch.dataType = treeNode.name
       this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.treeName = treeNode.name
       this.searchInfo()
@@ -884,9 +885,9 @@ export default {
         this.loading = false
         return
       }
-      if(this.dataCenterSearch.treeId){
-        delete this.dataCenterSearch.treeId
-      }
+      // if(this.dataCenterSearch.treeId){
+      //   delete this.dataCenterSearch.treeId
+      // }
       this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
         _this: this
       }, res => {

From 2d2340f6ab31ebab0054ad1b2a8cbe9c85e765cd Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 29 Dec 2022 14:26:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=85=B3=E8=81=94=E5=8F=B3=E4=BE=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryRepository/dataCenter/index.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index d4ad32350..471c199b8 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -68,8 +68,8 @@
             <!--              v-model="dataCenterSearch.dataType"-->
             <!--              placeholder="请输入类型"-->
             <!--            ></el-input>-->
-            <el-select ref="treeSelect" class="tree-select" filterable :filter-method="filterMethod" @focus="onfocus" clearable v-model="dataCenterSearch.treeId" @clear="setValueNull" value-key="id" placeholder="请选择类型">
-              <el-option class="tree-select-option" :value="dataCenterSearch.treeId" :label="dataCenterSearch.dataType">
+            <el-select ref="treeSelect" class="tree-select" filterable :filter-method="filterMethod" @focus="onfocus" clearable v-model="dataCenterSearch.dataType" @clear="setValueNull" value-key="id" placeholder="请选择类型">
+              <el-option class="tree-select-option" :value="dataCenterSearch.dataType" :label="dataCenterSearch.dataType">
                 <el-tree v-if="!fuzzyquery"
                   ref="tree"
                   node-key="id"
@@ -227,7 +227,7 @@
           </el-table-column>
         </el-table>
         <loading :loading="loading">数据获取中</loading>
-        <pagination :page="dataCenterSearch.page" :total="dataCenterSearch.total" @pageChange="pageChange"
+        <pagination :page="dataCenterSearch.page" :total="total" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
@@ -474,8 +474,8 @@ export default {
         dataUploadTime: [],
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-        total: 0
       },
+      total: 0,
       dataCenterTable: [],
       cbcdOptions: [],
       productModelAdd: {
@@ -606,7 +606,7 @@ export default {
     treeClick(treeNode,a,b) {
       this.selectSarMenu = treeNode
       this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
-      this.dataCenterSearch.dataType = treeNode.name
+      // this.dataCenterSearch.dataType = treeNode.name
       this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.treeName = treeNode.name
       this.searchInfo()
@@ -627,7 +627,7 @@ export default {
 
     },
     selectTreeClick2(treeNode) {
-      this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
+      // this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.dataCenterSearch.dataType = treeNode.name
 
     },
@@ -892,7 +892,7 @@ export default {
         _this: this
       }, res => {
         this.dataCenterTable = res.data.records
-        this.dataCenterSearch.total = res.data.total
+        this.total = res.data.total
         this.loading = false
       }, e => {
         console.log(e)