From 4e3f34efacbb9143364e0bce6c9f5b6893bffb69 Mon Sep 17 00:00:00 2001
From: "jialong.yu" <Yujialong.123>
Date: Wed, 9 Feb 2022 10:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=93=B6=E8=A1=8C=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ass/list/index.vue        |  2 ++
 src/pages/record/show/index.vue     |  2 +-
 src/pages/station/preview/index.vue | 15 ++-------------
 src/setting.js                      | 16 ++++------------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 9890b24..6e29f53 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -461,6 +461,8 @@ export default {
                 // href = `http://www.huorantech.cn/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
                 //测试与本地
                 href = `${domainName}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+                // href = `http://192.168.31.125:8093/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+
             } else {
                 if(process.env.NODE_ENV === 'development') {
                     href = 'http://192.168.31.125:8080/#/'
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index 4ce7640..a082440 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -77,7 +77,7 @@
                                     {{ scope.$index + 1 }}
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="judgmentName" label="任务名称" align="center"></el-table-column>
+                            <el-table-column prop="judgmentName" label="判分指标" align="center"></el-table-column>
                             <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
                                 <template slot-scope="scope">
                                     <div v-for="(item, index) in scope.row.lcRuleRecords">
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 2862ec2..cdc2f74 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -286,24 +286,13 @@ export default {
         },
         goSystem() { // 进入实验系统
             let id = this.assessmentList[0].systemId;
-            let host = Setting.systemPath;
-            let href = "";
+            let href = ''
             let token = util.local.get(Setting.tokenKey);
             let roleId = this.roleId == 4 ? 0 : 1;
             let userName = window.btoa(encodeURIComponent(this.userName));
 
             if (id == 11) {
-                console.log(host)
-                // href = `${host}bank/#/`;
-                //线上
-                // href = "http://124.71.12.62/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=";
-                // href = "http://www.huorantech.cn/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=";
-                //测试与本地
-                if(process.env.NODE_ENV === 'development'){
-                    href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=&test=true";
-                }else {
-                    href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=&test=true";
-                }
+                href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.courseId}&systemId=${this.assessmentList[0].systemId}&projectId=&assessmentId=&classId=&stopTime=&test=true`
             } else if (id == 21) {
                 window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
             } else if (id == 22) {
diff --git a/src/setting.js b/src/setting.js
index 4330ffb..64685db 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -9,46 +9,39 @@ const isBeta = url.includes("120.78.198.231"); //是否职站测试
 const isPro = url.includes("occupationlab.com"); //是否职站生产
 const isTest = url.includes('39.108.250.202'); //是否中台测试服
 
-let defaultSubSystem = "";
-let systemPath = "";
+let systemPath = ''
 let host = "";
 let title = "";
 
 if (isHh) {
     // 河海
     host = "http://10.196.131.73/";
-    defaultSubSystem = "http://10.196.131.73/pyTrials/#/";
     title = "学生端";
 } else if (isCH) {
     // 巢湖
     host = "http://124.71.12.62/";
-    defaultSubSystem = "http://124.71.12.62/pyTrials/#/";
     title = "学生端";
 } else if (isBeta) {
     // 职站测试
     host = "http://120.78.198.231/";
-    defaultSubSystem = "http://120.78.198.231/pyTrials/#/";
     title = "职站";
 } else if (isPro) {
     // 职站生产
     host = "http://www.occupationlab.com:9000/";
-    defaultSubSystem = "http://www.occupationlab.com/pyTrials/#/";
+    systemPath = `http://www.huorantech.cn/banksystem`
     title = "职站";
 } else if (isTest){
     // 中台测试
     host = "http://39.108.250.202:9000/";
-    systemPath = "http://120.78.198.231/";
-    defaultSubSystem = "http://39.108.250.202/pyTrials/#/";
+    systemPath = `${systemPath}/banksystem`
     title = "职站";
 } else if (isDev) {
     // 本地
     // host = "http://www.occupationlab.com:9000/";//线上
     host = "http://39.108.250.202:9000/"; // 中台测试服
+    systemPath = `http://192.168.31.125:8093`
     // host = "http://192.168.31.137:9000/"; // 赓
     // host = "http://192.168.31.151:9000/"; // 榕
-    // host = "http://192.168.31.125:9000/"; // 坤
-    systemPath = "http://192.168.31.154/";
-    defaultSubSystem = "http://39.108.250.202/pyTrials/#/";
     title = "职站";
 } else {
     console.log("其它版本");
@@ -64,7 +57,6 @@ const Setting = {
     showProgressBar: true, // 页面切换时，是否显示模拟的进度条
     apiBaseURL: host, // 接口请求地址
     systemPath, // 子系统地址前缀
-    defaultSubSystem, // 测评做完后跳转的默认子系统
     autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间
     modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
     errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice