合并分支 'fix_foton' 到 'FOTON'

Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!9

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: {
@@ -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()
@@ -626,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
 
     },
@@ -884,14 +885,14 @@ 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 => {
         this.dataCenterTable = res.data.records
-        this.dataCenterSearch.total = res.data.total
+        this.total = res.data.total
         this.loading = false
       }, e => {
         console.log(e)