From b2d3d803cf64e5fae6bd4756bade1dd832109764 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 7 Feb 2023 14:25:26 +0800
Subject: [PATCH] 批量设置答案优化

---
 src/api/apis/login.js               |  6 ++++++
 src/api/urls/login.js               |  3 ++-
 src/components/setAnswer.vue        |  2 +-
 src/views/ask/index.vue             |  9 ++-------
 src/views/examinationPaper/add.vue  |  7 ++++---
 src/views/examinationPaper/edit.vue |  2 +-
 src/views/layout/header/header.vue  | 43 +++++++++++++++++++++++++++++++------------
 src/views/test/editAnswer.vue       |  2 +-
 8 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/api/apis/login.js b/src/api/apis/login.js
index c806b1c..19387ed 100644
--- a/src/api/apis/login.js
+++ b/src/api/apis/login.js
@@ -25,4 +25,10 @@ export default {
       data
     })
   },
+  linkOld() {
+    return service({
+      url: loginUrls.linkOld,
+      method: 'POST',
+    })
+  },
 }
diff --git a/src/api/urls/login.js b/src/api/urls/login.js
index 5710a7c..370dade 100644
--- a/src/api/urls/login.js
+++ b/src/api/urls/login.js
@@ -3,5 +3,6 @@ export default {
   // 账号密码登陆
   login: "/web/login",
   ssoLogin: "/sso/login",
-  logout: "/api_html/logout"
+  logout: "/api_html/logout",
+  linkOld: "/api_html/linkOld"
 }
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 9a13412..cff530a 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -420,7 +420,7 @@ export default {
         str,
         3,
         obj.answerOptions.split(",").length,
-        obj.answerList.length
+        obj.subNum
       );
       obj.answerList = str2;
       this.$refs.formAnsIpt.$el.children[0].focus();
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 8bc4602..9452a75 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -471,7 +471,7 @@
 
 <script>
 import { formatDate, deepClone, downloadFile } from "utils";
-import BusEvent  from "@/utils/busEvent";
+import BusEvent from "@/utils/busEvent";
 export default {
   data() {
     return {
@@ -977,12 +977,7 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile(
-          this.tabIndex == 2
-            ? "随堂问-阶段问答报表.xlsx"
-            : "随堂问-阶段互动报表.xlsx",
-          blob
-        );
+        downloadFile("随堂问-阶段报表.xlsx", blob);
       } else {
         this.$message.error("下载失败");
       }
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 3326821..835b933 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -1106,7 +1106,6 @@ export default {
         answer
       );
       obj.answerList = resault.text;
-      console.log(resault.startPos);
       let str = obj.answerList;
       let str2;
       if (!!obj.answerOptions) {
@@ -1114,10 +1113,10 @@ export default {
           str,
           3,
           obj.answerOptions.split(",").length,
-          obj.answerList.length
+          obj.subNum
         );
       } else {
-        str2 = checkAnswer(str, 3, obj.selectNum, obj.answerList.length);
+        str2 = checkAnswer(str, 3, obj.selectNum, obj.number);
       }
       obj.answerList = str2;
       elements.focus();
@@ -1501,6 +1500,7 @@ export default {
       subQuestions.answerOptions = this.rightOptions
         .slice(0, subQuestions.selectNum)
         .join(",");
+      subQuestions.correctAnswer = subQuestions.correctAnswer.slice(0, subQuestions.selectNum)
     },
     changAnswer(sub, option) {
       //设置多选答案
@@ -1690,6 +1690,7 @@ export default {
           return {
             questionTitle: item.questionTitle,
             subQuestions: subQuestions,
+            show:false
           };
         });
       } else {
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 447acf4..73c106c 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -518,7 +518,7 @@ export default {
         str,
         3,
         obj.answerOptions.split(",").length,
-        obj.answerList.length
+        obj.subNum
       );
       obj.answerList = str2;
       this.$refs.formAnsIpt.$el.children[0].focus();
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index 4db5ee1..a7dea28 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -40,7 +40,17 @@
             effect="dark"
             content="全屏"
             placement="bottom"
-            ><i class="el-icon-rank"></i
+            ><i class="el-icon el-icon-full-screen"></i
+          ></el-tooltip>
+        </li>
+        <li v-if="code">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="老平台入口"
+            placement="bottom"
+          >
+            <i @click="_LinkOld" class="el-icon el-icon-guide"></i
           ></el-tooltip>
         </li>
         <li>
@@ -50,7 +60,7 @@
             content="退出"
             placement="bottom"
           >
-            <i @click="logOut" class="el-icon-switch-button"></i
+            <i @click="logOut" class="el-icon el-icon-switch-button"></i
           ></el-tooltip>
         </li>
       </ul>
@@ -62,7 +72,7 @@
 <script>
 import langSelect from "../../../components/lang/langSelect";
 import tabNav from "./tabNav";
-
+import _ from "lodash";
 export default {
   name: "Header",
   components: { tabNav, langSelect },
@@ -73,6 +83,7 @@ export default {
   },
   data() {
     return {
+      code: "",
       isfullScreen: true,
       avatar: require("@/assets/images/womandefault.png"),
       dialogInfoVisible: false,
@@ -83,9 +94,22 @@ export default {
     };
   },
   created() {
+    this.code = localStorage.getItem("csCode") || "";
     this.isCollapse = this.$store.getters.isCollapse;
   },
   methods: {
+    _LinkOld: _.throttle(
+      async function () {
+        const { data, status, info } = await this.$request.logout();
+        if (status == 0) {
+          window.location.href = data;
+        } else {
+          this.$message.error(info);
+        }
+      },
+      2000,
+      { leading: true, trailing: false }
+    ),
     collapse() {
       this.isCollapse = !this.isCollapse;
       this.$store.dispatch("collapse");
@@ -127,7 +151,7 @@ export default {
       this.$store.dispatch("permissions", command);
     },
     async logOut() {
-      const { data, status } = await this.$request.logout();
+      const { data, status, info } = await this.$request.logout();
       if (status == 0) {
         if (data) {
           window.location.href = data;
@@ -139,10 +163,10 @@ export default {
           this.$router.push({
             path: "/login",
           });
-          window.location.reload()
+          window.location.reload();
         }
       } else {
-        this.$message.error(message);
+        this.$message.error(info);
       }
     },
   },
@@ -230,13 +254,8 @@ ul.el-menu {
       height: 28px;
     }
   }
-  .el-icon-rank {
+  .el-icon {
     font-size: 20px;
-    transform: rotate(45deg);
-    line-height: 50px;
-  }
-  .el-icon-switch-button {
-    font-size: 18px;
     line-height: 50px;
   }
   .fa-lg {
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
index a804892..7ad1f81 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/test/editAnswer.vue
@@ -495,7 +495,7 @@ export default {
         str,
         3,
         obj.answerOptions.split(",").length,
-        obj.answerList.length
+        obj.subNum
       );
       obj.answerList = str2;
       this.$refs.formAnsIpt.$el.children[0].focus();
--
libgit2 0.21.4