Merge branch 'dev-phase1-1115' of...

Merge branch 'dev-phase1-1115' of 192.168.110.53:com.pica.cloud.education.frontend/pica-learning-report into dev-phase1-1115

* 'dev-phase1-1115' of 192.168.110.53:com.pica.cloud.education.frontend/pica-learning-report:
  将256修改为373

# Conflicts:
#	pages/index.vue

components/common/common-swiper-item.vue

@@ -4,7 +4,7 @@
     <article class="middle">
       <div class="title">
         <span class="ratio">{{certFlag ? '获证率' : '完成率'}}
-          <img @click="tipsClick" v-show="!certFlag" src="../../assets/images/what-icon-2.png" />
+          <img @click="tipsClick" v-show="certFlag" src="../../assets/images/what-icon-2.png" />
         </span>
         <span>
           <img src="../../assets/images/tips-1.png" />

components/common/pica-area.vue

@@ -139,7 +139,7 @@ export default {
       isShowTown: false,
       // 区域选择通用接口参数
       queryParams: {
-        projectId: 256,
+        projectId: 373,
         regionId: ""
       }
     };
@@ -156,7 +156,7 @@ export default {
   },
   created() {
     // localStorage.setItem('baseUrl',this.baseUrl);
-    // this.projectId = (this.$route.query && this.$route.query.projectId) || 256;
+    // this.projectId = (this.$route.query && this.$route.query.projectId) || 373;
     // this.getProvinceData(this.queryParams);
   },
   computed: {

package.json

@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "test": "jest",
-    "dev": "cross-env NODE_ENV=development NUXT_ENV_APP=dev HOST=10.177.11.247 PORT=4001 nodemon server/index.js --watch server",
+    "dev": "cross-env NODE_ENV=development NUXT_ENV_APP=dev HOST=192.168.31.209 PORT=4001 nodemon server/index.js --watch server",
     "build": "NUXT_ENV_APP=${ENV} nuxt build",
     "start": "cross-env NUXT_ENV_APP=${ENV} HOST=0.0.0.0 PORT=3100 NODE_ENV=production node server/index.js",
     "generate": "nuxt generate"

pages/exam-score.vue

@@ -28,7 +28,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,

pages/exam-times.vue

@@ -27,7 +27,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,

pages/index.vue

@@ -218,12 +218,13 @@ export default {
       projectId: "",
       token:
         "A7F0A8A4BB5C4EC4B78E71261B753C9C" ||
+        "4281940A6A0C49F69F06BBC9E83DA90D" ||
         "A62E9F92365547A29724F21F29BED4F6" ||
         "4556EDEAAE134FE1B6E1356BF9C1B8F9",
       isOrgStat: false,
       // 区域选择通用接口参数
       queryParams: {
-        projectId: 256,
+        projectId: 373,
         regionId: ""
       },
       // 查询概况数据
@@ -232,7 +233,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,
@@ -254,7 +255,7 @@ export default {
       analysisEduData: [],
       analysisTitleData: [],
       CNTParams: {
-        projectId: 256,
+        projectId: 373,
         regionId: ""
       },
       hospitalCnt: 2,
@@ -310,7 +311,7 @@ export default {
     if (process.client) {
       this.projectId =
         (this.$router && this.$route.query && this.$route.query.projectId) ||
-        256;
+        373;
       this.queryGDParams.projectId = this.projectId;
       if (this.$rocNative.isWeb) {
         this.setUserToken(this.token);

pages/klg-point.vue

@@ -26,7 +26,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,

pages/rank-days.vue

@@ -26,7 +26,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,

pages/rank-edu.vue

@@ -27,7 +27,7 @@ export default {
         endDate: "",
         hospitalIdList: [],
         originalFlag: 1, // 默认值0：0不查看原始数据
-        projectId: 256,
+        projectId: 373,
         regionId: "",
         timeFlag: 1,
         pageNo: 0,

service/index copy.js

@@ -91,6 +91,6 @@ export const getGeneralData = async data => {
     // data: data,
     params: data,
     withCredentials: true,
-    url: `stats/region?projectId=256`
+    url: `stats/region?projectId=373`
   });
 };
\ No newline at end of file