Commit 7be21664ee72c69c9ed54898ae20361e15bdbfa4
1 parent
b2d3d803
跳转旧系统
Showing
6 changed files
with
17 additions
and
9 deletions
src/api/urls/login.js
@@ -4,5 +4,5 @@ export default { | @@ -4,5 +4,5 @@ export default { | ||
4 | login: "/web/login", | 4 | login: "/web/login", |
5 | ssoLogin: "/sso/login", | 5 | ssoLogin: "/sso/login", |
6 | logout: "/api_html/logout", | 6 | logout: "/api_html/logout", |
7 | - linkOld: "/api_html/linkOld" | 7 | + linkOld: "/api_html/teaching/getLoginUrl" |
8 | } | 8 | } |
src/components/setAnswer.vue
@@ -183,6 +183,7 @@ export default { | @@ -183,6 +183,7 @@ export default { | ||
183 | FormQuestionList: [], | 183 | FormQuestionList: [], |
184 | formAns: { | 184 | formAns: { |
185 | endIndex: 0, //相同题目最后一位题目的questionIndex | 185 | endIndex: 0, //相同题目最后一位题目的questionIndex |
186 | + index:0, | ||
186 | qusType: "", //题目类型 | 187 | qusType: "", //题目类型 |
187 | subNum: 0, //数量 | 188 | subNum: 0, //数量 |
188 | answerOptions: [], //答案选项 | 189 | answerOptions: [], //答案选项 |
@@ -260,7 +261,7 @@ export default { | @@ -260,7 +261,7 @@ export default { | ||
260 | setFormAns(indexs) { | 261 | setFormAns(indexs) { |
261 | //初始化要修改的答案 | 262 | //初始化要修改的答案 |
262 | this.formAns = { ...this.FormQuestionList[indexs] }; | 263 | this.formAns = { ...this.FormQuestionList[indexs] }; |
263 | - let startIndex = this.formAns.endIndex - this.formAns.subNum; | 264 | + let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置 |
264 | let answerList = ""; | 265 | let answerList = ""; |
265 | this.FormQuestionList[index].map((item, subIdx) => { | 266 | this.FormQuestionList[index].map((item, subIdx) => { |
266 | if (subIdx >= startIndex) { | 267 | if (subIdx >= startIndex) { |
src/views/examinationPaper/add.vue
@@ -321,7 +321,7 @@ | @@ -321,7 +321,7 @@ | ||
321 | >{{ option }}</span | 321 | >{{ option }}</span |
322 | > | 322 | > |
323 | </p> | 323 | </p> |
324 | - <p class="answer-box"> | 324 | + <p v-if="subQuestions.questionType == 3||subQuestions.questionType == 2" class="answer-box"> |
325 | <el-button | 325 | <el-button |
326 | size="mini" | 326 | size="mini" |
327 | type="primary" | 327 | type="primary" |
@@ -921,6 +921,7 @@ export default { | @@ -921,6 +921,7 @@ export default { | ||
921 | formAns: { | 921 | formAns: { |
922 | listIndex: 0, //大题位置 | 922 | listIndex: 0, //大题位置 |
923 | endIndex: 0, //相同题目最后一位题目的questionIndex | 923 | endIndex: 0, //相同题目最后一位题目的questionIndex |
924 | + index:0,//相同题目最后一位题目的位置 | ||
924 | qusType: "", //题目类型 | 925 | qusType: "", //题目类型 |
925 | subNum: 0, //数量 | 926 | subNum: 0, //数量 |
926 | answerOptions: [], //答案选项 | 927 | answerOptions: [], //答案选项 |
@@ -1058,7 +1059,7 @@ export default { | @@ -1058,7 +1059,7 @@ export default { | ||
1058 | //初始化要修改的答案 | 1059 | //初始化要修改的答案 |
1059 | this.formAns = { ...this.form.questionList[index].subQuestions[indexs] }; | 1060 | this.formAns = { ...this.form.questionList[index].subQuestions[indexs] }; |
1060 | this.formAns.listIndex = index; | 1061 | this.formAns.listIndex = index; |
1061 | - let startIndex = this.formAns.endIndex - this.formAns.subNum; | 1062 | + let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置 |
1062 | this.formAns.answerList = []; | 1063 | this.formAns.answerList = []; |
1063 | let answerList = ""; | 1064 | let answerList = ""; |
1064 | this.form.questionList[index].subQuestions.map((item, subIdx) => { | 1065 | this.form.questionList[index].subQuestions.map((item, subIdx) => { |
src/views/examinationPaper/edit.vue
@@ -355,6 +355,7 @@ export default { | @@ -355,6 +355,7 @@ export default { | ||
355 | formAns: { | 355 | formAns: { |
356 | listIndex: 0, //大题位置 | 356 | listIndex: 0, //大题位置 |
357 | endIndex: 0, //相同题目最后一位题目的questionIndex | 357 | endIndex: 0, //相同题目最后一位题目的questionIndex |
358 | + index:0, | ||
358 | qusType: "", //题目类型 | 359 | qusType: "", //题目类型 |
359 | subNum: 0, //数量 | 360 | subNum: 0, //数量 |
360 | answerOptions: [], //答案选项 | 361 | answerOptions: [], //答案选项 |
@@ -530,7 +531,7 @@ export default { | @@ -530,7 +531,7 @@ export default { | ||
530 | this.formAns = { ...this.questionList[index].subQuestions[indexs] }; | 531 | this.formAns = { ...this.questionList[index].subQuestions[indexs] }; |
531 | this.formAns.listIndex = index; | 532 | this.formAns.listIndex = index; |
532 | let answerList = ""; | 533 | let answerList = ""; |
533 | - let startIndex = this.formAns.endIndex - this.formAns.subNum; | 534 | + let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置 |
534 | this.questionList[index].subQuestions.map((item, subIdx) => { | 535 | this.questionList[index].subQuestions.map((item, subIdx) => { |
535 | if (subIdx >= startIndex) { | 536 | if (subIdx >= startIndex) { |
536 | answerList += this.setAnswer(item.questionType, item.correctAnswer); | 537 | answerList += this.setAnswer(item.questionType, item.correctAnswer); |
src/views/layout/header/header.vue
@@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
43 | ><i class="el-icon el-icon-full-screen"></i | 43 | ><i class="el-icon el-icon-full-screen"></i |
44 | ></el-tooltip> | 44 | ></el-tooltip> |
45 | </li> | 45 | </li> |
46 | - <li v-if="code"> | 46 | + <li v-if="(role = 'ROLE_BANZHUREN' || role == 'ROLE_JIAOSHI') && code"> |
47 | <el-tooltip | 47 | <el-tooltip |
48 | class="item" | 48 | class="item" |
49 | effect="dark" | 49 | effect="dark" |
@@ -84,6 +84,7 @@ export default { | @@ -84,6 +84,7 @@ export default { | ||
84 | data() { | 84 | data() { |
85 | return { | 85 | return { |
86 | code: "", | 86 | code: "", |
87 | + role: "", | ||
87 | isfullScreen: true, | 88 | isfullScreen: true, |
88 | avatar: require("@/assets/images/womandefault.png"), | 89 | avatar: require("@/assets/images/womandefault.png"), |
89 | dialogInfoVisible: false, | 90 | dialogInfoVisible: false, |
@@ -95,14 +96,17 @@ export default { | @@ -95,14 +96,17 @@ export default { | ||
95 | }, | 96 | }, |
96 | created() { | 97 | created() { |
97 | this.code = localStorage.getItem("csCode") || ""; | 98 | this.code = localStorage.getItem("csCode") || ""; |
99 | + this.role = this.$store.getters.info.permissions.find( | ||
100 | + (item) => item.roleName == this.$store.getters.info.showRoleName | ||
101 | + )?.role; | ||
98 | this.isCollapse = this.$store.getters.isCollapse; | 102 | this.isCollapse = this.$store.getters.isCollapse; |
99 | }, | 103 | }, |
100 | methods: { | 104 | methods: { |
101 | _LinkOld: _.throttle( | 105 | _LinkOld: _.throttle( |
102 | async function () { | 106 | async function () { |
103 | - const { data, status, info } = await this.$request.logout(); | 107 | + const { data, status, info } = await this.$request.linkOld(); |
104 | if (status == 0) { | 108 | if (status == 0) { |
105 | - window.location.href = data; | 109 | + window.location.href = data.url; |
106 | } else { | 110 | } else { |
107 | this.$message.error(info); | 111 | this.$message.error(info); |
108 | } | 112 | } |
src/views/test/editAnswer.vue
@@ -340,6 +340,7 @@ export default { | @@ -340,6 +340,7 @@ export default { | ||
340 | formAns: { | 340 | formAns: { |
341 | listIndex: 0, //大题位置 | 341 | listIndex: 0, //大题位置 |
342 | endIndex: 0, //相同题目最后一位题目的questionIndex | 342 | endIndex: 0, //相同题目最后一位题目的questionIndex |
343 | + index:0, | ||
343 | qusType: "", //题目类型 | 344 | qusType: "", //题目类型 |
344 | subNum: 0, //数量 | 345 | subNum: 0, //数量 |
345 | answerOptions: [], //答案选项 | 346 | answerOptions: [], //答案选项 |
@@ -517,7 +518,7 @@ export default { | @@ -517,7 +518,7 @@ export default { | ||
517 | if (this.questionList[0].subQuestions) { | 518 | if (this.questionList[0].subQuestions) { |
518 | this.formAns = { ...this.questionList[index].subQuestions[indexs] }; | 519 | this.formAns = { ...this.questionList[index].subQuestions[indexs] }; |
519 | this.formAns.listIndex = index; | 520 | this.formAns.listIndex = index; |
520 | - let startIndex = this.formAns.endIndex - this.formAns.subNum; | 521 | + let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置 |
521 | let answerList = ""; | 522 | let answerList = ""; |
522 | this.questionList[index].subQuestions.map((item, subIdx) => { | 523 | this.questionList[index].subQuestions.map((item, subIdx) => { |
523 | if (subIdx >= startIndex) { | 524 | if (subIdx >= startIndex) { |