From fbf3676a2d01d7057a63c1404a186a0d84d3b77a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 9 Nov 2021 09:58:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=A1=B9=E7=9B=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectClassifyStatic/classifyList.vue    | 38 +++++++++++++------
 .../projectClassifyStatic/projectList.vue     |  2 +-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue
index ad4978b..b1868e3 100644
--- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue
@@ -69,7 +69,7 @@
                     style="width: 100%;margin-bottom: 20px;"
                     row-key="categoryCode"
                     border
-                    default-expand-all
+                    :default-expand-all="false"
                     :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
             <el-table-column prop="categoryName"
                              label="所属类别"
@@ -172,7 +172,6 @@ export default {
       timeArray: ['', ''],
 
       //导出表格部分
-      agencyName: '',
       startTimeShow: '',//导出表格标题处显示的内容 	
       endTimeShow: '', //导出表格标题处显示的内容 	
       endTimeModel: new Date() - 60 * 60 * 24 * 2,
@@ -205,10 +204,20 @@ export default {
       if (code === 0) {
         ++this.iscascaderShow
         this.casOptions = []
-        this.agencyIdArray.length = []
+        this.agencyIdArray = []
         this.tableParams.orgId = ''
         if (data) {
+          //默认级联选中父级
+          this.selAgencyObj = {
+            agencyId: data.agencyId,
+            agencyName: data.agencyName,
+            level: data.level,
+            pid: data.pid,
+          }
+
           this.casOptions.push(data)
+          this.agencyIdArray.push(data.agencyId)
+
         }
 
       } else {
@@ -218,7 +227,14 @@ export default {
     async loadTable () {
       if (this.validate()) {
         const url = '/data/report/screen/project/selectprojectcategory'
-        // const url = 'http://yapi.elinkservice.cn/mock/102/data/report/screen/project/selectprojectcategory'
+
+        if (this.selAgencyObj) {
+          this.tableParams.orgId = this.selAgencyObj.agencyId
+          this.tableParams.orgType = this.selAgencyObj.level
+        } else {
+          this.tableParams.orgId = ''
+          this.tableParams.orgType = ''
+        }
 
         if (this.staticType === 'end') {
           this.tableParams.startTime = ''
@@ -249,14 +265,10 @@ export default {
     handleChange (value) {
       if (value && value.length > 0) {
         this.selAgencyObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-        this.tableParams.orgId = this.selAgencyObj.agencyId
-        this.tableParams.orgType = this.selAgencyObj.level
-        this.agencyName = this.selAgencyObj.agencyName
+
       } else {
         this.selAgencyObj = {}
-        this.tableParams.orgId = ''
-        this.tableParams.orgType = ''
-        this.agencyName = ''
+
       }
     },
 
@@ -326,7 +338,11 @@ export default {
       if (!this.validate()) {
         return false
       }
-      let title = this.agencyName
+      let title = ''
+      if (this.selAgencyObj) {
+        title = this.selAgencyObj.agencyName
+      }
+
 
       if (this.staticType === 'Interval') {
         title = title + ' ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值'
diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue
index 20f8740..dbb91ff 100644
--- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue
@@ -238,7 +238,7 @@ export default {
     initAgencyList (casOptions) {
       ++this.iscascaderShow
       this.casOptions = []
-      this.agencyIdArray.length = []
+      this.agencyIdArray = []
       this.tableParams.orgId = ''
       if (casOptions) {
         this.casOptions = casOptions