新增

src/views/Cognize.vue

@@ -35,6 +35,9 @@ onMounted(() => {
     planId.value = route.params.planId as string
     planName.value = route.params.planName as string
     type.value = route.params.type as string
+    if (flag.value == 'SHAPE_RANDOM') {
+        isPass.value = userInfoStore().isPass
+    }
     if (flag.value == 'ETB01') {
         isPass.value = userInfoStore().isPassETB01
     }
@@ -104,7 +107,13 @@ const startCog = (val: number) => {
     //         name: 'shapeIntuitionRandom',
     //         params: { planId: planId.value, planName: planName.value, flag: flag.value, flagName: cognizeDetail.value.name, formalTest: val }
     //     })
-
+    if (flag.value == 'SHAPE_RANDOM') {
+        router.push(
+            {
+                name: 'shapeIntuitionRandom',
+                params: { planId: planId.value, planName: planName.value, flag: flag.value, flagName: cognizeDetail.value.name, formalTest: val }
+            })
+    }
     //更改到 跳转到人脸表情这里的认知任务
     if (flag.value == 'ETB01') {
         router.push(
@@ -284,6 +293,7 @@ onUnmounted(() => {
                                 <!-- <source src="../assets/cognize/Stroop.mp4" type="video/mp4"> -->
                                 <source src="../assets/cognize/Stroop.mp4" v-if="flag == 'EMOTION_STROOP'"
                                     type="video/mp4">
+                                <source src="../assets/cognize/yd.mp4" v-if="flag == 'SHAPE_RANDOM'" type="video/mp4">
                                 <source src="../assets/cognize/dt.mp4" v-if="flag == 'FDOT'" type="video/mp4">
                                 <!-- <source src="movie.ogg" type="video/ogg"> -->
                                 您的浏览器不支持 video 标签。

src/views/CognizeFaceDot.vue

@@ -7,7 +7,7 @@ import { onMounted, onUnmounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router';
 import { userInfoStore } from '@/stores'
 import { format } from 'date-fns/format';
-import { getCurrentTimeApi, querySelectTaskApi, saveFaceDotApi } from '@/api/plan';
+import { getCurrentTimeApi, querySelectTaskApi, saveFaceDotApi, updateTaskApi } from '@/api/plan';
 import { userPlanDetailApi } from '@/api/home';
 import { getUnread, planNumGet } from '@/utils/test';
 const userInfo = userInfoStore()
@@ -619,13 +619,15 @@ const submitData = async () => {
                 //这是测试完了--测试完成后调用测试记录
 
                 let res: any = await querySelectTaskApi(planId.value)
-
+                cpdmMe.value.open()
                 if (res.data.length == 0) {
-                    cpdmMe.value.open()
+                    // cpdmMe.value.open()
                     planNumGet()
                     getUnread()
                 } else {
-                    cpdmTask.value.open(planId.value)
+                    // cpdmTask.value.open(planId.value)
+                    updateTaskApi(planId.value)
+                    // cpdmMe.value.open()
                 }
 
                 // this.$router.push({ name: 'testRecord' })

src/views/ETBexperiment_new.vue

@@ -53,7 +53,7 @@ import { ElButton, ElProgress, ElMessage } from 'element-plus';
 import { oSessionStorage, preloader } from '@/utils/utils';
 import { useRoute, useRouter } from 'vue-router';
 import { userInfoStore } from '@/stores';
-import { getCurrentTimeApi, querySelectTaskApi, saveETBApi } from '@/api/plan';
+import { getCurrentTimeApi, querySelectTaskApi, saveETBApi, updateTaskApi } from '@/api/plan';
 import { userPlanDetailApi } from '@/api/home';
 import { getUnread, planNumGet } from '@/utils/test';
 const userInfo = userInfoStore()
@@ -625,13 +625,15 @@ const submitData = async () => {
 
 
             let res: any = await querySelectTaskApi(planId.value)
-
+            cpdmMe.value.open()
             if (res.data.length == 0) {
-                cpdmMe.value.open()
+                // cpdmMe.value.open()
                 planNumGet()
                 getUnread()
             } else {
-                cpdmTask.value.open(planId.value)
+                // cpdmTask.value.open(planId.value)
+                updateTaskApi(planId.value)
+
             }
 
             //根据id查询已完成--量表

src/views/Plan.vue

@@ -194,6 +194,12 @@ const planNumGet = async () => {
                             planList.value[i].list[j].isCompleted = '2'
                         }
                     }
+                    if (flag) {
+                        if (planList.value[i].list[j].flag == "20210617140713" && planList.value[i].list[j].isCompleted == "1") {
+                            //如果满足以上条件则scl90的状态切换为2  --也是未完成--但是预示着后边还有需要做的
+                            planList.value[i].list[j].isCompleted = '2'
+                        }
+                    }
 
                     if (planList.value[i].list[j].contentType == '0' && planList.value[i].list[j].isAvailable == '1' && planList.value[i].list[j].isDisplayed == '1') {
                         planList.value[i].scaleList.push(planList.value[i].list[j])
@@ -278,7 +284,7 @@ onUnmounted(() => {
                     <div class="test_record_out" v-for="item in planList">
                         <div class="record_tip">
                             <span class="record_tip_out"><span class="record_tip_inner">创建时间：</span>{{ item.createTime
-                                }}</span>
+                            }}</span>
                             <span><span class="record_tip_inner">结束时间：</span>{{ item.planEndTime }}</span>
                         </div>
                         <div class="test_record">

src/views/Scale.vue

@@ -40,6 +40,10 @@ const startTime = ref<string>('')
 const num = ref<string>('')
 const isComplate = ref<string>('')
 
+
+//是附加题第几组的标志
+const flagAdditional = ref<number>(1)
+
 //测试全部数字
 const planAllNum = ref<number>(0);
 //测试已完成的 
@@ -108,72 +112,146 @@ const nextTopic = () => {
     //已经选择的话---需要拿到当前对象---判断flag是另外三个的flag吗
     //如果是--则判断是否在数组里边--如果不在则存储
     //将抑郁自评量表的数据存储进数组
-    if (scaleList.value[topicIndex.value - 1].flag == '20210617000138' && !listDepressed.value.includes(scaleList.value[topicIndex.value - 1].id)) {
-        listDepressed.value.push(scaleList.value[topicIndex.value - 1].id)
-        //判断抑郁压力数组的长度是20 调用保存接口
-        //循环到数组 当前中所有flag 等于抑郁自评量表的数组--然后传输给保存方法
-        //判断此数组长度是多少
-        if (listDepressed.value.length == 14) {
-            let list = []
-            for (let i = 0; i < scaleList.value.length; i++) {
-                if (scaleList.value[i].flag == '20210617000138') {
-                    list.push(scaleList.value[i])
+
+    if (flagAdditional.value == 1) {
+        //当附加题是1时
+
+        if (scaleList.value[topicIndex.value - 1].flag == '20210617020516' && !listDepressed.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listDepressed.value.push(scaleList.value[topicIndex.value - 1].id)
+            //判断抑郁压力数组的长度是20 调用保存接口
+            //循环到数组 当前中所有flag 等于抑郁自评量表的数组--然后传输给保存方法
+            //判断此数组长度是多少
+            if (listDepressed.value.length == 20) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20210617020516') {
+                        list.push(scaleList.value[i])
+                    }
                 }
+                let listTm = JSON.parse(JSON.stringify(list))
+                subScaleData(listTm, "20210617020516")
             }
-            let listTm = JSON.parse(JSON.stringify(list))
-            subScaleData(listTm, "20210617000138")
+
+
         }
+        //将知觉压力问卷的数据存储进数组
+
+        if (scaleList.value[topicIndex.value - 1].flag == '20210913093250' && !listStress.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listStress.value.push(scaleList.value[topicIndex.value - 1].id)
+            //调用知觉压力数据保存接口
+            //如果长度达到指定数目
+            if (listStress.value.length == 30) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20210913093250') {
+                        list.push(scaleList.value[i])
+                    }
+                }
+                let listTm = JSON.parse(JSON.stringify(list))
 
+                subScaleData(listTm, "20210913093250")
+            }
 
-    }
-    //将知觉压力问卷的数据存储进数组
-
-    if (scaleList.value[topicIndex.value - 1].flag == '20210617121646' && !listStress.value.includes(scaleList.value[topicIndex.value - 1].id)) {
-        listStress.value.push(scaleList.value[topicIndex.value - 1].id)
-        //调用知觉压力数据保存接口
-        //如果长度达到指定数目
-        if (listStress.value.length == 21) {
-            let list = []
-            for (let i = 0; i < scaleList.value.length; i++) {
-                if (scaleList.value[i].flag == '20210617121646') {
-                    list.push(scaleList.value[i])
+        }
+        //将焦虑自评量的数据存储进数组
+        if (scaleList.value[topicIndex.value - 1].flag == '20210617000853' && !listAnxiety.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listAnxiety.value.push(scaleList.value[topicIndex.value - 1].id)
+            //调用焦虑
+            if (listAnxiety.value.length == 20) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20210617000853') {
+                        list.push(scaleList.value[i])
+                    }
                 }
+                let listTm = JSON.parse(JSON.stringify(list))
+                subScaleData(listTm, "20210617000853")
             }
-            let listTm = JSON.parse(JSON.stringify(list))
 
-            subScaleData(listTm, "20210617121646")
         }
 
-    }
-    //将焦虑自评量的数据存储进数组
-    if (scaleList.value[topicIndex.value - 1].flag == '20220515221429' && !listAnxiety.value.includes(scaleList.value[topicIndex.value - 1].id)) {
-        listAnxiety.value.push(scaleList.value[topicIndex.value - 1].id)
-        //调用焦虑
-        if (listAnxiety.value.length == 14) {
-            let list = []
-            for (let i = 0; i < scaleList.value.length; i++) {
-                if (scaleList.value[i].flag == '20220515221429') {
-                    list.push(scaleList.value[i])
+        //判断当前是不是最后一题
+        //如果是最后一题就不++了
+        if (topicIndex.value == scaleList.value.length) {
+            // 最后一题就进行提交了
+            //判断不是这三个的话
+            if (scaleList.value[topicIndex.value - 1].flag != '20210617020516' && scaleList.value[topicIndex.value - 1].flag != '20210913093250' && scaleList.value[topicIndex.value - 1].flag != '20210617000853') {
+                let listTm = JSON.parse(JSON.stringify(scaleList.value))
+                subScaleData(listTm, flag.value)
+            }
+            // subScaleData(listTm, "20220515221429")
+            return
+        }
+    } else {
+
+        if (scaleList.value[topicIndex.value - 1].flag == '20210617000138' && !listDepressed.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listDepressed.value.push(scaleList.value[topicIndex.value - 1].id)
+            //判断抑郁压力数组的长度是20 调用保存接口
+            //循环到数组 当前中所有flag 等于抑郁自评量表的数组--然后传输给保存方法
+            //判断此数组长度是多少
+            if (listDepressed.value.length == 14) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20210617000138') {
+                        list.push(scaleList.value[i])
+                    }
                 }
+                let listTm = JSON.parse(JSON.stringify(list))
+                subScaleData(listTm, "20210617000138")
             }
-            let listTm = JSON.parse(JSON.stringify(list))
-            subScaleData(listTm, "20220515221429")
+
+
         }
+        //将知觉压力问卷的数据存储进数组
+
+        if (scaleList.value[topicIndex.value - 1].flag == '20210617121646' && !listStress.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listStress.value.push(scaleList.value[topicIndex.value - 1].id)
+            //调用知觉压力数据保存接口
+            //如果长度达到指定数目
+            if (listStress.value.length == 21) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20210617121646') {
+                        list.push(scaleList.value[i])
+                    }
+                }
+                let listTm = JSON.parse(JSON.stringify(list))
 
-    }
+                subScaleData(listTm, "20210617121646")
+            }
 
-    //判断当前是不是最后一题
-    //如果是最后一题就不++了
-    if (topicIndex.value == scaleList.value.length) {
-        // 最后一题就进行提交了
-        //判断不是这三个的话
-        if (scaleList.value[topicIndex.value - 1].flag != '20210617000138' && scaleList.value[topicIndex.value - 1].flag != '20210617121646' && scaleList.value[topicIndex.value - 1].flag != '20220515221429') {
-            let listTm = JSON.parse(JSON.stringify(scaleList.value))
-            subScaleData(listTm, flag.value)
         }
-        // subScaleData(listTm, "20220515221429")
-        return
+        //将焦虑自评量的数据存储进数组
+        if (scaleList.value[topicIndex.value - 1].flag == '20220515221429' && !listAnxiety.value.includes(scaleList.value[topicIndex.value - 1].id)) {
+            listAnxiety.value.push(scaleList.value[topicIndex.value - 1].id)
+            //调用焦虑
+            if (listAnxiety.value.length == 14) {
+                let list = []
+                for (let i = 0; i < scaleList.value.length; i++) {
+                    if (scaleList.value[i].flag == '20220515221429') {
+                        list.push(scaleList.value[i])
+                    }
+                }
+                let listTm = JSON.parse(JSON.stringify(list))
+                subScaleData(listTm, "20220515221429")
+            }
+
+        }
+
+        //判断当前是不是最后一题
+        //如果是最后一题就不++了
+        if (topicIndex.value == scaleList.value.length) {
+            // 最后一题就进行提交了
+            //判断不是这三个的话
+            if (scaleList.value[topicIndex.value - 1].flag != '20210617000138' && scaleList.value[topicIndex.value - 1].flag != '20210617121646' && scaleList.value[topicIndex.value - 1].flag != '20220515221429') {
+                let listTm = JSON.parse(JSON.stringify(scaleList.value))
+                subScaleData(listTm, flag.value)
+            }
+            // subScaleData(listTm, "20220515221429")
+            return
+        }
     }
+
     topicIndex.value++
 
 }
@@ -203,7 +281,7 @@ const subScaleData = async (data: any, flag1: string) => {
         orgNo: userInfo.userInfo.orgNo,
         planId: planId.value,
         planName: planName.value,
-        taskFlag: flag,
+        taskFlag: flag1,
         taskName: flagName.value,
         testRecord: JSON.stringify(productData(data)),
         type: '0',
@@ -222,45 +300,112 @@ const subScaleData = async (data: any, flag1: string) => {
     if (flag.value == '20210713155333') {
         //判断当前 flag 是可选的三个吗
         //如果是的话---
-        if (flag1 == '20210617000138' || flag1 == '20210617121646' || flag1 == '20220515221429') {
-            //判断是否是做完了
-            if (topicIndex.value == scaleList.value.length) {
-                //这时是全部的都做完了
-                //做完后目前先跳转到测试计划页面
+        if (flagAdditional.value == 1) {
+            if (flag1 == '20210617020516' || flag1 == '20210913093250' || flag1 == '20210617000853') {
+                //判断是否是做完了
+                if (topicIndex.value == scaleList.value.length) {
+                    //这时是全部的都做完了
+                    //做完后目前先跳转到测试计划页面
+                    ElMessage({
+                        message: '提交完成',
+                        type: "success",
+                    })
+                    router.push({ name: 'plan' })
+                }
+            }
+            if (flag1 == '20210713155333') {
+
+                queryNeedScale()
+                //如果是排除是其他两个则直接返回
+            } else if (flag1 != '20210617020516' && flag1 != '20210913093250' && flag1 != '20210617000853') {
+                //此时做完需要跳转到计划页面
+                ElMessage({
+                    message: '提交完成',
+                    type: "success",
+                })
+                router.push({ name: 'plan' })
+            }
+        } else {
+            if (flag1 == '20210617000138' || flag1 == '20210617121646' || flag1 == '20220515221429') {
+                //判断是否是做完了
+                if (topicIndex.value == scaleList.value.length) {
+                    //这时是全部的都做完了
+                    //做完后目前先跳转到测试计划页面
+                    ElMessage({
+                        message: '提交完成',
+                        type: "success",
+                    })
+                    router.push({ name: 'plan' })
+                }
+            }
+            if (flag1 == '20210713155333') {
+
+                queryNeedScale()
+                //如果是排除是其他两个则直接返回
+            } else if (flag1 != '20210617000138' && flag1 != '20210617121646' && flag1 != '20220515221429') {
+                //此时做完需要跳转到计划页面
                 ElMessage({
                     message: '提交完成',
                     type: "success",
                 })
                 router.push({ name: 'plan' })
             }
-        }
-        if (flag1 == '20210713155333') {
-
-            queryNeedScale()
-            //如果是排除是其他两个则直接返回
-        } else if (flag1 != '20210617000138' && flag1 != '20210617121646' && flag1 != '20220515221429') {
-            //此时做完需要跳转到计划页面
-            ElMessage({
-                message: '提交完成',
-                type: "success",
-            })
-            router.push({ name: 'plan' })
         }
     }
 
 
     //*******************抑郁焦虑压力量表end*************************/
 
+    //需要一个前提条件就是--需要看一下匹配的哪一个附加题--这个是灵活的
     //*******************scl90 start*************************/
 
     if (flag.value == '20210617140713') {
         //判断当前 flag 是可选的三个吗
-        //如果是的话---
-        if (flag1 == '20210617000138' || flag1 == '20210617121646' || flag1 == '20220515221429') {
-            //判断是否是做完了
-            if (topicIndex.value == scaleList.value.length) {
-                //这时是全部的都做完了
-                //做完后目前先跳转到测试计划页面
+        //如果是的话---   第一组附加题
+        if (flagAdditional.value == 1) {
+            if (flag1 == '20210617020516' || flag1 == '20210913093250' || flag1 == '20210617000853') {
+                //判断是否是做完了
+                if (topicIndex.value == scaleList.value.length) {
+                    //这时是全部的都做完了
+                    //做完后目前先跳转到测试计划页面
+                    ElMessage({
+                        message: '提交完成',
+                        type: "success",
+                    })
+                    router.push({ name: 'plan' })
+                }
+            }
+            if (flag1 == '20210617140713') {
+
+                queryNeedScale()
+                //如果是排除是其他两个则直接返回
+            } else if (flag1 != '20210617020516' && flag1 != '20210913093250' && flag1 != '20210617000853') {
+                //此时做完需要跳转到计划页面
+                ElMessage({
+                    message: '提交完成',
+                    type: "success",
+                })
+                router.push({ name: 'plan' })
+            }
+        } else {
+            if (flag1 == '20210617000138' || flag1 == '20210617121646' || flag1 == '20220515221429') {
+                //判断是否是做完了
+                if (topicIndex.value == scaleList.value.length) {
+                    //这时是全部的都做完了
+                    //做完后目前先跳转到测试计划页面
+                    ElMessage({
+                        message: '提交完成',
+                        type: "success",
+                    })
+                    router.push({ name: 'plan' })
+                }
+            }
+            if (flag1 == '20210617140713') {
+
+                queryNeedScale()
+                //如果是排除是其他两个则直接返回
+            } else if (flag1 != '20210617000138' && flag1 != '20210617121646' && flag1 != '20220515221429') {
+                //此时做完需要跳转到计划页面
                 ElMessage({
                     message: '提交完成',
                     type: "success",
@@ -268,18 +413,7 @@ const subScaleData = async (data: any, flag1: string) => {
                 router.push({ name: 'plan' })
             }
         }
-        if (flag1 == '20210617140713') {
-
-            queryNeedScale()
-            //如果是排除是其他两个则直接返回
-        } else if (flag1 != '20210617000138' && flag1 != '20210617121646' && flag1 != '20220515221429') {
-            //此时做完需要跳转到计划页面
-            ElMessage({
-                message: '提交完成',
-                type: "success",
-            })
-            router.push({ name: 'plan' })
-        }
+
     }
 
     //*******************scl90 end*************************/
@@ -312,7 +446,6 @@ const sclIsCom = async () => {
         userNo = userInfo.userInfo.userNo
         //调用根据用户查询计划的API
         let res: any = await userPlanApi(userNo)
-
         for (let i = 0; i < res.data.length; i++) {
             if (res.data[i].id = planId.value) {
                 planObj.value = res.data[i]
@@ -327,6 +460,17 @@ const sclIsCom = async () => {
         }
         //调用详细的API
         let temp: any = await userPlanDetailApi(params)
+        //在这里可以判断出是做的第一组附加题还是做的第二组附加题--加个标志进行判断
+        for (let i = 0; i < temp.data.length; i++) {
+            //
+            if (temp.data[i].flag == '20210617020516') {
+                flagAdditional.value = 1
+            }
+            if (temp.data[i].flag == '20210617000138') {
+                flagAdditional.value = 2
+            }
+        }
+
         planObj.value.list = temp.data
         //判断是否需要
         //判断量表中有几个是必须测试的且不显示的

src/views/Stroop.vue

@@ -4,7 +4,7 @@ import CpdmTask from '../components/CpdmTask.vue'
 import CpdmMessage from '../components/CpdmMessage.vue'
 import { useRoute, useRouter } from 'vue-router';
 import { userInfoStore } from '@/stores'
-import { getCurrentTimeApi, querySelectTaskApi, saveStroopApi } from '@/api/plan';
+import { getCurrentTimeApi, querySelectTaskApi, saveStroopApi, updateTaskApi } from '@/api/plan';
 import { userPlanDetailApi } from '@/api/home';
 import { getUnread, planNumGet } from '@/utils/test';
 import { ElMessage } from 'element-plus';
@@ -336,7 +336,7 @@ const clickColor = async (val: string) => {
             }
             let count = 0
             for (let i = 0; i < recordResult.value.length; i++) {
-                if (!recordResult.value[i].isTimeOut) {
+                if (recordResult.value[i].isTimeOut == false && recordResult.value[i].isColorCorrent) {
                     count++
                 }
             }
@@ -378,13 +378,17 @@ const clickColor = async (val: string) => {
                 } else {
 
                     let res: any = await querySelectTaskApi(planId.value)
-
+                    cpdmMe.value.open()
                     if (res.data.length == 0) {
-                        cpdmMe.value.open()
+
+                        // cpdmMe.value.open()
                         planNumGet()
                         getUnread()
                     } else {
-                        cpdmTask.value.open(planId.value)
+                        //
+                        updateTaskApi(planId.value)
+                        // cpdmMe.value.open()
+                        // cpdmTask.value.open(planId.value)
                     }
 
                 }

src/views/TestRecord.vue

@@ -2,7 +2,7 @@
 import CpmdHeader from '@/components/CpmdHeader.vue';
 import CpmdFooter from '@/components/CpmdFooter.vue'
 import { onMounted, onUnmounted, ref } from 'vue'
-import { getUnread } from '../utils/test'
+import { getUnread, planNumGet } from '../utils/test'
 //持久化设置 菜单状态
 import { menuStatusStore, userInfoStore } from '@/stores'
 // import router from '@/router';
@@ -93,9 +93,9 @@ const initData = async () => {
                 let scaleList = []
                 for (let j = 0; j < temp.data.length; j++) {
                     if (temp.data[j].isDisplayed == '1' && temp.data[j].contentType == '0') {
-                        if (temp.data[j].flag != '20210617140713') {
-                            scaleList.push(temp.data[j])
-                        }
+                        // if (temp.data[j].flag != '20210617140713') {
+                        scaleList.push(temp.data[j])
+                        // }
                     }
                 }
                 listInit[i].scaleList = scaleList;
@@ -131,6 +131,7 @@ onMounted(() => {
     initData()
     if (userInfo.token) {
         getUnread()
+        planNumGet()
     }
     //进到界面开始轮询
 

src/views/shapeIntuition_random.vue

@@ -61,7 +61,7 @@ import { planNumGet, getUnread } from '../utils/test'
 import { format as myFormat } from 'date-fns';
 import { userPlanDetailApi } from '@/api/home';
 import CpdmMessage from '@/components/CpdmMessage.vue';
-import { getCurrentTimeApi } from '@/api/plan';
+import { getCurrentTimeApi, querySelectTaskApi, updateTaskApi } from '@/api/plan';
 const userInfo = userInfoStore()
 
 export default {
@@ -110,6 +110,8 @@ export default {
       flagName: '',
       formalTest: '',
       beginTime: '',
+      updateTaskApi: updateTaskApi,
+      querySelectTaskApi: querySelectTaskApi,
       getCurrentTimeApi: getCurrentTimeApi,
       userPlanDetailApi: userPlanDetailApi,
       planNumGet: planNumGet,
@@ -300,7 +302,7 @@ export default {
 
         if (this.userRightResponseCount / this.userTestPicList.length >= 0.8) {
           //设置状态为true
-          userInfo.saveIspass()
+          userInfo.saveIspass('')
           this.$message({
             message: `练习测试通过！正确率为${this.userRightResponseCount / this.userTestPicList.length * 100}%`,
             type: "success",
@@ -374,10 +376,20 @@ export default {
             //当测试完了以后--需要弹出确认的弹出框
             //把弹出框的内容   及用户信息 进行处理 进行发布
             //这是测试完了--测试完成后调用测试记录
-
+            let res = await querySelectTaskApi(this.planId)
             this.$refs.cpdmMe.open()
-            planNumGet()
-            getUnread()
+            if (res.data.length == 0) {
+              // this.$refs.cpdmMe.open()
+              planNumGet()
+              getUnread()
+            } else {
+              // cpdmTask.value.open(planId.value)
+              updateTaskApi(this.planId)
+              // this.$refs.cpdmMe.open()
+            }
+
+            // planNumGet()
+            // getUnread()
             // this.$router.push({ name: 'testRecord' })
           }
           //如果后边没有--则测试跳转到报告页