From 00604273a6b415f8274fc7514b42b0bb122f2abe Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 6 Jan 2022 14:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading=E3=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workPc/gridmemberStatic/gridmemberList.vue  |  8 ++++++--
 .../workPc/gridmemberStatic/patrolList.vue      |  7 +++++--
 .../workPc/gridmemberStatic/projectList.vue     |  7 +++++--
 .../workPc/gridmemberStatic/workList.vue        | 17 ++++++++++++++---
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/gridmemberList.vue b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/gridmemberList.vue
index 4a9dfce..9c1601a 100644
--- a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/gridmemberList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/gridmemberList.vue
@@ -56,6 +56,7 @@
                 </el-form-item>
                 <el-form-item style="margin-left:10px">
                   <el-button @click="loadOutTableData()"
+                             :loading="downloadLoading"
                              type="primary">导出</el-button>
                 </el-form-item>
               </div>
@@ -82,7 +83,7 @@
                              header-align="center">
             </el-table-column>
             <el-table-column prop="orgName"
-                             label="所属网格"
+                             label="所属组织"
                              align="center"
                              min-width="190px"
                              header-align="center">
@@ -310,6 +311,7 @@ export default {
         this.tableLoading = true
         if (this.staticType === 'end') {
           this.tableParams.startTime = ''
+          this.timeArray[0] = ''
         }
         const { data, code, msg } = await requestPost(url, this.tableParams)
         this.tableLoading = false
@@ -478,7 +480,7 @@ export default {
         title = title + ' 工作 截止至' + this.endTimeShow + '累计值'
       }
       console.log(title)
-
+      this.downloadLoading = true
       const url = "/data/aggregator/org/pcwork/gridmember-analysis/export"
 
       console.log(this.tableParams)
@@ -488,9 +490,11 @@ export default {
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.downloadLoading = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.downloadLoading = false
         }
       );
 
diff --git a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/patrolList.vue b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/patrolList.vue
index 0dfe1a4..7d47200 100644
--- a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/patrolList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/patrolList.vue
@@ -17,6 +17,7 @@
             <el-form-item style="margin-left:10px">
               <el-button @click="loadOutTableData()"
                          size="mini"
+                         :loading="downloadLoading"
                          type="primary">导出</el-button>
             </el-form-item>
 
@@ -34,7 +35,7 @@
                            min-width="80">
           </el-table-column>
           <el-table-column prop="gridName"
-                           label="所属网格"
+                           label="所属组织"
                            align="center"
                            min-width="200">
           </el-table-column>
@@ -223,16 +224,18 @@ export default {
       console.log(title)
 
       const url = "/epmetuser/staffpatrol/pcwork/record-list/export"
-
+      this.downloadLoading = true
       app.ajax.exportFilePost(
         url,
         this.tableParams,
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.downloadLoading = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.downloadLoading = false
         }
       );
 
diff --git a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/projectList.vue
index d8fb416..c76c43d 100644
--- a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/projectList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/projectList.vue
@@ -17,6 +17,7 @@
             <el-form-item style="margin-left:10px">
               <el-button @click="loadOutTableData()"
                          size="mini"
+                         :loading="downloadLoading"
                          type="primary">导出</el-button>
             </el-form-item>
 
@@ -57,7 +58,7 @@
                            min-width="80">
           </el-table-column>
           <el-table-column prop="gridName"
-                           label="所属网格"
+                           label="所属组织"
                            align="center"
                            min-width="150">
           </el-table-column>
@@ -257,7 +258,7 @@ export default {
       }
       console.log(title)
 
-
+      this.downloadLoading = true
       const url = "/gov/project/trace/pcwork/approvaled-list/export"
 
       app.ajax.exportFilePost(
@@ -266,9 +267,11 @@ export default {
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.downloadLoading = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.downloadLoading = false
         }
       );
 
diff --git a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workList.vue b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workList.vue
index 8b8ff79..6f449e2 100644
--- a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workList.vue
@@ -18,6 +18,7 @@
             <el-form-item style="margin-left:10px">
               <el-button @click="loadOutTableData()"
                          size="mini"
+                         :loading="downloadLoading"
                          type="primary">导出</el-button>
             </el-form-item>
 
@@ -38,6 +39,9 @@
                            label="事件类别"
                            align="center"
                            min-width="200">
+            <template slot-scope="scope">
+              <div class="span_onerow">{{scope.row.workTypeName}}</div>
+            </template>
           </el-table-column>
           <el-table-column prop="isNormalShow"
                            label="有无异常"
@@ -60,14 +64,14 @@
                            min-width="80px">
           </el-table-column>
           <el-table-column prop="gridName"
-                           label="所属网格"
+                           label="所属组织"
                            align="center"
                            min-width="190px">
           </el-table-column>
           <el-table-column prop="createdTime"
                            label="提交日期"
                            align="center"
-                           min-width="140px">
+                           min-width="150px">
           </el-table-column>
 
           <el-table-column label="操作"
@@ -265,7 +269,7 @@ export default {
         title = title + ' 例行工作 截止至' + this.endTimeShow + '累计值'
       }
       console.log(title)
-
+      this.downloadLoading = true
       const url = "/epmetuser/patrolroutinework/pcwork/list/export"
 
       app.ajax.exportFilePost(
@@ -274,9 +278,11 @@ export default {
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.downloadLoading = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.downloadLoading = false
         }
       );
 
@@ -349,6 +355,11 @@ export default {
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
 }
+.span_onerow {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 /* .register .el-table .el-table__header-wrapper {
   position: absolute;
   top: 0;