修复导出bug

src/views/admin/taskManagement/missionCenter.vue

@@ -21,22 +21,26 @@
             <div class="r-btn">
               <template v-if="pkgBtnErrorMsg">
                 <el-tooltip effect="dark" :content="pkgBtnErrorMsg" placement="top-start">
-                  <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+                  <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
                 </el-tooltip>
               </template>
               <template v-else>
-                <el-button v-if="pkgDetailShow" :disabled="exportPkgDisabled" size="small" @click="downInfo(2)">{{ pkgBtnText }}</el-button>
+                <el-button :type="exportPkgDisabled ? '' : 'primary'" v-if="pkgDetailShow" :disabled="exportPkgDisabled" size="small" @click="downInfo(2)">{{
+                  pkgBtnText
+                }}</el-button>
               </template>
               <el-button type="primary" size="small" @click="exportPersonalPackage">个人执行包数据导出</el-button>
             </div>
             <div class="r-btn">
               <template v-if="taskDetailErrorMsg">
                 <el-tooltip effect="dark" :content="taskDetailErrorMsg" placement="top-start">
-                  <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+                  <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
                 </el-tooltip>
               </template>
               <template v-else>
-                <el-button v-if="taskDetailShow" :disabled="exportTaskDetailDisabled" size="small" @click="downInfo(1)">{{ taskDetailBtnText }}</el-button>
+                <el-button :type="exportTaskDetailDisabled ? '' : 'primary'" v-if="taskDetailShow" :disabled="exportTaskDetailDisabled" size="small" @click="downInfo(1)">{{
+                  taskDetailBtnText
+                }}</el-button>
               </template>
               <el-button type="primary" size="small" @click="exportPersonalTaskDetails">个人任务明细数据导出</el-button>
             </div>
