SanHQin 1 週間 前
コミット
3dd0eb0f42

+ 6 - 5
src/components/pages/test/check/index.vue

@@ -2,7 +2,7 @@
   <div class="pb_content" style="background: #f0f2f5" v-loading="loading">
     <div class="pb_content_body" style="position: relative; margin: 0">
       <div class="right">
-        <div class="courseTop" v-if="gotype">
+        <div class="courseTop" v-if="gotype && !disableBack">
           <div
             class="r_pub_button_retrun"
             @click="retrunCourse"
@@ -11,7 +11,7 @@
           </div>
         </div>
         <div class="courseTop" v-else>
-          <div class="stepsNav" v-if="!examineId">
+          <div class="stepsNav" v-if="!examineId && !disableBack">
             <el-breadcrumb separator-class="el-icon-arrow-right">
               <el-breadcrumb-item
               v-if="!back"
@@ -45,7 +45,7 @@
             </el-breadcrumb>
           </div>
           <div
-            v-if="!peopleId"
+            v-if="!peopleId && !disableBack"
             class="r_pub_button_retrun"
             @click="retrunCourse"
           >
@@ -361,7 +361,7 @@
                         </div> -->
                         <div style="margin-top: 10px;display: flex;justify-content: flex-end;">
                           <el-button @click="opQvisible0 = false">取消</el-button>
-                          <el-button style="background: #1456F0;" @click="markSco()" type="primary">确定</el-button>
+                          <el-button style="background: #1456F0;" @click="markSco()" type="primary">运行</el-button>
                         </div>
                     </div>
 
@@ -1441,7 +1441,7 @@
                     <template v-if="scope.row.array[index].json.file">
                       <template v-for="(file, index2) in scope.row.array[index].json.file">
                         <div
-                          class="file" 
+                          class="file"
                           v-if="index2 < 3"
                           :key="index + '-' + index2"
                           @click.stop="checkFile(file)"
@@ -2191,6 +2191,7 @@ export default {
       // infoprogress: [],
       teaType: [],
       examineData:null,
+      disableBack: this.$route.query.disableBack === 'true',
     };
   },
   watch: {},

+ 2 - 2
src/components/pages/test/examine/conpoments/targetPage.vue

@@ -1525,7 +1525,7 @@ export default {
 
     // 查看数据来源
     lookPrize(val) {
-      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0`;
+      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&disableBack=true`;
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
       this.diaIframe = true;
     },
@@ -1671,7 +1671,7 @@ export default {
       // return console.log(val);
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.userid}`;
 
-      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${val.organizeid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}`;
+      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${val.organizeid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true`;
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
       this.diaIframe = true;
     },

+ 8 - 8
src/components/pages/test/index.vue

@@ -1390,14 +1390,14 @@ export default {
 				}
     },
     activated() {
-        console.log(1);
-        this.selectAllType();
-        if (this.stype == 1) {
-            this.getCourse();
-        } else if (this.stype == 2) {
-            this.getCourse2();
-        }
-        this.selectTestType();
+        // console.log(1);
+        // this.selectAllType();
+        // if (this.stype == 1) {
+        //     this.getCourse();
+        // } else if (this.stype == 2) {
+        //     this.getCourse2();
+        // }
+        // this.selectTestType();
     },
     mounted() {
         this.getPageBase()