From 7be21664ee72c69c9ed54898ae20361e15bdbfa4 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 7 Feb 2023 17:06:44 +0800
Subject: [PATCH] 跳转旧系统

---
 src/api/urls/login.js               |  2 +-
 src/components/setAnswer.vue        |  3 ++-
 src/views/examinationPaper/add.vue  |  5 +++--
 src/views/examinationPaper/edit.vue |  3 ++-
 src/views/layout/header/header.vue  | 10 +++++++---
 src/views/test/editAnswer.vue       |  3 ++-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/api/urls/login.js b/src/api/urls/login.js
index 370dade..2fa85a5 100644
--- a/src/api/urls/login.js
+++ b/src/api/urls/login.js
@@ -4,5 +4,5 @@ export default {
   login: "/web/login",
   ssoLogin: "/sso/login",
   logout: "/api_html/logout",
-  linkOld: "/api_html/linkOld"
+  linkOld: "/api_html/teaching/getLoginUrl"
 }
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index cff530a..f6b43c9 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -183,6 +183,7 @@ export default {
       FormQuestionList: [],
       formAns: {
         endIndex: 0, //相同题目最后一位题目的questionIndex
+        index:0,
         qusType: "", //题目类型
         subNum: 0, //数量
         answerOptions: [], //答案选项
@@ -260,7 +261,7 @@ export default {
     setFormAns(indexs) {
       //初始化要修改的答案
       this.formAns = { ...this.FormQuestionList[indexs] };
-      let startIndex = this.formAns.endIndex - this.formAns.subNum;
+      let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
       let answerList = "";
       this.FormQuestionList[index].map((item, subIdx) => {
         if (subIdx >= startIndex) {
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 835b933..febdbc1 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -321,7 +321,7 @@
                       >{{ option }}</span
                     >
                   </p>
-                  <p class="answer-box">
+                  <p v-if="subQuestions.questionType == 3||subQuestions.questionType == 2"  class="answer-box">
                     <el-button
                       size="mini"
                       type="primary"
@@ -921,6 +921,7 @@ export default {
       formAns: {
         listIndex: 0, //大题位置
         endIndex: 0, //相同题目最后一位题目的questionIndex
+        index:0,//相同题目最后一位题目的位置
         qusType: "", //题目类型
         subNum: 0, //数量
         answerOptions: [], //答案选项
@@ -1058,7 +1059,7 @@ export default {
       //初始化要修改的答案
       this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
       this.formAns.listIndex = index;
-      let startIndex = this.formAns.endIndex - this.formAns.subNum;
+      let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
       this.formAns.answerList = [];
       let answerList = "";
       this.form.questionList[index].subQuestions.map((item, subIdx) => {
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 73c106c..f5ef808 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -355,6 +355,7 @@ export default {
       formAns: {
         listIndex: 0, //大题位置
         endIndex: 0, //相同题目最后一位题目的questionIndex
+        index:0,
         qusType: "", //题目类型
         subNum: 0, //数量
         answerOptions: [], //答案选项
@@ -530,7 +531,7 @@ export default {
         this.formAns = { ...this.questionList[index].subQuestions[indexs] };
         this.formAns.listIndex = index;
         let answerList = "";
-        let startIndex = this.formAns.endIndex - this.formAns.subNum;
+        let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
         this.questionList[index].subQuestions.map((item, subIdx) => {
           if (subIdx >= startIndex) {
             answerList += this.setAnswer(item.questionType, item.correctAnswer);
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index a7dea28..997e149 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -43,7 +43,7 @@
             ><i class="el-icon el-icon-full-screen"></i
           ></el-tooltip>
         </li>
-        <li v-if="code">
+        <li v-if="(role = 'ROLE_BANZHUREN' || role == 'ROLE_JIAOSHI') && code">
           <el-tooltip
             class="item"
             effect="dark"
@@ -84,6 +84,7 @@ export default {
   data() {
     return {
       code: "",
+      role: "",
       isfullScreen: true,
       avatar: require("@/assets/images/womandefault.png"),
       dialogInfoVisible: false,
@@ -95,14 +96,17 @@ export default {
   },
   created() {
     this.code = localStorage.getItem("csCode") || "";
+    this.role = this.$store.getters.info.permissions.find(
+      (item) => item.roleName == this.$store.getters.info.showRoleName
+    )?.role;
     this.isCollapse = this.$store.getters.isCollapse;
   },
   methods: {
     _LinkOld: _.throttle(
       async function () {
-        const { data, status, info } = await this.$request.logout();
+        const { data, status, info } = await this.$request.linkOld();
         if (status == 0) {
-          window.location.href = data;
+          window.location.href = data.url;
         } else {
           this.$message.error(info);
         }
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
index 7ad1f81..59bc10b 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/test/editAnswer.vue
@@ -340,6 +340,7 @@ export default {
       formAns: {
         listIndex: 0, //大题位置
         endIndex: 0, //相同题目最后一位题目的questionIndex
+        index:0,
         qusType: "", //题目类型
         subNum: 0, //数量
         answerOptions: [], //答案选项
@@ -517,7 +518,7 @@ export default {
       if (this.questionList[0].subQuestions) {
         this.formAns = { ...this.questionList[index].subQuestions[indexs] };
         this.formAns.listIndex = index;
-        let startIndex = this.formAns.endIndex - this.formAns.subNum;
+         let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
         let answerList = "";
         this.questionList[index].subQuestions.map((item, subIdx) => {
           if (subIdx >= startIndex) {
--
libgit2 0.21.4