@@ -590,6 +594,7 @@ export default {
     async gerTaskExprotResult() {
       const checkStatus = async () => {
         const res = await getExportResult({ type: 'TASK_DETAIL' });
+        this.taskDetailErrorMsg = '';
         if (res.data.code === 0) {
           this.taskDetailShow = true;
           const status = res.data.data.status;
@@ -603,7 +608,7 @@ export default {
             this.exportTaskDetailDisabled = false;
             return true;
           } else if (status === 'ERROR') {
-            this.taskDetailBtnText = res.data.data.errorMsg;
+            this.taskDetailErrorMsg = res.data.data.errorMsg || '导出失败';
             this.exportTaskDetailDisabled = true;
             return true;
           } else {
@@ -635,6 +640,7 @@ export default {
     async gerPkgExprotResult() {
       const checkStatus = async () => {
         const res = await getExportResult({ type: 'SCORE_PACKAGE_SUB' });
+        this.pkgBtnErrorMsg = '';
         if (res.data.code === 0) {
           this.pkgDetailShow = true;
           const status = res.data.data.status;
@@ -648,7 +654,7 @@ export default {
             this.exportPkgDisabled = false;
             return true;
           } else if (status === 'ERROR') {
-            this.pkgBtnText = res.data.data.errorMsg;
+            this.pkgBtnErrorMsg = res.data.data.errorMsg || '生成失败';
             this.exportPkgDisabled = true;
             return true;
           } else {
@@ -744,7 +750,7 @@ export default {
 
   i {
     font-weight: 600;
-    font-size: 14px;
+    font-size: 12px;
   }
 
   &:hover {

src/views/admin/user/index.vue

@@ -35,11 +35,13 @@
           <!-- 角色说明隐藏 -->
           <template v-if="exportUserInfoErrorMsg">
             <el-tooltip effect="dark" :content="exportUserInfoErrorMsg" placement="top-start">
-              <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+              <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
             </el-tooltip>
           </template>
           <template v-else>
-            <el-button v-if="downShow" size="small" :disabled="exportUserInfoDisabled" type="primary" @click="downInfo">{{ exportUserInfoText }}</el-button>
+            <el-button :type="exportUserInfoDisabled ? '' : 'primary'" v-if="downShow" size="small" :disabled="exportUserInfoDisabled" type="primary" @click="downInfo">{{
+              exportUserInfoText
+            }}</el-button>
           </template>
           <el-button v-if="userInfo?.roles?.includes(50)" size="small" type="primary" @click="exportUserInfo">导出人员数据</el-button>
         </template>
@@ -364,6 +366,7 @@ export default {
     async getExportInfoStatus() {
       const checkStatus = async () => {
         const res = await getExportResult({ type: 'USER' });
+        this.exportUserInfoErrorMsg = '';
         if (res.data.code === 0) {
           this.downShow = true;
           const status = res.data.data.status;
@@ -809,7 +812,7 @@ export default {
 
   i {
     font-weight: 600;
-    font-size: 14px;
+    font-size: 12px;
   }
 
   &:hover {

src/views/serviceManagement/serviceReviewed/index.vue

@@ -104,22 +104,26 @@
           <div class="r-btn">
             <template v-if="pkgBtnErrorMsg">
               <el-tooltip effect="dark" :content="pkgBtnErrorMsg" placement="top-start">
-                <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+                <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
               </el-tooltip>
             </template>
             <template v-else>
-              <el-button v-if="pkgDetailShow" :disabled="exportPkgDisabled" size="small" @click="downInfo(2)">{{ pkgBtnText }}</el-button>
+              <el-button :type="exportPkgDisabled ? '' : 'primary'" v-if="pkgDetailShow" :disabled="exportPkgDisabled" size="small" @click="downInfo(2)">{{
+                pkgBtnText
+              }}</el-button>
             </template>
             <el-button type="primary" size="small" @click="exportPersonalPackage">个人执行包数据导出</el-button>
           </div>
           <div class="r-btn">
             <template v-if="taskDetailErrorMsg">
               <el-tooltip effect="dark" :content="taskDetailErrorMsg" placement="top-start">
-                <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+                <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
               </el-tooltip>
             </template>
             <template v-else>
-              <el-button v-if="taskDetailShow" :disabled="exportTaskDetailDisabled" size="small" @click="downInfo(1)">{{ taskDetailBtnText }}</el-button>
+              <el-button :type="exportTaskDetailDisabled ? '' : 'primary'" v-if="taskDetailShow" :disabled="exportTaskDetailDisabled" size="small" @click="downInfo(1)">{{
+                taskDetailBtnText
+              }}</el-button>
             </template>
             <el-button type="primary" size="small" @click="exportPersonalTaskDetails">个人任务明细数据导出</el-button>
           </div>
@@ -508,6 +512,7 @@ export default {
     async gerTaskExprotResult() {
       const checkStatus = async () => {
         const res = await getExportResult({ type: 'TASK_DETAIL' });
+        this.taskDetailErrorMsg = '';
         if (res.data.code === 0) {
           this.taskDetailShow = true;
           let status = res.data.data.status;
@@ -554,6 +559,7 @@ export default {
     async gerPkgExprotResult() {
       const checkStatus = async () => {
         const res = await getExportResult({ type: 'SCORE_PACKAGE_SUB' });
+        this.pkgBtnErrorMsg = '';
         if (res.data.code === 0) {
           this.pkgDetailShow = true;
           const status = res.data.data.status;
@@ -679,7 +685,7 @@ export default {
 
   i {
     font-weight: 600;
-    font-size: 14px;
+    font-size: 12px;
   }
 
   &:hover {

src/views/servicePackageMonitoring/riskEventAudit/index.vue

@@ -41,10 +41,12 @@
           <div class="r-btn" v-if="userInfo?.roles?.includes(53)">
             <template v-if="exportDetailErrorMsg">
               <el-tooltip effect="dark" :content="exportDetailErrorMsg" placement="top-start">
-                <el-button class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
+                <el-button size="small" class="error-message" disabled>生成失败<i class="el-icon-warning-outline el-icon--right"></i></el-button>
               </el-tooltip>
             </template>
-            <el-button v-if="exportDetailShow" :disabled="exportDetailDisabled" size="small" @click="downInfo">{{ exportBtnText }}</el-button>
+            <el-button :type="exportDetailDisabled ? '' : 'primary'" v-if="exportDetailShow" :disabled="exportDetailDisabled" size="small" @click="downInfo">{{
+              exportBtnText
+            }}</el-button>
 
             <el-button type="primary" size="small" @click="exportTask">监督任务数据导出</el-button>
           </div>
@@ -439,7 +441,7 @@ export default {
         if (res.data.code === 0) {
           this.exportDetailShow = true;
           const status = res.data.data.status;
-
+          this.exportDetailErrorMsg = '';
           if (status === 'GENERATING') {
             this.exportBtnText = '数据生成中';
             this.exportDetailDisabled = true;
@@ -564,7 +566,7 @@ export default {
 
   i {
     font-weight: 600;
-    font-size: 14px;
+    font-size: 12px;
   }
 
   &:hover {

src/views/servicePackageMonitoring/riskEventAudit/taskMonitor.vue

@@ -28,7 +28,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="起止时间：">
+              <el-form-item label="提交时间">
                 <!-- <ElQuarterPicker placeholder="请选择" v-model="monthrange" @change="monthrangeChange" class="w100" /> -->
                 <p>{{ currText }}</p>
               </el-form-item>
@@ -261,8 +261,7 @@ export default {
         pkgPeriod: [],
         mahName: '',
         memberName: '',
-        taskPeriod: [],
-
+        taskPeriod: []
       },
       monthrange: '',
       allCheck: false,
@@ -313,12 +312,9 @@ export default {
 
       this.currText = str;
 
-      this.monthrangeChange(time)
-
+      this.monthrangeChange(time);
     }
 
-
-
     await this.getTaskList();
     this.getList();
   },