Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

src/components/case/index.vue

@@ -586,6 +586,16 @@ export default {
           }).catch((error)=>{
           })
       },
+      // 跳转
+      toPage(token, cid, systemId) {
+        const url = location.href
+        const host = url.includes('occupationlab.com') ?
+          `http://www.huorantech.cn/banksystem` :
+            process.env.NODE_ENV === 'development' ?
+              `http://192.168.31.155:8093` :
+              `http://39.108.250.202/banksystem`
+        location.href = `${host}/#/index/list?token=${token}&cid=${cid}&systemId=${systemId}`
+      },
     //选择好题目
     selectProject(){
       this.lockIt = false
@@ -636,19 +646,7 @@ export default {
             this.projectId = data.data.projectManage.projectId;
             this.projectManage = data.data.projectManage;
             this.requires = data.data.projectJudgmentVos;
-            //线上
+            this.toPage(token, cid, systemId)
-            // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-            // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-            //测试服
-            if(process.env.NODE_ENV === 'development') {
-              location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
-              
-            }else {
-              location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-            }
-            
-            //本地
-            // location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
         }
       }).catch((error)=>{
       })
@@ -875,19 +873,7 @@ export default {
         this.grade = '00'
         this.$router.push('/index/list')
         this.getBeginTime()
-        //线上git sta
+        this.toPage(token, cid, systemId)
-        // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-        // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-        //测试服
-        if(process.env.NODE_ENV === 'development') {
-          location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
-        }else {
-          location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-        }
-        
-        //本地
-        // location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
-        console.log(process.env.NODE_ENV)
     },
     
     checkVer() {

src/layouts/header/index.vue

@@ -33,15 +33,21 @@ export default {
             })
         },
       exit(){
+        let href = ''
+        const url = location.href
+        const host = url.includes('huorantech.cn') ?
+          `http://www.occupationlab.com` :
+            process.env.NODE_ENV === 'development' ?
+              `http://192.168.31.155:8082` :
+              `http://39.108.250.202/student`
         let assessmentId = sessionStorage.getItem('assessmentId')
         if (assessmentId != 'null' && assessmentId != null && assessmentId != ''){
-              window.location = 'http://39.108.250.202/student/#/ass/list'
+          href = `${host}/#/ass/list`
-              // window.location = 'http://www.occupationlab.com/#/ass/list'
         }else{
-              let cid = sessionStorage.getItem('cid')
+          const cid = sessionStorage.getItem('cid')
-              window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
+          href = `${host}/#/station/preview?courseId=${cid}&curriculumName=银行项目`
-              // window.location = 'http://www.occupationlab.com/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
         }
+        location.href = href
       },
     },
 };