From cffc1a98893891fd407666069065d2983437d116 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 8 Mar 2023 15:50:21 +0800
Subject: [PATCH] 3-8BUG

---
 src/views/examinationPaper/add.vue   |  9 ++++++---
 src/views/examinationPaper/index.vue |  4 ++--
 src/views/layout/Footer/bottom.vue   |  2 +-
 src/views/standard/device/index.vue  |  4 ++--
 src/views/standard/test/index.vue    |  1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index b02215f..bf5ee03 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -535,7 +535,10 @@
               </el-form-item>
               <el-form-item
                 label="设置答案："
-                v-show="questionForm.questionType != 5"
+                v-show="
+                  questionForm.questionType != 5 ||
+                  questionForm.questionType == 6
+                "
               >
                 <div class="qs-options">
                   <p class="ipt">
@@ -1840,8 +1843,8 @@ export default {
         this.subjectList =
           data.subjectNames?.map((item) => {
             return {
-              value: this.role == "ROLE_PERSONAL" ?item.subjectName: item ,
-              label: this.role == "ROLE_PERSONAL" ?item.subjectName: item ,
+              value: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
+              label: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
             };
           }) || [];
         if (this.subjectList.length) {
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 8202620..12e2f8c 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -76,7 +76,7 @@
       </div>
     </div>
     <p class="tips" v-show="archivedTotal">
-      <span>另有{{ archivedTotal }}份已经归档的答题卡,</span>
+      <span>回收站内已有{{ archivedTotal }}份答题卡,</span>
       <router-link to="/examinationPaperRecycle">点击查看&gt;&gt;</router-link>
     </p>
     <ul class="content" v-if="tableData && tableData.length">
@@ -154,7 +154,7 @@
                 >修改分享范围</el-dropdown-item
               >
               <el-dropdown-item :command="2">复制</el-dropdown-item>
-              <el-dropdown-item :command="3">归档</el-dropdown-item>
+              <el-dropdown-item :command="3">放入回收站</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
diff --git a/src/views/layout/Footer/bottom.vue b/src/views/layout/Footer/bottom.vue
index 7b281aa..8cd2250 100644
--- a/src/views/layout/Footer/bottom.vue
+++ b/src/views/layout/Footer/bottom.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p>Copyright © 2022 guoke</p>
+    <p>Copyright © 2022 SunVote</p>
   </div>
 </template>
 
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index a5438ff..b735ecf 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -264,11 +264,11 @@
                 label="配对码"
                 align="center"
               ></el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 prop="answerTimes"
                 label="答题次数"
                 align="center"
-              ></el-table-column>
+              ></el-table-column> -->
               <el-table-column
                 prop="latestReportTime"
                 label="最后答题时间"
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index c2a9617..61a7dae 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -526,6 +526,7 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
       await that._QueryClassList();
       await that._QuerySubjectList();
       await that.setDate(1);
--
libgit2 0.21.4