合并工作站线上最新代码至本地

src/utils/env-config.js

@@ -6,14 +6,14 @@ export const envConfig = {
     // // baseUrl: 'http://10.177.15.180:10202/',
     // // baseUrl: 'http://192.168.140.14:10201/',
 
-    baseUrl: 'https://test1-sc.yunqueyi.com/',
+    // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
-    // baseUrl: 'http://10.177.15.4:11905/',
-    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // baseUrl: 'https://sc.yunqueyi.com/',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://uat-api.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",

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-examination-analysis.vue

@@ -279,7 +279,7 @@ export default {
       });
     },
     setCardData(data) {
-      vm.totalRows = data.projectExamCount;
+      // vm.totalRows = data.projectExamCount;
       let cardData = [
         {
           title: "项目正式考试数",

src/views/learning/item-list.vue

@@ -598,7 +598,15 @@ export default {
           vm.optionsRegion = operationData.setRegionOptionNew(
             res.data.list
           );
-          vm.search();
+          //初始化判断区域id 是不是有机构id
+          let value = res.data.list[0].id;
+          let areaArr = value.split('_');
+          vm.areaLen = areaArr.length;
+          if (areaArr.length >= 3) {
+            vm.getOrganizationList();
+            vm.organizationNotice = "请选择机构";
+          }
+          // vm.search(); // deleted by Anndy Yang
           vm.gethHspitalsCnt();
         }
       });
@@ -612,6 +620,21 @@ export default {
         if (res.code == "000000") {
           vm.hospitalCnt = res.data.hospitalCnt;
           vm.hospitalCntList = res.data.list
+
+          // 只有一个机构时，所有请求中要传递机构ID added by Anndy Yang
+          if(vm.hospitalCntList.length == 1) {
+            vm.formInline.organization = [];
+            vm.organizationList = [];
+            let obj = {
+              index: 0,
+              label: vm.hospitalCntList[0].hospitalName,
+              value: vm.hospitalCntList[0].hospitalId,
+            };
+            vm.organizationList.push(obj);
+            vm.formInline.organization.push(vm.hospitalCntList[0].hospitalId);
+            // vm.formInline.organization[0] = vm.hospitalCntList[0].hospitalId;
+          }
+          vm.search(); // added by Anndy Yang
         }
       });
     },
@@ -628,6 +651,12 @@ export default {
           this.organizationList = operationData.getLearnOrganization(
             res.data.list
           );
+
+          // // added by Anndy Yang
+          // if(this.organizationList.length == 1) {
+          //   vm.formInline.organization = [];
+          //   vm.formInline.organization = vm.organizationList[0].value
+          // }
         }
       });
     },
@@ -782,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);

src/views/system/item-role.vue

@@ -108,12 +108,14 @@
         <el-table-column fixed="right" label="操作" width="350" align="left">
 
           <template slot-scope="scope" >
+             <!-- v-if="scope.row.projeceRole != 'L2'" -->
             <div v-if="authorityType == 2">
               <el-button
                 class="button-text"
                 type="text"
                 size="small"
                 v-if="scope.row.projeceRole != 'L2'"
+                v-show="showButton2(scope.row)"
                 @click="proChange(scope.row,'L2')"
               >升级项目负责人</el-button>
               <el-button
@@ -121,6 +123,7 @@
                 type="text"
                 size="small"
                 v-else
+                v-show="showButton2(scope.row)"
                 @click="proChange(scope.row,'')"
               >取消项目负责人</el-button>
             </div>
@@ -437,6 +440,10 @@ export default {
   methods: {
     //add 升、降项目负责人
     proChange(item,str){
+      if (str == "L2" && this.numL2 >= 5) {
+        this.dialogFull = true;
+        return;
+      } 
       this.optionType = str;
       this.optionItem = item;
       let s = ''
@@ -638,6 +645,19 @@ export default {
       );
       vm.queryRoleList();
     },
+    //authorityType == 2 情况下按钮展示判断
+    showButton2(row) {
+      let flag = false;
+      if (vm.activeUser == "L1") {
+        //当前内部管理员
+        flag = true;
+      }
+      if(vm.activeUser == "L2" && vm.creator == true) {
+        //当前项目管理员且创建者
+        flag = true;
+      }
+      return flag;
+    },
     //按钮展示情况
     showButton(row, projeceRole) {
       let flag = false;