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

src/components/pages/liyuan/page/teadTest.vue

@@ -48,7 +48,11 @@
                             v-if="item.array">
                             <div class="test" v-for="(test, index) in item.array" :key="test.id">
                                 <div class="time">
-                                    <span>提交记录{{item.array.length - index}}</span>
+                                    <span v-if="!test.editName && !test.name">提交记录{{item.array.length - index}}</span>
+                                    <span v-if="!test.editName && test.name">{{test.name}}</span>
+                                </div>
+                                <div class="testType">
+                                    <span :class="`typeStatus_${test.type}`">{{ typeStatusList[test.type] }}</span>
                                 </div>
                                 <div class="utime">
                                     <span>{{ test.utime }}</span>
@@ -116,7 +120,8 @@ export default {
             org: this.$route.query.org,
             role: this.$route.query.role,
             loading: false,
-            checkTypeValue:""
+            checkTypeValue:"",
+            typeStatusList:["","未提交","已提交","","已退回"]
         };
     },
     computed: {
@@ -663,19 +668,20 @@ export default {
 
 <style scoped>
 .i_body_box {
-    /* height: calc(100% - 10px); */
-    height: 100%;
+    height: calc(100% - 80px);
+    padding: 10px 0 0;
+    box-sizing: border-box;
 }
 
 .check_nav {
     display: flex;
     height: 50px;
     align-items: center;
+    padding: 0;
     box-sizing: border-box;
     width: 100%;
-    padding: 0 90px;
-    box-sizing: border-box;
     overflow: auto;
+    padding: 0 90px;
 }
 
 .check_nav>.nav {
@@ -689,7 +695,6 @@ export default {
     cursor: pointer;
     min-width: fit-content;
     margin-right: 10px;
-    
 }
 
 .check_nav>.active {
@@ -763,12 +768,12 @@ export default {
 
 
 .check_box {
-    height: calc(100% - 90px);
+    height: calc(100% - 50px);
     overflow: auto;
-    padding: 0 0px 20px;
-    margin: 0 90px;
+    padding: 0 0 20px;
     box-sizing: border-box;
     background: rgb(248, 250, 254);
+    margin: 0 90px;
 }
 
 .test_panel {
@@ -1059,7 +1064,7 @@ export default {
     font-size: 14px;
     width: 160px;
     min-width: 160px;
-    margin: 0 30px 0 auto;
+    margin: 0 30px 0 0;
 }
 .test_add_box>.test>.mask {
     display: flex;
@@ -1156,4 +1161,38 @@ export default {
 .isDead{
     color:#EE3E3E;
 }
+
+.testType{
+  width: 60px;
+  margin: 0 45px 0 auto;
+}
+
+.testType>span{
+  padding: 6px 10px;
+  border-radius: 4px;
+  border: solid 1px gray;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+}
+
+
+.testType>.typeStatus_2{
+  background:#F0F9F2;
+  border-color: #B5E3BF;
+  color:#5FC875;
+}
+
+.testType>.typeStatus_4{
+  background:#FEF5EC;
+  border-color: #FAD0A1;
+  color:#F7933B;
+}
+
+.testType>.typeStatus_1{
+  background:#EEF3FC;
+  border-color: #0F40F5;
+  color:#0F40F5;
+}
 </style>

src/components/pages/test/check/check.vue

@@ -4,7 +4,7 @@
       <div class="right">
         <div class="courseTop">
           <div class="stepsNav">
-            <el-breadcrumb separator-class="el-icon-arrow-right">
+            <el-breadcrumb separator-class="el-icon-arrow-right" v-if="!back">
               <el-breadcrumb-item
                 :to="{
                   path:
@@ -83,6 +83,7 @@ export default {
   },
   data() {
     return {
+      back:this.$route.query.back,
       userid: this.$route.query.userid,
       userid2: this.$route.query.userid2,
       tid: this.$route.query.tid,
@@ -105,6 +106,7 @@ export default {
   },
   methods: {
     retrunCourse() {
+      if (this.back) return this.$router.go(-1)
       if(this.type == 3){
         this.goTo(
         "/checkToTest2?uid=" +

src/components/pages/test/check/index.vue

@@ -3153,7 +3153,8 @@ ${JSON.stringify(forAllList)}
           this.org +
           "&type=2" +
           "&role=" +
-          this.role
+          this.role+
+          "&back=1"
       );
     },
     editTest(row){
@@ -3170,7 +3171,7 @@ ${JSON.stringify(forAllList)}
           this.oid +
           "&org=" +
           this.org +
-          "&type=3" +
+          "&type=2" +
           "&role=" +
           this.role +
           "&back=1"

src/router/index.js

@@ -147,6 +147,7 @@ import knowledge from '@/components/pages/knowledge/index'
 import sassPlatform from '@/components/pages/sassPlatform/index'
 import classroomObservationTest from '@/components/pages/classroomObservation/test.vue'
 import CourseCon from '@/components/pages/liyuan/CourseCon'
+import testReview from "@/components/pages/test/examine";
 import aiOffice from '@/components/pages/liyuan/aiOffice'
 import schoolSafe from '@/components/pages/liyuan/schoolSafe'
 import lyStudentEva from '@/components/pages/liyuan/studentEva'
@@ -1283,6 +1284,13 @@ export default new Router({
       keepAlive: true,
       requireAuth: ""//不需要鉴权
     }
+  },{
+      path: "/testReview",
+      name: "testReview",
+      component: testReview,
+      meta: {
+        requireAuth: "" // 不需要鉴权
+      }
   }, {
     path: "/aiOffice",
     name: "aiOffice",