From 2e492ad27f906cea23a79dedbda89d750570e78a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 24 Oct 2022 10:41:36 +0800 Subject: [PATCH 1/7] =?UTF-8?q?CCTV=E5=8E=BB=E6=8E=89=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jlmap3d/passflow/jl3dpassflow.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue index fd338bbd8..539a3f527 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -41,7 +41,7 @@
- 返回 +
@@ -286,7 +286,7 @@ export default { position: absolute; top: 0; left: 0; - z-index: 10; + /* z-index: 10; */ } .jl3ddraw1 { position: absolute; From 44fcdee7cf8ae5eb91e3605573fc2e4f9ecaff6a Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 21 Oct 2022 11:13:51 +0800 Subject: [PATCH 2/7] =?UTF-8?q?WIP:=E8=80=83=E8=AF=95=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/exam/examPanel.vue | 51 +++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue index 12fca05e2..fa48173c2 100644 --- a/src/views/newMap/display/exam/examPanel.vue +++ b/src/views/newMap/display/exam/examPanel.vue @@ -4,7 +4,20 @@
满分: {{ composition.fullScore }}
考试时间: {{ composition.validDuration }}分钟
-
+
+
+ {{ index + 1 }} +
+
+
+ 交卷 +
@@ -16,14 +29,27 @@ export default { composition: {}, paper: {}, questionList: {}, + currentQuestionIndex: -1, } }, methods: { init(data) { + this.currentQuestionIndex = -1 this.composition = data.composition this.paper = data.paper - this.questionList = data.questionList + this.questionList = [ + ...data.questionList, + ...data.questionList, + ...data.questionList, + ...data.questionList, + ...data.questionList, + ...data.questionList, + ...data.questionList, + ...data.questionList, + ] }, + questionSelect(data) {}, + submitExam() {}, }, } @@ -31,9 +57,28 @@ export default { From 0fe83a4f3176ca8a116fec44fe0f752441011e54 Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 24 Oct 2022 13:11:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=80=83=E8=AF=95-=E7=90=86=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/exam.js | 42 +- src/utils/baseUrl.js | 2 +- .../bankList/previewAnswer.vue | 2 +- src/views/newMap/display/exam/examPanel.vue | 136 +- src/views/newMap/display/exam/selectExam.vue | 1 + .../newMap/display/exam/theoryQuestion.vue | 151 ++ src/views/newMap/display/simulationMenu.vue | 2066 ++++++++--------- 7 files changed, 1265 insertions(+), 1135 deletions(-) create mode 100644 src/views/newMap/display/exam/theoryQuestion.vue diff --git a/src/api/management/exam.js b/src/api/management/exam.js index 6fb8b5c3a..3673c3509 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -124,11 +124,12 @@ export function regenerateRule(mapId) { /** * LIST - * 根据试卷蓝图名称简介分页查找某个组织的试卷蓝图 - * @param {Number} orgId 组织ID - * @param {String} name 试卷蓝图名称 - * @param {String} profile 试卷蓝图简介 - * @param {Number} findState 状态: (All(1)-所有,Editing(2)-正在编辑的,CanUse(3)-可以用于生成试卷的,Locked(4)-封存,Used(5)-已经被使用过) - * @param {Number} orderBy 排序依据: (1--创建时间 2--更新时间 3--名称；默认值为1) + * @param {Object} data + * @param {Number} data.orgId 组织ID + * @param {String} data.name 试卷蓝图名称 + * @param {String} data.profile 试卷蓝图简介 + * @param {Number} data.findState 状态: (All(1)-所有,Editing(2)-正在编辑的,CanUse(3)-可以用于生成试卷的,Locked(4)-封存,Used(5)-已经被使用过) + * @param {Number} data.orderBy 排序依据: (1--创建时间 2--更新时间 3--名称；默认值为1) */ export function getPapaerListOfOrg({ orgId, ...data }) { return request({ @@ -140,6 +141,7 @@ export function getPapaerListOfOrg({ orgId, ...data }) { /** * 创建试卷蓝图 + * @param {Object} data * @param {Number} data.orgId 组织ID * @param {String} data.name 试卷蓝图名称 * @param {String} data.profile 简介 @@ -166,6 +168,7 @@ export function createPaper(data) { } /** 修改试卷蓝图基本信息 + * @param {Object} data * @param {Number} data.id 试卷蓝图ID * @param {Number} data.orgId 组织ID * @param {String} data.name 试卷蓝图名称 @@ -203,6 +206,7 @@ export function getPaperDetail(pcId) { } /** 查询组织下各类型题的数量 + * @param {Object} data * @param {Number} data.orgId * @param {Number} data.subtype * @param {Array} data.tags @@ -260,12 +264,11 @@ export function deleteUserExam(param) { return request({ url: `/api/v2/paper/user/${puId}`, method: 'method', - }) } /** 获取用户试卷完整信息 - * @param {Number} pcId 用户试卷Id + * @param {Number} puId 用户试卷Id */ export function getUserExamInfo(puId) { return request({ @@ -273,3 +276,28 @@ export function getUserExamInfo(puId) { method: 'GET', }) } + +/** 加载用户试卷试题 */ +export function loadQuestion({ type, questionId, puId }) { + return request({ + url: `/api/v2/paper/user/question/${type}/${questionId}/${puId}`, + method: 'GET', + }) +} + +/** 提交答案 + * @param {Object} data + * @param {Number} data.puId 用户试卷id + * @param {Number} data.pqId 用户试卷试题id + * @param {Number} data.type 试题类型 + * @param {Number} data.subType 试题子类型 + * @param {Number} data.answer 答案(理论题) + * @param {Boolean} data.trainingSuccess 是否完成(实训题) + */ +export function submitAnswer(data) { + return request({ + url: `/api/v2/paper/user/question/answer`, + method: 'POST', + data, + }) +} diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 5317762c9..f84210e59 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -27,7 +27,7 @@ export function handlerUrl() { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; - // BASE_API = 'http://192.168.3.90:9100'; // 周寅 + // BASE_API = 'http://192.168.3.90:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 diff --git a/src/views/competitionManage/bankList/previewAnswer.vue b/src/views/competitionManage/bankList/previewAnswer.vue index f2c43ccb4..a840e5821 100644 --- a/src/views/competitionManage/bankList/previewAnswer.vue +++ b/src/views/competitionManage/bankList/previewAnswer.vue @@ -1,5 +1,5 @@