fix bug

src/utils/env-config.js

@@ -10,7 +10,8 @@ export const envConfig = {
     // 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://dev-sc.yunqueyi.com/',
+    baseUrl: 'https://test1-sc.yunqueyi.com/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
@@ -25,7 +26,8 @@ export const envConfig = {
     workApiSrc: 'https://dev-work.yunqueyi.com',
     // reportUrl: 'http://10.177.15.150:10401/',
     // reportUrl: 'http://192.168.140.13:10401/',
-    reportUrl: 'https://dev-sc-report.yunqueyi.com/',
+    // reportUrl: 'https://dev-sc-report.yunqueyi.com/',
+    reportUrl: 'https://test1-sc-report.yunqueyi.com/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',

src/utils/fetch.js

@@ -54,8 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '2CD0420B09584AFAA2B6CFD85252E1AB';
-      // config.headers['token'] = '874879EF8F0F477F85D8FF1A9BFEC634';
+      config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/learning/item-examination-analysis.vue

@@ -17,8 +17,8 @@
         <el-table-column prop="examName" label="考试名" min-width="150" align="center"></el-table-column>
         <el-table-column prop="examUserCount" label="参与考试人数" min-width="100" align="center"></el-table-column>
         <el-table-column prop="userCountForPassExam" label="通过考试人数" min-width="80" align="center"></el-table-column>
-        <el-table-column prop="userCountList[0]" label="成绩优秀人数" min-width="80" align="center"></el-table-column>
-        <el-table-column prop="userCountList[1]" label="成绩合格人数" min-width="80" align="center"></el-table-column>
+        <el-table-column v-if="showGood" prop="userCountList[0]" label="成绩优秀人数" min-width="80" align="center"></el-table-column>
+        <el-table-column v-if="showPass" prop="userCountList[1]" label="成绩合格人数" min-width="80" align="center"></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="goPage(scope.row)">查看名单</el-button>
@@ -88,6 +88,8 @@ export default {
       totalRows: 0, //数据总数
       pageNo: 1, //当前是第几页
       pageSize: 10, //页面总数
+      showGood: false,
+      showPass: false,
     };
   },
   created() {
@@ -164,6 +166,16 @@ export default {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.list;
+          if(res.data.list[0].userCountList == null) {
+            vm.showGood = false;
+            vm.showPass = false;
+          } else if (res.data.list[0].userCountList.length == 1){
+            vm.showGood = true;
+            vm.showPass = false;
+          } else {
+            vm.showGood = true;
+            vm.showPass = true;
+          }
         }
       });
 
@@ -175,7 +187,7 @@ export default {
       let routerData = {};
       routerData = this.dialogData;
       routerData.projectId = vm.projectId;
-      routerData.tableType = 1;
+      routerData.tableType = 2;
       routerData.examId = data.examId;
       routerData.ids = operationData.getIds(vm.formInline,vm.organizationList,checkAll);
       routerData.type = operationData.getSearchType(vm.formInline,checkAll),

src/views/learning/item-list.vue

@@ -21,7 +21,7 @@
           <el-select
             size="small"
             v-model="formInline.organization"
-            placeholder="请选择发布状态"
+            placeholder="请选择机构"
             @change="changeOrganization"
             multiple
             collapse-tags

src/views/learning/name-list.vue

@@ -53,7 +53,7 @@
         <el-table-column prop="addressName" label="地区" align="center"></el-table-column>
         <el-table-column v-if="tableType == 1" prop="learnStatus" label="参与课程状态" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.learnStatus | joinStatus }}</span>
+            <span>{{ scope.row.learnStatus }}</span>
           </template>
         </el-table-column>
         <el-table-column