From 2601028c19f9a0688c26110460425b8823d4e8c9 Mon Sep 17 00:00:00 2001 From: Yuan Date: Thu, 20 Oct 2022 18:17:39 +0800 Subject: [PATCH] =?UTF-8?q?WIP:=20=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/exam.js | 29 + src/scripts/ConstConfig.js | 4 +- src/utils/baseUrl.js | 4 +- src/views/newMap/display/exam/examPanel.vue | 39 + src/views/newMap/display/exam/selectExam.vue | 107 + src/views/newMap/display/simulationMenu.vue | 2040 +++++++++-------- src/views/organization/examManage/index.vue | 9 +- src/views/publish/examRule/draft/editRule.vue | 7 +- 8 files changed, 1327 insertions(+), 912 deletions(-) create mode 100644 src/views/newMap/display/exam/examPanel.vue create mode 100644 src/views/newMap/display/exam/selectExam.vue diff --git a/src/api/management/exam.js b/src/api/management/exam.js index 97cee7e97..6fb8b5c3a 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -244,3 +244,32 @@ export function deletePaper(pcId) { method: 'DELETE', }) } + +/** 根据试卷蓝图生成用户的试卷 + * @param {Number} pcId 试卷蓝图Id + */ +export function generateExam(pcId) { + return request({ + url: `/api/v2/paper/${pcId}`, + method: 'POST', + }) +} + +/** 删除用户试卷 */ +export function deleteUserExam(param) { + return request({ + url: `/api/v2/paper/user/${puId}`, + method: 'method', + + }) +} + +/** 获取用户试卷完整信息 + * @param {Number} pcId 用户试卷Id + */ +export function getUserExamInfo(puId) { + return request({ + url: `/api/v2/paper/user/${puId}`, + method: 'GET', + }) +} diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 41875087f..0fc62b905 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -293,6 +293,8 @@ export default { { label: '列车', value: 'Train' }, { label: '自动闭塞', value: 'StationDirectionAuto' }, { label: '半自动闭塞', value: 'StationDirectionSemi' } - ] + ], + paperStateArr: ['正在编辑', '封存', '已使用'], //试卷定义状态 + paperStateQueryArr: ['所有', '正在编辑', '可生成试卷', '封存', '已被使用'], //试卷定义查询状态 } }; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 0929e8877..5317762c9 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,13 +23,13 @@ export function handlerUrl() { let OSS_URL; if (process.env.NODE_ENV === 'development') { // 开发分支 - // BASE_API = 'http://192.168.3.233/rtss-server'; + BASE_API = 'http://192.168.3.233/rtss-server'; // 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.94:9000'; // 旭强 - BASE_API = 'http://192.168.3.15:9000'; // 张赛 + // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue new file mode 100644 index 000000000..12fca05e2 --- /dev/null +++ b/src/views/newMap/display/exam/examPanel.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/views/newMap/display/exam/selectExam.vue b/src/views/newMap/display/exam/selectExam.vue new file mode 100644 index 000000000..1a320731a --- /dev/null +++ b/src/views/newMap/display/exam/selectExam.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/newMap/display/simulationMenu.vue b/src/views/newMap/display/simulationMenu.vue index 6b40b57aa..c91154903 100644 --- a/src/views/newMap/display/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu.vue @@ -1,921 +1,1157 @@ diff --git a/src/views/organization/examManage/index.vue b/src/views/organization/examManage/index.vue index 8162ee98f..615cdc3f5 100644 --- a/src/views/organization/examManage/index.vue +++ b/src/views/organization/examManage/index.vue @@ -11,11 +11,12 @@