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 @@ 导出 @@ -82,7 +83,7 @@ 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 @@ 导出 @@ -34,7 +35,7 @@ min-width="80"> @@ -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 @@ 导出 @@ -57,7 +58,7 @@ min-width="80"> @@ -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 @@ 导出 @@ -38,6 +39,9 @@ label="事件类别" align="center" min-width="200"> + + {{scope.row.workTypeName}} + + min-width="150px"> { 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;