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

src/pages/ass/list/index.vue

@@ -92,7 +92,7 @@
 <!--                    </template>-->
 <!--                </el-table-column>-->
                 <el-table-column label="操作" align="center">
-                    <template slot-scope="scope" v-if="scope.row">
+                    <template slot-scope="scope">
                         <!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
                         <el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button>
                         <el-button v-if="(scope.row.status == 2 && scope.row.stuState == 1) || (scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId == null)" type="text" disabled>
@@ -275,22 +275,19 @@ export default {
                     clearInterval(this.ticker);
                 }else{
                 for (let i = 0; i < this.listData.length; i++) {
-                    const ticker = setInterval(() => {
+                    const item = this.listData[i];
-                        const item = this.listData[i];
+                    if (item.countDown > 0) {
-                        if (item.countDown > 0) {
+                        item.countDown--;
-                            item.countDown--;
+                    } else {
-                        } else {
+                        if (item.status == 0 && item.type == 2) { // 待开始-定时发布
-                            if (item.status == 0 && item.type == 2) { // 待开始-定时发布
+                            item.status = 1;
-                                item.status = 1;
+                            item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
-                                item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
+                        } else if (item.status == 1) {
-                            } else if (item.status == 1) {
+                            // item.status = 2;
-                                // item.status = 2;
-                            }
                         }
-                        item.show = true;
+                    }
-                        this.$set(this.listData, i, item);
+                    item.show = true;
-                    }, 1000)
+                    this.$set(this.listData, i, item);
-                    this.tickerArr.push(ticker)
                 }
 
                 }
@@ -359,10 +356,10 @@ export default {
                     }
                 });
                 this.sss = 1;
-                if(this.datassdata == 0){
+                // if(this.datassdata == 0){
-                    this.datassdata = this.datassdata+1
+                //     this.datassdata = this.datassdata+1
                     this.beginTimer()
-                }
+                // }
                 this.listLoading = false;
             }).catch(err => {
                 this.listLoading = false;
@@ -459,13 +456,9 @@ export default {
             aaa = host.slice(0,host.length-6)
             if (curriculumId == 11){
                 //线上
-                                //测试与本地 http://192.168.31.155:8093
+                // 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 = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+                //测试与本地 http://192.168.31.155:8093
-                if(process.env.NODE_ENV === "development") {
+                href = `${aaa}/${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.155:8093/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
-                }else {
-                    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}`;
-                }
             }else{
                 href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
             }