增加dev环境

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",
@@ -23,6 +23,8 @@ export const envConfig = {
     saasDomainUrl: 'https://dev-saas.yunqueyi.com/',
     workApiUrl: 'https://dev-work.yunqueyi.com/web',
     workApiSrc: 'https://dev-work.yunqueyi.com',
+    // reportUrl: 'http://10.177.15.150:10401/',
+    reportUrl: 'https://dev-sc-report.yunqueyi.com/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',
@@ -37,6 +39,7 @@ export const envConfig = {
     saasDomainUrl: 'https://dev-saas.yunqueyi.com/',
     workApiUrl: 'https://dev-work.yunqueyi.com/web',
     workApiSrc: 'https://dev-work.yunqueyi.com',
+    reportUrl: 'https://dev-sc-report.yunqueyi.com/',
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',

src/utils/index.js

@@ -207,3 +207,7 @@ function getConfigByEnvType(urlType) {
 }
 
 
+// 获取report服务器域名地址
+export function getReportUrl(url) {
+  return getConfigByEnvType('reportUrl') + url
+}
\ No newline at end of file

src/utils/mixins.js

 import fetch from '@/utils/fetch'
-import { getBaseUrl, getWorkApi } from '@/utils/index'
+import { getBaseUrl, getReportUrl, getWorkApi } from '@/utils/index'
 
 module.exports = {
     data: function () {
@@ -153,6 +153,16 @@ module.exports = {
                 data: para
             })
         },
+        reportGET(api, para, callback,str) {
+            // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
+             let url = api + this.getUrlPara(para)
+             url = encodeURI(url);
+             return fetch({
+                 url: getReportUrl(url),
+                 method: 'get',
+                 data: para
+             })
+         },
         // saas-GET请求
         saasGET(api, para) {
           // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
@@ -186,6 +196,14 @@ module.exports = {
                 data: para
             })
         },
+        reportPOST(api, para, callback) {
+            // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
+            return fetch({
+                url: getReportUrl(api),
+                method: 'post',
+                data: para
+            })
+        },
         // 通用saas-POST请求
         saasPOST(api, para, cType) {
           // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"

src/views/learning/course-training.vue

@@ -89,6 +89,12 @@
             <span>{{ scope.row.gradeName }}</span>
           </template>
         </el-table-column>
+        <div slot="empty">
+          <div class="table-empty">
+            <img src="../../assets/image/no-content1.png">
+            <p>没有相关数据，请重新选择查询范围</p>
+          </div>
+        </div>
       </el-table>
       <div class="pagination">
         <el-pagination
@@ -178,7 +184,7 @@ export default {
         projectId: vm.queryData.projectId,
         hospitalIds: vm.queryData.ids,
       };
-      vm.GET("report/portal/getHostitalName", req).then(res => {
+      vm.reportGET("report/portal/getHostitalName", req).then(res => {
         if (res.code == "000000") {
         }
       });
@@ -213,7 +219,7 @@ export default {
         };
         console.log("course req", req);
         openLoading(vm);
-        vm.GET("report/portalProjectCourse/getUserList", req).then(res => {
+        vm.reportGET("report/portalProjectCourse/getUserList", req).then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
             vm.tableData = res.data.list;
@@ -225,7 +231,7 @@ export default {
         let reqRank = {
           projectId: query.projectId,
         }
-        vm.GET("report/portalProjectExam/getGradeList", reqRank).then(res => {
+        vm.reportGET("report/portalProjectExam/getGradeList", reqRank).then(res => {
           if (res.code == "000000") {
             vm.rankList = res.data.list;
           }
@@ -243,7 +249,7 @@ export default {
         };
         console.log("exam req", req);
         openLoading(vm);
-        vm.GET("report/portalProjectExam/getUserList", req).then(res => {
+        vm.reportGET("report/portalProjectExam/getUserList", req).then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
             vm.tableData = res.data.list;

src/views/learning/data-alignment.vue

@@ -88,7 +88,7 @@
       <div slot="empty">
         <div class="table-empty">
           <img src="../../assets/image/no-content1.png" />
-          <p>没有查询到相关结果</p>
+          <p>没有相关数据，请重新选择查询范围</p>
         </div>
       </div>
     </el-table>
@@ -251,7 +251,7 @@ export default {
         pageSize: vm.formData.pageSize,
       };
       openLoading(vm);
-      vm.GET("report/portal/getProjectData", req).then(res => {
+      vm.reportGET("report/portal/getProjectData", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.projectData;
@@ -313,7 +313,7 @@ export default {
         joinDoctorIdList: operationData.getAjustmentList(vm.changedDoctor),
       };
       openLoading(vm);
-      vm.POST("report/portal/peopleAdjustment", req).then(res => {
+      vm.reportPOST("report/portal/peopleAdjustment", req).then(res => {
         closeLoading(vm);
         vm.$message(res.message);
         if (res.code == "000000") {

src/views/learning/export-download.vue

@@ -21,6 +21,12 @@
             >{{ scope.row.buttonText }}</el-button>
           </template>
         </el-table-column>
+        <div slot="empty">
+          <div class="table-empty">
+            <img src="../../assets/image/no-content1.png">
+            <p>没有相关数据，请重新选择查询范围</p>
+          </div>
+        </div>
       </el-table>
       <div class="pagination">
         <el-pagination

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

@@ -32,6 +32,12 @@
             >查看名单</el-button>
           </template>
         </el-table-column>
+        <div slot="empty">
+          <div class="table-empty">
+            <img src="../../assets/image/no-content1.png">
+            <p>没有相关数据，请重新选择查询范围</p>
+          </div>
+        </div>
       </el-table>
       <div class="pagination">
         <el-pagination
@@ -70,19 +76,19 @@ export default {
   data() {
     return {
       cardData: [
-        {
-          title: '项目所有课程数',
-          num: 0,
-          unit: '门课程',
-        },{
-          title: '项目所有课程总时长',
-          num: 0,
-          unit: '分钟',
-        },{
-          title: '项目人均学习时长',
-          num: 0,
-          unit: '分钟',
-        }
+        // {
+        //   title: '项目所有课程数',
+        //   num: 0,
+        //   unit: '门课程',
+        // },{
+        //   title: '项目所有课程总时长',
+        //   num: 0,
+        //   unit: '分钟',
+        // },{
+        //   title: '项目人均学习时长',
+        //   num: 0,
+        //   unit: '分钟',
+        // }
       ],
       tableData: [],
       totalRows: 0,
@@ -112,9 +118,24 @@ export default {
   methods: {
     setCardData(data) {
       vm.totalRows = data.projectCourseCount;
-      vm.cardData[0].num = data.projectCourseCount;
-      vm.cardData[1].num = data.projectCourseTotalTime;
-      vm.cardData[2].num = data.projectAvgStudyTime;
+      vm.cardData = [
+        {
+          title: '项目所有课程数',
+          num: data.projectCourseCount,
+          unit: '门课程',
+        },{
+          title: '项目所有课程总时长',
+          num: data.projectCourseTotalTime,
+          unit: '分钟',
+        },{
+          title: '项目人均学习时长',
+          num: data.projectAvgStudyTime,
+          unit: '分钟',
+        }
+      ];
+      // vm.cardData[0].num = data.projectCourseCount;
+      // vm.cardData[1].num = data.projectCourseTotalTime;
+      // vm.cardData[2].num = data.projectAvgStudyTime;
     },
     search() {
       if (vm.formInline.region.length == 0) {
@@ -130,7 +151,7 @@ export default {
       };
       console.log("3 req", req);
       openLoading(vm);
-      vm.GET("report/portalProjectCourse/getTotal", req).then(res => {
+      vm.reportGET("report/portalProjectCourse/getTotal", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.setCardData(res.data)
@@ -139,7 +160,7 @@ export default {
       let reqList = req;
       reqList.pageNo = vm.pageNo;
       reqList.pageSize = vm.pageSize;
-      vm.GET("report/portalProjectCourse/getCourseList", reqList).then(res => {
+      vm.reportGET("report/portalProjectCourse/getCourseList", reqList).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.list;

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

@@ -93,7 +93,7 @@ export default {
       };
       console.log("2 req", req);
       openLoading(vm);
-      vm.GET("report/portal/getPeoplesDetails", req).then(res => {
+      vm.reportGET("report/portal/getPeoplesDetails", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           this.crowdData = res.data;

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

@@ -26,7 +26,7 @@
         <div slot="empty">
           <div class="table-empty">
             <img src="../../assets/image/no-content1.png">
-            <p>没有查询到相关结果</p>
+            <p>没有相关数据，请重新选择查询范围</p>
           </div>
         </div>
       </el-table>
@@ -73,16 +73,16 @@ export default {
       projectId: '',
       tableData: [],
       cardData: [
-        {
-          title: "项目所有考试数",
-          num: 0,
-          unit: "门考试"
-        },
-        {
-          title: "项目所有考题数",
-          num: 0,
-          unit: "道题"
-        }
+        // {
+        //   title: "项目所有考试数",
+        //   num: 0,
+        //   unit: "门考试"
+        // },
+        // {
+        //   title: "项目所有考题数",
+        //   num: 0,
+        //   unit: "道题"
+        // }
       ],
       totalRows: 0, //数据总数
       pageNo: 1, //当前是第几页
@@ -111,8 +111,20 @@ export default {
   methods: {
     setCardData(data) {
       vm.totalRows = data.projectExamCount;
-      vm.cardData[0].num = data.projectExamCount;
-      vm.cardData[1].num = data.projectExamQuestionCount;
+      vm.cardData = [
+        {
+          title: "项目所有考试数",
+          num: data.projectExamCount,
+          unit: "门考试"
+        },
+        {
+          title: "项目所有考题数",
+          num: data.projectExamQuestionCount,
+          unit: "道题"
+        }
+      ];
+      // vm.cardData[0].num = data.projectExamCount;
+      // vm.cardData[1].num = data.projectExamQuestionCount;
     },
     // 搜索列表
     search() {
@@ -129,7 +141,7 @@ export default {
       };
       console.log("4 req", req);
       openLoading(vm);
-      vm.GET("report/portalProjectExam/getTotal", req).then(res => {
+      vm.reportGET("report/portalProjectExam/getTotal", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.setCardData(res.data);
@@ -138,7 +150,7 @@ export default {
       let reqList = req;
       reqList.pageNo = vm.pageNo;
       reqList.pageSize = vm.pageSize;
-      vm.GET("report/portalProjectExam/getExamList", req).then(res => {
+      vm.reportGET("report/portalProjectExam/getExamList", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.list;

src/views/learning/item-list.vue

@@ -375,7 +375,7 @@ export default {
         countyId: countyId
       };
       openLoading(vm);
-      vm.GET("report/portal/getOrganizationList", req).then(res => {
+      vm.reportGET("report/portal/getOrganizationList", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           this.organizationList = operationData.getLearnOrganization(

src/views/learning/item-part-in.vue

@@ -32,6 +32,12 @@
       <el-table-column prop="endTime" label="完成项目日期" align="center">
         <template slot-scope="scope">{{ scope.row.endTime | liveDateFilter }}</template>
       </el-table-column>
+      <div slot="empty">
+        <div class="table-empty">
+          <img src="../../assets/image/no-content1.png">
+          <p>没有相关数据，请重新选择查询范围</p>
+        </div>
+      </div>
     </el-table>
   </div>
 </template>
@@ -64,30 +70,22 @@ export default {
       projectId: "",
       finishDetail: [],
       cardData: [
-        {
-          title: "应参与机构数",
-          num: 0,
-        },
-        {
-          title: "应参与人数",
-          num: 0,
-        },
-        {
-          title: "已参与人数",
-          num: 0,
-        },
-        {
-          title: "项目获证人数",
-          num: 0,
-        },
         // {
-        //   title: "优秀证书人数",
+        //   title: "应参与机构数",
         //   num: 0,
         // },
         // {
-        //   title: "合格证书人数",
+        //   title: "应参与人数",
         //   num: 0,
-        // }
+        // },
+        // {
+        //   title: "已参与人数",
+        //   num: 0,
+        // },
+        // {
+        //   title: "项目获证人数",
+        //   num: 0,
+        // },
       ],
       showChart: false,
       showTable: false
@@ -130,7 +128,7 @@ export default {
       };
       console.log("1 req", req);
       openLoading(vm);
-      vm.GET("report/portal/getParticipateInfo", req).then(res => {
+      vm.reportGET("report/portal/getParticipateInfo", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           this.getCardData(res.data);
@@ -138,7 +136,7 @@ export default {
           this.getTableData();
         }
       });
-      vm.GET("report/portal/top", req).then(res => {
+      vm.reportGET("report/portal/top", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           this.getRank(res.data);

src/views/learning/name-list.vue

@@ -46,7 +46,7 @@
         <div slot="empty">
           <div class="table-empty">
             <img src="../../assets/image/no-content1.png" />
-            <p>没有查询到相关结果</p>
+            <p>没有相关数据，请重新选择查询范围</p>
           </div>
         </div>
       </el-table>

src/views/learning/report-list.vue

@@ -55,7 +55,7 @@
         <div slot="empty">
           <div class="table-empty">
             <img src="../../assets/image/no-content1.png" />
-            <p>没有查询到相关结果</p>
+            <p>没有相关数据，请重新选择查询范围</p>
           </div>
         </div>
       </el-table>