From 6dc8093f97e90b55efa5fb16e1e1891c799f8f04 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 14 Jul 2022 16:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/article/contactMine.vue | 7 ++++---
 src/views/exam/Test.vue           | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/article/contactMine.vue b/src/views/article/contactMine.vue
index 41b6221d..65e14973 100644
--- a/src/views/article/contactMine.vue
+++ b/src/views/article/contactMine.vue
@@ -16,7 +16,7 @@
       </el-select>
     <!-- <el-input style="width: 200px;margin-right: 10px" placeholder="请选择来源"></el-input> -->
     <!-- 问题： -->
-    <el-input style="width: 200px;margin-right: 10px" v-model="dataList.uname" clearable placeholder="搜索人员姓名标题"></el-input>
+    <el-input style="width: 200px;margin-right: 10px" v-model="dataList.send" clearable placeholder="搜索人员姓名标题"></el-input>
     <!-- 提问人：
     <el-input style="width: 200px;margin-right: 10px"></el-input> -->
     <el-button type="primary" @click="getList" icon="el-icon-search">搜索</el-button>
@@ -123,7 +123,7 @@ export default {
         pageSize:10,
         count:0,
         list:[],
-        uname:'',
+        send:'',
       },
       replyName:'',
       shareShow: false,
@@ -187,9 +187,10 @@ export default {
         this.$message.error("数据搜索失败")
       })
     },
-     reset(){
+    reset(){
      this.dataList.pageIndex = 1;
      this.dataList.send = '',
+     this.dataList.type = '',
      this.type = 0;
      this.getData();
      this.isSearh = false;
diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue
index d48f3b69..5ef8d406 100644
--- a/src/views/exam/Test.vue
+++ b/src/views/exam/Test.vue
@@ -33,7 +33,7 @@
                 <div v-if="examStatus==2" style="text-align: center;color:#6d6d6d; ">考试已结束</div>
             </div>
             <div v-else class="no-text">
-              <span>您没有需要的考试</span>
+              <span v-if="noExam">您没有需要的考试</span>
             </div>
             <div class="re-list" v-if="canExam">
               <p>历史记录</p>
@@ -240,6 +240,7 @@ export default {
       taskId:'',//考试任务的id
       lastId:'',//最后一次提交的答卷
       canExam:false,//能否参加考试
+      noExam:false,//不能参加考试
       tipText:'',//提示信息
       examStatus:0,//0表无，1表考试中，2表已结束
       btnText:'开始考试',
@@ -301,6 +302,9 @@ export default {
       apiTestPaper.getTestInfo(this.examId).then(res=>{
          if(res.status==200){
             this.canExam = res.result.hasTask;
+            if(!this.canExam) {
+              this.noExam = true;
+            }
             this.examStatus=res.result.examStatus;
             this.testPaper = res.result.exam;
             this.taskId=res.result.taskId;