修改测试计划状态--及显示登录按钮

src/components/CpmdHeader.vue

@@ -38,6 +38,16 @@ const login = () => {
     menuStatus.saveActiveIndex('6')
     router.push({ name: 'login', params: {} })
 }
+const falgMenu = ref<boolean>(false)
+//鼠标移入事件
+const comeMenu = () => {
+    falgMenu.value = true
+}
+//鼠标移出事件
+const leaveMenu = () => {
+    falgMenu.value = false
+}
+
 </script>
 
 <template>
@@ -54,7 +64,7 @@ const login = () => {
                 <el-menu-item index="4">测试计划</el-menu-item>
             </el-badge> -->
             <el-menu-item index="4">
-                <div class="badge_custom">
+                <div class="badge_custom" v-show="userInfo.planCurrentNum != 0">
                     {{ userInfo.planCurrentNum }}
                 </div>
                 <span>测试计划</span>
@@ -62,11 +72,28 @@ const login = () => {
             <el-menu-item index="5">测试记录</el-menu-item>
         </el-menu>
 
-        <div class="login_button_bg" @click="login">
+        <div class="login_button_bg" @mouseenter="comeMenu" @mouseleave="leaveMenu" v-show="userInfo.userInfo.userName">
             <img width="20px" src="../assets/home/button_login.png" />
             &nbsp;&nbsp;&nbsp;&nbsp;
             <span>{{ userInfo.userInfo.userName }}</span>
+            <transition>
+                <div class="login_user" v-show="falgMenu">
+                    <div class="update_pass">
+                        修改密码
+                    </div>
+                    <div class="exit_login">
+                        退出登录
+                    </div>
+                </div>
+            </transition>
+
+        </div>
+        <div class="login_button_bg" v-show="!userInfo.userInfo.userName" @click="login">
+            <img width="20px" src="../assets/home/button_login.png" />
+            &nbsp;&nbsp;&nbsp;&nbsp;
+
             <span v-if="!userInfo.userInfo?.userName">登录账号</span>
+
         </div>
         <!-- <div class="menu_gen">首页</div>
         <div class="menu_gen">科普乐园</div>
@@ -153,6 +180,7 @@ const login = () => {
     }
 
     .login_button_bg {
+        position: relative;
         background-color: #000000;
         border-radius: 12px;
         border: 3px solid #48D68E;
@@ -161,6 +189,47 @@ const login = () => {
         cursor: pointer;
         display: flex;
         align-items: center;
+
+        .login_user {
+            border-bottom-left-radius: 20px;
+            border-bottom-right-radius: 20px;
+            width: 80%;
+            position: absolute;
+            background-color: #ffffff;
+            bottom: -105px;
+            margin-left: calc(10% - 20px);
+
+            color: #000000;
+
+            .update_pass {
+                text-align: center;
+                margin-top: 20px;
+                // padding: 5px;
+                color: #999999
+            }
+
+            .update_pass:hover {
+                text-align: center;
+                margin-top: 20px;
+                color: #48D68E // padding: 5px;
+            }
+
+            .exit_login {
+                text-align: center;
+                // padding: 5px;
+                margin-top: 20px;
+                margin-bottom: 20px;
+                color: #999999
+            }
+
+            .exit_login:hover {
+                text-align: center;
+                // padding: 5px;
+                margin-top: 20px;
+                margin-bottom: 20px;
+                color: #48D68E // padding: 5px;
+            }
+        }
     }
 
     .flex-grow {

src/router/index.ts

@@ -77,7 +77,7 @@ const routes = [
 
     },
     {
-      path: 'scaleMid',
+      path: 'scaleMid/:planId/:planName/:flag/:flagName/:num',
       name: 'scaleMid',
       component: () => import('@/views/ScaleMid.vue')//量表中间件
 

src/views/CognizeFaceDot.vue

@@ -66,6 +66,8 @@ const requireImg = (path: string) => {
 onMounted(() => {
     countDownStr.value = '马上开始'
     currentType.value = parseInt(route.params.currentType as string)
+    console.log(currentType.value)
+    console.log('currentType')
 
     flag1.value = route.params.flag as string;
     planId.value = route.params.planId as string
@@ -99,8 +101,8 @@ onMounted(() => {
     //判断是否是练习测试
     //判断是否是正式测试
 
-    clickVoice.value = new Audio(requireImg("../../assets/notify.wav"));
-    banClickVoice.value = new Audio(requireImg("../../assets/ban.mp3"));
+    clickVoice.value = new Audio(requireImg("../assets/cognize/notify.wav"));
+    banClickVoice.value = new Audio(requireImg("../assets/cognize/ban.mp3"));
 
 
 })
@@ -496,7 +498,7 @@ const submitData = async () => {
         message: `正确率为${((blockRight1.length / turnsNumber.value) * 100).toFixed(2)}%`,
         type: "info"
     })
-    if (currentType.value) {
+    if (!currentType.value) {
         setTimeout(() => {
             router.go(-1)
         }, 1500)
@@ -547,8 +549,8 @@ const submitData = async () => {
             taskFlag: flag.value,
             taskName: flagName.value,
             // testRecord: JSON.stringify(productData()),
-            data: JSON.stringify(resultData),
-            result: JSON.stringify({ result }),
+            testRecord: JSON.stringify(resultData),
+            testResult: JSON.stringify(result),
             type: '1',
             userName: userInfo.userInfo.userName,
             // userNo: isHaveManage ? userInfo.userInfo.userNo : '20240726001',

src/views/HomeView.vue

@@ -196,8 +196,8 @@ const planNumGet = async () => {
   </div>
   <div class="home_mid">
 
-    <div class="home_mid_plan" v-show="taskCircleFlag" @click="openSquare" ref="plan_jihua"
-      :style="{ top: plan_jihua + 'px' }">
+    <div class="home_mid_plan" v-show="taskCircleFlag && userInfo.planCurrentNum != 0" @click="openSquare"
+      ref="plan_jihua" :style="{ top: plan_jihua + 'px' }">
       <div class="badge_custom">
         {{ userInfo.planCurrentNum }}
       </div>

src/views/Plan.vue

@@ -156,7 +156,10 @@ onUnmounted(() => {
         <div class="kply">
             <div class="kply_inner">
                 <div>
-                    <img v-show="planList.length == 0" src="../assets/planNo.png">
+                    <div style="padding:10% 20%" v-show="planList.length == 0">
+                        <img width="100%" src="../assets/planNo.png">
+                    </div>
+
                     <!-- 测试记录列表 -->
                     <div class="test_record_out" v-for="item in planList">
                         <div class="record_tip">

src/views/ScaleMid.vue

@@ -77,9 +77,10 @@ const nextTask = () => {
         })
     }
     if (num.value == '4') {
+        //跳转到查看报告页面
         //跳转到测试记录页面
         router.push({
-            name: 'testRecord'
+            name: 'report', params: { id: 'xx1000xx' }
         })
     }
 
@@ -148,7 +149,7 @@ onUnmounted(() => {
                                          下一个任务 
                                     </div>
                                     <div class="scale_button_self" v-show="num == '4'" @click="nextTask">
-                                        &nbsp;下一个任务&nbsp;
+                                        &nbsp;查看报告&nbsp;
                                     </div>
                                 </el-col>
                             </el-row>