Merge branch 'dev-learning-0102' into 'release'

项目人员情况局部loading，导出明细未完成情况判断  code reviewer：杨广俊

项目人员情况局部loading，导出明细未完成情况判断  
code reviewer：杨广俊

See merge request !128

src/utils/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = '89B5047E977840D7B28D9DC93AB27C5A';
+      config.headers['token'] = '78A7FA0A5E974D248A261B7D444694D7';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/learning/item-data-all.vue

@@ -198,7 +198,13 @@
           <el-tab-pane label="未参与" name="3"></el-tab-pane>
         </el-tabs>
         <div v-if="downloadId == null">
-          <el-table :data="tableData" class="person-table">
+          <el-table 
+          v-loading="loadingTable" 
+          :data="tableData" 
+          class="person-table"
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+          >
             <el-table-column v-if="tableType == '1'" prop="rankNo" label="排名" align="center"></el-table-column>
             <el-table-column prop="doctorName" label="姓名" align="center"></el-table-column>
             <el-table-column prop="sex" label="性别" align="center">
@@ -416,6 +422,7 @@ export default {
         '3': '按参与人数排名',
       },
       showRadioValue: 0,
+      loadingTable: false,
     };
   },
   watch: {
@@ -580,8 +587,10 @@ export default {
         req.hospitalIdList = [];
         req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
       }
+      vm.loadingTable = true;
       vm.POST("stats/report/generalPersonal/"+vm.tableType, req, '', '', true).then(res => {
         if (res.code == "000000") {
+          vm.loadingTable = false;
           if(type != 1) {
             vm.initCard(res.data.percentData);
           }

src/views/learning/item-list.vue

@@ -811,6 +811,10 @@ export default {
         this.dialogVisible = true;
       } else {
         let downloadUrl = vm.timeInfoData.excelDownUrl;
+        if(downloadUrl === '' || downloadUrl === null) {
+          this.$message('导出失败请联系客服。');
+          return;
+        }
         setTimeout(() => {
           window.open(downloadUrl);
         }, 500);