修改考核判断条件展示

src/pages/ass/list/index.vue

@@ -92,14 +92,15 @@
 <!--                    </template>-->
 <!--                </el-table-column>-->
                 <el-table-column label="操作" align="center">
-                    <template slot-scope="scope" v-if="scope.row.show">
+                    <template slot-scope="scope" v-if="scope.row">
                         <!--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" type="text" disabled>未提交</el-button>
                         <el-button v-if="scope.row.status != 2 && (scope.row.stuState == 0 || scope.row.stuState == 1)" type="text"
                                    @click="entry(scope.row)" :disabled="scope.row.status !== 1">进入
                         </el-button>
                         <el-button v-if="scope.row.status == 1 && scope.row.stuState == 2" type="text" disabled>已提交</el-button>
-                        <el-button v-if="scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId" type="text"
+                        <el-button v-if="scope.row.status == 2 && scope.row.stuState == 2" type="text"
                                    @click="show(scope.row)">查看成绩
                         </el-button>
                     </template>
@@ -393,6 +394,7 @@ export default {
                 if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用)
                     this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => {
                         console.log(res)
+                        this.curRow.curriculumId = res.info.systemId
                         this.projectId = res.projectId
                         this.url = res.url
                         this.cid = res.info.cid
@@ -443,9 +445,17 @@ export default {
             let curriculumId = this.curRow.curriculumId;
             let token = util.local.get(Setting.tokenKey);
             let href = "";
-            let aaa = ''
+            let aaa = '';
+            console.log(curriculumId)
             aaa = host.slice(0,host.length-6)
+            if (curriculumId == 11){
+                //线上
+                // 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}`;
+            }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}`;
+            }
             // switch (curriculumId) {
             //     // case 1:
             //         href = `${host}${this.url}/#/?projectId=${this.projectId}`;

src/pages/station/preview/index.vue

@@ -314,7 +314,7 @@ export default {
                 // href = `${host}bank/#/`;
                 let token = util.local.get(Setting.tokenKey);
                 //线上
-                // 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=";
                 //测试
                 href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=";
                 //本地