update

src/utils/env-config.js

@@ -8,9 +8,9 @@ export const envConfig = {
 
     // 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:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // baseUrl: 'https://dev-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",

src/utils/fetch.js

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

src/utils/operation.js

@@ -301,10 +301,10 @@ export function getRegionOption() {
       value: 2,
       label: '杭州',
       children: [{
-        value: 5,
+        value: 310115000000,
         label: '西湖区'
       }, {
-        value: 6,
+        value: 310115000001,
         label: '东湖区'
       }]
     }]

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

@@ -140,7 +140,7 @@ export default {
         projectId: vm.projectId,
         ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
         type: operationData.getSearchType(vm.formInline),
-        originalFlag: vm.formInline.checked == false ? 0 : 1
+        OriginalFlag: vm.formInline.checked == false ? 0 : 1
       };
       console.log("3 req", req);
       openLoading(vm);

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

@@ -13,11 +13,11 @@
     </div>
     <div class="table">
       <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column prop="name" label="考试名" min-width="150" align="center"></el-table-column>
-        <el-table-column prop="joinNum" label="参与考试人数" min-width="100" align="center"></el-table-column>
-        <el-table-column prop="passNum" label="通过考试人数" min-width="80" align="center"></el-table-column>
-        <el-table-column prop="goodNum" label="成绩优秀人数" min-width="80" align="center"></el-table-column>
-        <el-table-column prop="startNum" label="成绩合格人数" min-width="80" align="center"></el-table-column>
+        <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 label="操作" fixed="right" align="center" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="goPage(scope.row)">查看名单</el-button>
@@ -121,7 +121,7 @@ export default {
         projectId: vm.projectId,
         ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
         type: operationData.getSearchType(vm.formInline),
-        originalFlag: vm.formInline.checked == false ? 0 : 1
+        OriginalFlag: vm.formInline.checked == false ? 0 : 1
       };
       console.log("4 req", req);
       openLoading(vm);