修改测试计划页面

src/views/Plan.vue

@@ -34,7 +34,6 @@ const planList = ref<any>([
 // }
 //点击了开始测试--跳转到测试页面
 const startPlan = async (val: any) => {
-    debugger;
     //先判断
     //是否做了问卷
     //如果未做问卷需要弹出问卷的弹出框
@@ -276,18 +275,22 @@ onUnmounted(() => {
                                                     src="../assets/kepu/xlwht_active.png" alt="">
                                                 <div class="task_content">
                                                     <div class="title">{{ subItem.name }}</div>
-                                                    <div class="des">预计用时{{ subItem.expectTime }}</div>
-                                                    <div
-                                                        :style="{ color: subItem.isCompleted == '1' ? 'green' : 'red' }">
-                                                        {{
-                                                            subItem.isCompleted == '1' ? '已完成' : '未完成' }}</div>
+                                                    <div class="des" v-show="subItem.isCompleted != '1'">预计用时:{{
+                                                        subItem.expectTime }}</div>
+                                                    <div class="des" v-show="subItem.isCompleted == '1'">实际用时:{{
+                                                        subItem.useTime }}</div>
+                                                    <div class="noCompleted" v-show="subItem.isCompleted != '1'">
+                                                        <div class='noCompleted_status'> 未完成</div>
+                                                    </div>
+                                                    <div class="isCompleted" v-show="subItem.isCompleted == '1'">
+                                                        <div class='isCompleted_status'> 已完成</div>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
 
                                     </div>
                                 </div>
-
                                 <div class="task_out">
                                     <div class="content_title">2.认知评估</div>
                                     <div class="task_inner">
@@ -297,7 +300,16 @@ onUnmounted(() => {
                                                     src="../assets/kepu/xlwht_active.png" alt="">
                                                 <div class="task_content">
                                                     <div class="title">{{ subItem.name }}</div>
-                                                    <div class="des">预计用时{{ subItem.expectTime }}</div>
+                                                    <div class="des" v-show="subItem.isCompleted != '1'">预计用时:{{
+                                                        subItem.expectTime }}</div>
+                                                    <div class="des" v-show="subItem.isCompleted == '1'">实际用时:{{
+                                                        subItem.useTime }}</div>
+                                                    <div class="noCompleted" v-show="subItem.isCompleted != '1'">
+                                                        <div class='noCompleted_status'> 未完成</div>
+                                                    </div>
+                                                    <div class="isCompleted" v-show="subItem.isCompleted == '1'">
+                                                        <div class='isCompleted_status'> 已完成</div>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
@@ -789,11 +801,49 @@ onUnmounted(() => {
                                                 font-weight: 700;
                                                 font-size: 18px;
                                                 width: 100%;
+                                                letter-spacing: 2px;
                                             }
 
                                             .des {
+
                                                 color: #999999;
                                                 font-size: 14px;
+                                                line-height: 24px;
+                                                letter-spacing: 2px;
+                                            }
+
+                                            .noCompleted {
+                                                width: 100%;
+                                                color: #ffffff;
+                                                display: flex;
+                                                justify-content: end;
+
+                                                .noCompleted_status {
+                                                    line-height: 24px;
+                                                    font-size: 14px;
+                                                    border-radius: 20px;
+                                                    text-align: center;
+                                                    right: 0px;
+                                                    width: 70px;
+                                                    background-color: red;
+                                                }
+                                            }
+
+                                            .isCompleted {
+                                                width: 100%;
+                                                color: #ffffff;
+                                                display: flex;
+                                                justify-content: end;
+
+                                                .isCompleted_status {
+                                                    line-height: 24px;
+                                                    font-size: 14px;
+                                                    border-radius: 20px;
+                                                    text-align: center;
+                                                    right: 0px;
+                                                    width: 70px;
+                                                    background-color: green;
+                                                }
                                             }
                                         }
                                     }

src/views/shapeIntuition_random.vue

@@ -84,7 +84,7 @@ export default {
       flag: '',
       flagName: '',
       formalTest: '',
-      startTime: ''
+      beginTime: ''
     };
   },
   // 页面初始化函数
@@ -101,7 +101,9 @@ export default {
     //
     this.formalTest = this.$route.params.formalTest;
     console.log(this.$route.params.formalTest)
-    debugger;
+
+    this.beginTime = myFormat(new Date().getTime(), "yyyy-MM-dd HH:mm:ss")
+
     //拿到是练习测试还是正式测试
     this.init(this.formalTest);
   },
@@ -226,9 +228,11 @@ export default {
         this.userTestPicList = [];
         this.button1Show = true;
         this.$message({
-          message: "测试结束！",
+          message: "练习测试结束！",
           type: "success",
         });
+        //跳转到上一页
+        this.$router.go(-1)
       } else {
         let userScore = (
           (this.userRightResponseCount / this.userResponseRecords.length) *
@@ -240,7 +244,7 @@ export default {
         this.button1Show = false;
         if (this.saveFalg) {
           let result = {
-            beginTime: myFormat(new Date().getTime(), "yyyy-MM-dd HH:mm:ss"),
+            beginTime: this.beginTime,
             // "id": "string",
             orgName: userInfo.userInfo.orgName,
             orgNo: userInfo.userInfo.orgNo,
@@ -260,6 +264,7 @@ export default {
             message: "测试结束！",
             type: "success",
           });
+          this.$router.push({ name: 'plan' })
           this.saveFalg = false;
         }
       }