Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/liyuan/page/examine/index.vue

@@ -251,12 +251,16 @@ export default {
     };
   },
   watch: {
-    pType(newVal, oldVal) {
-      this.getPageBase();
-    },
-    timeA(){
-      this.getPageBase();
-    },
+    // pType(newVal, oldVal) {
+    //   this.getPageBase();
+    // console.log('333');
+
+    // },
+    // timeA(){
+    //   this.getPageBase();
+    // console.log('444');
+
+    // },
     timeB(){
       this.getPageBase();
     }
@@ -269,9 +273,11 @@ export default {
     this.getPageBase2(2)
   },
   mounted() {
-    this.getPageBase();
-    this.getPageBase2(1)
-    this.getPageBase2(2)
+    // this.getPageBase();
+    // this.getPageBase2(1)
+    // this.getPageBase2(2)
+    // console.log('2222');
+
     // console.log(JSON.stringify(this.TeaTabJson));
   },
   methods: {

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 && !disableBack">
+        <div class="courseTop" v-if="gotype && !disableBack && !peopleId">
           <div
             class="r_pub_button_retrun"
             @click="retrunCourse"

src/components/pages/testPerson/examine/index.vue

@@ -152,7 +152,7 @@
                     <div v-else style="padding-top: 10px;">
                       <!-- {{ k.testid.test }} -->
                       <div
-                        v-for="(item2, index) in k.testid.test"
+                        v-for="(item2) in k.testid.test"
                         :key="item2.courseId"
                         class="orgData"
                       >
@@ -579,10 +579,10 @@ export default {
 	margin: 10px 0;
 	border-radius: 5px;
 }
-.tArea {
+/* .tArea { */
   /* box-sizing: border-box; */
   /* padding: 5px; */
-}
+/* } */
 .tArea > div > textarea {
   border: none;
   width: 100%;