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

单个机构情况下的全部数据选择情况  学情报告更新 codereviewer：杨广俊

单个机构情况下的全部数据选择情况  学情报告更新 
codereviewer：杨广俊

See merge request !126

src/utils/env-config.js

@@ -12,7 +12,8 @@ export const envConfig = {
     // baseUrl: 'http://10.177.15.150:11905/',
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
-    baseUrl: 'https://uat-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/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'] = '29D71EAAB92E4580AFB16A8011BE7206';
+      config.headers['token'] = '6FF17E7CCB824ABC8B6A57CB13252E28';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/learning/item-list.vue

@@ -598,6 +598,14 @@ export default {
           vm.optionsRegion = operationData.setRegionOptionNew(
             res.data.list
           );
+          //初始化判断区域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();
         }