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

src/components/case/index.vue

@@ -184,6 +184,7 @@ export default {
         loading:false,
         sss:1,
         popContainer:false,
+        timestamp:'',
     }
   },
   watch: {
@@ -243,6 +244,13 @@ export default {
       let projectId = this.getQueryVariable('projectId')
       let assessmentId = this.getQueryVariable('assessmentId')
       let classId = this.getQueryVariable('classId')
+      let stopTime = this.getQueryVariable('stopTime')
+      let timestamp = +stopTime;
+      if (timestamp != null){
+          sessionStorage.setItem('timestamp', timestamp)
+      }else{
+          sessionStorage.setItem('timestamp', null)
+      }
       if (token != null){
           sessionStorage.setItem('token', token)
           sessionStorage.setItem('cid', cid)
@@ -379,14 +387,16 @@ export default {
           getProjectDetail(params).then((data)=>{
               if(data.status == 200){
                   this.globalTimer = "";
-                  this.countVal = "";
+                  let stopTime = sessionStorage.getItem('timestamp')
-                  this.day = "00";
+                  let timestamp = +stopTime;
-                  this.seconds = "00";
+                  this.countVal = timestamp;
-                  this.minutes = "00";
+                  // this.day = "00";
-                  this.hour = "00";
+                  // this.seconds = "00";
+                  // this.minutes = "00";
+                  // this.hour = "00";
                   this.sss = 1;
-                  this.hintOpen = data.data.projectManage.hintOpen
+                  this.hintOpen = data.data.projectManage.hintOpen;
-                  this.startCountFn();
+                  this.countDown(timestamp);
                   let projectId = this.getQueryVariable('projectId')
                   if(projectId != null){
                       //获取当前时间
@@ -511,14 +521,17 @@ export default {
         });
       });
     },
-    //开始计时
+
+      //开始计时
     startCountFn() {
       if (!this.isStart) {
-        this.countVal = this.countVal ? this.countVal : 0;
+        // this.countVal = this.countVal ? this.countVal : 0;
         this.globalTimer = setInterval(() => {
             if(this.sss == 0){
                 this.globalTimer = null;
                 clearInterval(this.globalTimer);
+            }else if (this.timestamp){
+                this.counterFn(this.countVal--);
             }else{
                 this.counterFn(this.countVal++);
             }
@@ -526,22 +539,57 @@ export default {
         this.isStart = true;
       }
     },
+      //倒计时
+      countDown(timestamp){
+          this.timestamp = timestamp
+          console.log(this.timestamp)
+          this.sss = 1;
+          this.globalTimer = null;
+          clearInterval(this.globalTimer);
+          this.startCountFn()
+      },
     counterFn(counterTime) {
-      let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数
+        if (this.timestamp){
-      let leave2 = leave1 % (3600 * 1); //计算小时数后剩余的毫秒数
+            let countDown = (new Date(counterTime).getTime() - new Date().getTime()) / 1000
-      let leave3 = leave2 % (60 * 1); //计算分钟数后剩余的毫秒数
+            if (countDown > 0) {
-      let day = Math.floor(counterTime / (24 * 3600 * 1)); //计算相差天数
+                let d = Math.floor(countDown / (60 * 60 * 24));
-      let hour = Math.floor(leave1 / (3600 * 1)); //计算相差小时
+                let h = Math.floor(countDown / (60 * 60));
-      let minutes = Math.floor(leave2 / (60 * 1)); //计算相差分钟
+                let m = Math.floor(countDown % (60 * 60) / 60);
-      let seconds = Math.round(leave3 / 1); //计算相差秒
+                let s = Math.floor(countDown % (60 * 60) % 60);
-      day = day >= 10 ? day : "0" + day;
+                this.day = `${d > 9 ? d : `0${d}`}`;
-      hour = hour >= 10 ? hour : "0" + hour;
+                this.hour = `${h > 9 ? h : `0${h}`}`;
-      minutes = minutes >= 10 ? minutes : "0" + minutes;
+                this.minutes = `${m > 9 ? m : `0${m}`}`;
-      seconds = seconds >= 10 ? seconds : "0" + seconds;
+                this.seconds = `${s > 9 ? s : `0${s}`}`;
-      this.day = day;
+            } else {
-      this.hour = hour;
+                this.$alert('考核结束，已自动交卷', '提示', {
-      this.minutes = minutes;
+                    confirmButtonText: '确定',
-      this.seconds = seconds;
+                    callback: action => {
+
+                    }
+                });
+                this.Submit()
+                this.day = '00';
+                this.hour = '00';
+                this.minutes = '00';
+                this.seconds = '00';
+            }
+        }else{
+            let leave1 = counterTime % (24 * 3600 * 1); //计算天数后剩余的毫秒数
+            let leave2 = leave1 % (3600 * 1); //计算小时数后剩余的毫秒数
+            let leave3 = leave2 % (60 * 1); //计算分钟数后剩余的毫秒数
+            let day = Math.floor(counterTime / (24 * 3600 * 1)); //计算相差天数
+            let hour = Math.floor(leave1 / (3600 * 1)); //计算相差小时
+            let minutes = Math.floor(leave2 / (60 * 1)); //计算相差分钟
+            let seconds = Math.round(leave3 / 1); //计算相差秒
+            day = day >= 10 ? day : "0" + day;
+            hour = hour >= 10 ? hour : "0" + hour;
+            minutes = minutes >= 10 ? minutes : "0" + minutes;
+            seconds = seconds >= 10 ? seconds : "0" + seconds;
+            this.day = day;
+            this.hour = hour;
+            this.minutes = minutes;
+            this.seconds = seconds;
+        }
     },
     //重新开始
     reload() {
@@ -602,9 +650,9 @@ export default {
     getCookie(cookie_name) {
       //获取cookie中指定key的value
       var allcookies = document.cookie; //索引长度，开始索引的位置
-      var cookie_pos = allcookies.indexOf(cookie_name); // 如果找到了索引，就代表cookie存在,否则不存在
+      var cookie_pos = allcookies.indexOf(cookie_name); //如果找到了索引，就代表cookie存在,否则不存在
       if (cookie_pos != -1) {
-        // 把cookie_pos放在值的开始，只要给值加1即可
+        //把cookie_pos放在值的开始，只要给值加1即可
         //计算取cookie值得开始索引，加的1为“=”
         cookie_pos = cookie_pos + cookie_name.length + 1; //计算取cookie值得结束索引
         var cookie_end = allcookies.indexOf(";", cookie_pos);

src/layouts/header/index.vue

@@ -33,8 +33,13 @@ export default {
             })
         },
       exit(){
-            let cid = sessionStorage.getItem('cid')
+          let stopTime = sessionStorage.getItem('timestamp')
-          window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
+          if (stopTime){
+              window.location = 'http://39.108.250.202/student/#/ass/list'
+          }else{
+              let cid = sessionStorage.getItem('cid')
+              window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
+          }
       },
     },
 };

src/pages/index/list/index.vue

@@ -40,11 +40,18 @@ export default {
         let token = this.getQueryVariable('token')
         let cid = this.getQueryVariable('cid')
         let systemId = this.getQueryVariable('systemId')
+        let stopTime = this.getQueryVariable('stopTime')
+        let timestamp =+stopTime;
         if (token != null){
             sessionStorage.setItem('token', token)
             sessionStorage.setItem('cid', cid)
             sessionStorage.setItem('systemId', systemId)
         }
+        if (timestamp != null){
+            sessionStorage.setItem('timestamp', timestamp)
+        }else{
+            sessionStorage.setItem('timestamp', null)
+        }
     },
     methods: {
         getQueryVariable(name) {

src/pages/lobbyManager/list/index.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="wrap">
         <img class="sth manager" src="@/assets/img/manager.png" alt="">
-        <img class="sth guide" @click="toPart('../index/list')" src="@/assets/img/guide.png" alt="">
+        <div class="sth guide" @click="toPart" alt="">
-        
+            返回
+        </div>
         <div class="actions">
             <ul class="btns">
                 <li @click="showTake">取号</li>
@@ -11,7 +12,6 @@
                 <li>取回</li>
             </ul>
         </div>
-
         <el-dialog :visible.sync="takeVisible" width="1280px" @close="closeTake" :close-on-click-modal="false" :show-close="false" custom-class="data-dia">
             <div slot="title" class="dia-header">
                 <div class="data-title">取号机</div>
@@ -170,8 +170,21 @@ export default {
             this.takeVisible = false
             this.takeResultVisible = true
         },
-        toPart(path){
+        toPart(){
-            this.$router.push(path)
+            let token = sessionStorage.getItem('token')
+            let cid = sessionStorage.getItem('cid')
+            let systemId = sessionStorage.getItem('systemId')
+
+            let projectId = sessionStorage.getItem('projectId')
+            let  assessmentId = sessionStorage.getItem('assessmentId')
+            let classId =  sessionStorage.getItem('classId')
+            if (projectId){
+                location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId
+                // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId
+            }else{
+                location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+                // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
+            }
         },
         showData(){
             this.dataVisible = true
@@ -205,10 +218,18 @@ export default {
             }
         }
         .guide{
-            top: 90px;
+            top: 80px;
-            left: 0;
+            left: 10px;
-            width: 222px;
+            width: 150px;
             cursor: pointer;
+            background:url(../../../assets/img/lobby-btn-bg.png);
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+            line-height: 50px;
+            font-size: 24px;
+            text-align: center;
+            color: #fff;
+
             &:hover{
                 opacity: .9;
             }

src/pages/manage/index/index.vue

@@ -62,7 +62,7 @@ export default {
     .box{
         display: flex;
         min-width: 1300px;
-        margin-top: 50px;
+        margin-top: 70px;
         overflow: auto;
         .nav{
             width: 270px;