From 791e02aaf7285124c1d0c95fc3a7ee15539fe4de Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 28 Oct 2020 10:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jointTraining.js | 378 +++---- src/api/project.js | 23 +- src/api/questionsRule.js | 28 +- src/api/race.js | 48 +- src/api/rpTools.js | 168 ++- src/api/runplan.js | 54 +- src/api/scheduling.js | 84 +- src/api/script.js | 75 +- src/api/simulation.js | 777 +++++++------- src/api/statistics.js | 162 +-- src/api/trainingPlatform.js | 25 +- .../components/menus/dialog/trainControl.vue | 9 - src/views/demonstration/detail/index.vue | 2 +- src/views/exam/detail/examDetail.vue | 4 +- src/views/lesson/trainingmanage/index.vue | 4 +- .../newMap/displayNew/demon/faultChoose.vue | 26 +- .../displayNew/dispatherContest/index.vue | 2 - .../planMonitor/editTool/menus/addTask.vue | 2 +- .../menus/modifyingStationIntervalTime.vue | 2 +- .../editTool/menus/modifyingTask.vue | 2 +- .../planMonitor/editToolAUS/tool/index.vue | 955 +++++++++--------- src/views/scriptManage/tipScriptRecord.vue | 1 - src/views/teach/detail/index.vue | 2 +- 23 files changed, 1401 insertions(+), 1432 deletions(-) diff --git a/src/api/jointTraining.js b/src/api/jointTraining.js index cdd75e3ed..722c3acc0 100644 --- a/src/api/jointTraining.js +++ b/src/api/jointTraining.js @@ -1,33 +1,33 @@ import request from '@/utils/request'; -// 文字聊天 发送文字 -export function chatWithTextNew(data, group) { - return request({ - url: `/api/v1/jointTraining/chatWithText?group=${group}`, - method: 'post', - data: { - message: data - } - }); -} +// // 文字聊天 发送文字 +// export function chatWithTextNew(data, group) { +// return request({ +// url: `/api/v1/jointTraining/chatWithText?group=${group}`, +// method: 'post', +// data: { +// message: data +// } +// }); +// } -// 生成分发二维码 -export function getJoinTrainCodeNew(data, group) { - return request({ - url: `/api/v1/jointTraining/qrCode?group=${group}`, - method: 'post', - data: data - }); -} +// // 生成分发二维码 +// export function getJoinTrainCodeNew(data, group) { +// return request({ +// url: `/api/v1/jointTraining/qrCode?group=${group}`, +// method: 'post', +// data: data +// }); +// } -// 创建房间 -export function postCreateRoomNew(data) { - return request({ - url: `/api/v1/jointTraining/room`, - method: 'post', - data: data - }); -} +// // 创建房间 +// export function postCreateRoomNew(data) { +// return request({ +// url: `/api/v1/jointTraining/room`, +// method: 'post', +// data: data +// }); +// } // 检查房间存在 export function checkRoomExistNew(params) { @@ -38,44 +38,44 @@ export function checkRoomExistNew(params) { }); } -// 获取房间详情 -export function postRoomDetailNew(group) { - return request({ - url: `/api/v1/jointTraining/room/${group}`, - method: 'get' - }); -} +// // 获取房间详情 +// export function postRoomDetailNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}`, +// method: 'get' +// }); +// } -// 销毁房间 -export function deljointTrainRoomNew(group) { - return request({ - url: `/api/v1/jointTraining/room`, - method: 'delete', - params: { - group: group - } - }); -} +// // 销毁房间 +// export function deljointTrainRoomNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room`, +// method: 'delete', +// params: { +// group: group +// } +// }); +// } -// 查询有权限房间列表 -export function getjointTrainListNew(params) { - return request({ - url: `/api/v1/jointTraining/room/list`, - method: 'get', - params: params - }); -} +// // 查询有权限房间列表 +// export function getjointTrainListNew(params) { +// return request({ +// url: `/api/v1/jointTraining/room/list`, +// method: 'get', +// params: params +// }); +// } -// 加入房间 -export function getjointTrainingNew(group) { - return request({ - url: `/api/v1/jointTraining/room/join`, - method: 'put', - params: { - group: group - } - }); -} +// // 加入房间 +// export function getjointTrainingNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/join`, +// method: 'put', +// params: { +// group: group +// } +// }); +// } // 设置人员角色 export function putUserRolesNew(data, group) { @@ -86,69 +86,69 @@ export function putUserRolesNew(data, group) { }); } -// 获取房间里的用户列表 -export function getJointTrainRoomUserListNew(group) { - return request({ - url: `/api/v1/jointTraining/room/${group}/user/list`, - method: 'get' - }); -} +// // 获取房间里的用户列表 +// export function getJointTrainRoomUserListNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}/user/list`, +// method: 'get' +// }); +// } -// 离开房间接口 -export function putJointTrainingExitNew(group) { - return request({ - url: `/api/v1/jointTraining/room/exit`, - method: 'put', - params: { - group: group - } - }); -} +// // 离开房间接口 +// export function putJointTrainingExitNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/exit`, +// method: 'put', +// params: { +// group: group +// } +// }); +// } -// 开始联合演练 -export function startJointTrainingNew(group) { - return request({ - url: `/api/v1/jointTraining/room/simulation`, - method: 'post', - params: { - group: group - } - }); -} +// // 开始联合演练 +// export function startJointTrainingNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/simulation`, +// method: 'post', +// params: { +// group: group +// } +// }); +// } -// 获取个人信息 -export function getUserRolesNew(group) { - return request({ - url: `/api/v1/jointTraining/room/user/role`, - method: 'get', - params: { - group: group - } - }); -} +// // 获取个人信息 +// export function getUserRolesNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/user/role`, +// method: 'get', +// params: { +// group: group +// } +// }); +// } -// 踢出用户 -export function putJointTrainingUserkickedNew(userId, group) { - return request({ - url: `/api/v1/jointTraining/room/user`, - method: 'put', - params: { - userId: userId, - group: group - } - }); -} +// // 踢出用户 +// export function putJointTrainingUserkickedNew(userId, group) { +// return request({ +// url: `/api/v1/jointTraining/room/user`, +// method: 'put', +// params: { +// userId: userId, +// group: group +// } +// }); +// } -// 管理员结束所有人的仿真 -export function putJointTrainingSimulationNew(group) { - return request({ - url: `/api/v1/jointTraining/room/simulation/all`, - method: 'put', - params: { - group: group - } - }); -} +// // 管理员结束所有人的仿真 +// export function putJointTrainingSimulationNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/simulation/all`, +// method: 'put', +// params: { +// group: group +// } +// }); +// } // 结束仿真返回房间 export function putJointTrainingSimulationUserNew(group) { @@ -161,81 +161,81 @@ export function putJointTrainingSimulationUserNew(group) { }); } -// 进入仿真 -export function putJointTrainingSimulationEntranceNew(group) { - return request({ - url: `/api/v1/jointTraining/room/simulation/user/entrance`, - method: 'put', - params: { - group: group - } - }); -} +// // 进入仿真 +// export function putJointTrainingSimulationEntranceNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/simulation/user/entrance`, +// method: 'put', +// params: { +// group: group +// } +// }); +// } -/** - * 权限获取(房间权限) - */ -export function getPermissionJointNew(group) { - return request({ - url: '/api/v1/jointTraining/qrCode', - method: 'get', - params: { - group: group - } - }); -} +// /** +// * 权限获取(房间权限) +// */ +// export function getPermissionJointNew(group) { +// return request({ +// url: '/api/v1/jointTraining/qrCode', +// method: 'get', +// params: { +// group: group +// } +// }); +// } -// 添加或更新真实设备和仿真对象连接 -export function setRealDeviceNew(group, data) { - return request({ - url: `/api/v1/jointTraining/room/realDevice?group=${group}`, - method: 'post', - data: data - }); -} +// // 添加或更新真实设备和仿真对象连接 +// export function setRealDeviceNew(group, data) { +// return request({ +// url: `/api/v1/jointTraining/room/realDevice?group=${group}`, +// method: 'post', +// data: data +// }); +// } -// 删除真实设备和仿真对象连接 -export function delRealDeviceNew(id, group) { - return request({ - url: `/api/v1/jointTraining/room/realDevice/${id}`, - method: 'delete', - params: { group: group } - }); -} +// // 删除真实设备和仿真对象连接 +// export function delRealDeviceNew(id, group) { +// return request({ +// url: `/api/v1/jointTraining/room/realDevice/${id}`, +// method: 'delete', +// params: { group: group } +// }); +// } -// 获取真实设备列表 -export function getRealDevicesNew(group) { - return request({ - url: `/api/v1/jointTraining/room/${group}/devices`, - method: 'get' - }); -} +// // 获取真实设备列表 +// export function getRealDevicesNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}/devices`, +// method: 'get' +// }); +// } -// 获取房间真实设备连接关系 -export function getRealDevicesInRoomNew(group) { - return request({ - url: `/api/v1/jointTraining/room/${group}/realDevice/connect`, - method: 'get' - }); -} +// // 获取房间真实设备连接关系 +// export function getRealDevicesInRoomNew(group) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}/realDevice/connect`, +// method: 'get' +// }); +// } -// 更新真实设备的连接关系 -export function updateRealDevicesNew(group, data) { - return request({ - url: `/api/v1/jointTraining/room/${group}/realDevice`, - method: 'put', - data: data - }); -} +// // 更新真实设备的连接关系 +// export function updateRealDevicesNew(group, data) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}/realDevice`, +// method: 'put', +// data: data +// }); +// } -// 真实设备是否被其他仿真使用 -export function realDeviceIsUsedNew(group, projectCode) { - return request({ - url: `/api/v1/jointTraining/room/${group}/realDeviceUsed`, - method: 'get', - params: { - projectCode: projectCode - } - }); -} +// // 真实设备是否被其他仿真使用 +// export function realDeviceIsUsedNew(group, projectCode) { +// return request({ +// url: `/api/v1/jointTraining/room/${group}/realDeviceUsed`, +// method: 'get', +// params: { +// projectCode: projectCode +// } +// }); +// } diff --git a/src/api/project.js b/src/api/project.js index 0d4dcf09c..0f13cf684 100644 --- a/src/api/project.js +++ b/src/api/project.js @@ -23,13 +23,6 @@ export function getProjectDeviceList(params) { params:params }); } -// export function getProjectDeviceList(params) { -// return request({ -// url: `/api/device/paging`, -// method: 'get', -// params:params -// }); -// } /** 删除项目设备 */ export function deleteProjectDevice(id) { return request({ @@ -92,14 +85,14 @@ export function setPscConfig(id, data) { data: data }); } -/** 查询项目下的所有设备 */ -export function getAllDeviceInProject(params) { - return request({ - url: `/api/project/device/project`, - method: 'get', - params - }); -} +// /** 查询项目下的所有设备 */ +// export function getAllDeviceInProject(params) { +// return request({ +// url: `/api/project/device/project`, +// method: 'get', +// params +// }); +// } /** 添加/修改ibp设备配置 */ export function setVrIbpConfig(id, data) { return request({ diff --git a/src/api/questionsRule.js b/src/api/questionsRule.js index a9d6668e7..b1e8e435e 100644 --- a/src/api/questionsRule.js +++ b/src/api/questionsRule.js @@ -1,12 +1,12 @@ import request from '@/utils/request'; -/** 获取出题规则列表 */ -export function getQuestionRuleList() { - return request({ - url: `/api/questionsRule`, - method: 'get' - }); -} +// /** 获取出题规则列表 */ +// export function getQuestionRuleList() { +// return request({ +// url: `/api/questionsRule`, +// method: 'get' +// }); +// } /** 添加出题规则 */ export function addQuestionRule(data) { return request({ @@ -30,13 +30,13 @@ export function deleteQuestionRule(id) { method: 'delete' }); } -/** 查询单个出题规则 */ -export function selectedQuestionRule(id) { - return request({ - url: `/api/questionsRule/${id}`, - method: 'get' - }); -} +// /** 查询单个出题规则 */ +// export function selectedQuestionRule(id) { +// return request({ +// url: `/api/questionsRule/${id}`, +// method: 'get' +// }); +// } /** 更改出题规则内容 */ export function updateQuestionRule(id, data) { return request({ diff --git a/src/api/race.js b/src/api/race.js index 246082afc..1e876a18c 100644 --- a/src/api/race.js +++ b/src/api/race.js @@ -1,29 +1,29 @@ import request from '@/utils/request'; -/** 分页查询竞赛 */ -export function getRaceList(params) { - return request({ - url: `/api/race`, - method: 'get', - params: params - }); -} -/** 创建竞赛 */ -export function createRace(data) { - return request({ - url: `/api/race`, - method: 'post', - data - }); -} -/** 修改竞赛信息 */ -export function updateRace(id, data) { - return request({ - url: `/api/race/${id}`, - method: 'put', - data - }); -} +// /** 分页查询竞赛 */ +// export function getRaceList(params) { +// return request({ +// url: `/api/race`, +// method: 'get', +// params: params +// }); +// } +// /** 创建竞赛 */ +// export function createRace(data) { +// return request({ +// url: `/api/race`, +// method: 'post', +// data +// }); +// } +// /** 修改竞赛信息 */ +// export function updateRace(id, data) { +// return request({ +// url: `/api/race/${id}`, +// method: 'put', +// data +// }); +// } // /** 获取实操试题列表（题库）*/ // export function getPracticeList(params) { diff --git a/src/api/rpTools.js b/src/api/rpTools.js index 87e249fd9..20ca735d2 100644 --- a/src/api/rpTools.js +++ b/src/api/rpTools.js @@ -4,52 +4,52 @@ import request from '@/utils/request'; * 查询运行图列表 */ export function listRps() { - return request({ - url: `/api/rpTools`, - method: 'get' - }) + return request({ + url: `/api/rpTools`, + method: 'get' + }); } /** * 创建运行图 */ export function createRp(data) { - return request({ - url: `/api/rpTools`, - method: 'post', - data - }) + return request({ + url: `/api/rpTools`, + method: 'post', + data + }); } /** * 删除运行图 */ export function deleteRp(planId) { - return request({ - url: `/api/rpTools/${planId}`, - method: 'delete' - }) + return request({ + url: `/api/rpTools/${planId}`, + method: 'delete' + }); } /** * 获取运行图配置 */ export function getRpConfig(planId) { - return request({ - url: `/api/rpTools/${planId}/config`, - method: 'get' - }) + return request({ + url: `/api/rpTools/${planId}/config`, + method: 'get' + }); } /** * 修改运行图配置 */ export function modifyRpConfig(planId, data) { - return request({ - url: `/api/rpTools/${planId}/config`, - method: 'put', - data - }) + return request({ + url: `/api/rpTools/${planId}/config`, + method: 'put', + data + }); } /** @@ -62,24 +62,24 @@ export function getRpTools(planId) { }); } -/** - * 清除运行图 - */ -export function clearRpPlan(planId) { - return request({ - url: `/api/rpTools/${planId}/clear`, - method: 'put' - }) -} +// /** +// * 清除运行图 +// */ +// export function clearRpPlan(planId) { +// return request({ +// url: `/api/rpTools/${planId}/clear`, +// method: 'put' +// }); +// } /** * 添加车次 */ export function addRpTrip(planId, data) { - return request({ + return request({ url: `/api/rpTools/${planId}/trip`, - method: 'post', - data + method: 'post', + data }); } @@ -87,106 +87,104 @@ export function addRpTrip(planId, data) { * 删除车次 */ export function delRpTrip(planId, tripNo) { - return request({ - url: `/api/rpTools/${planId}/${tripNo}/trip`, - method: 'delete' - }) + return request({ + url: `/api/rpTools/${planId}/${tripNo}/trip`, + method: 'delete' + }); } - /** * 平移服务 */ export function translateRpService(planId, serviceNo, data) { - return request({ - url: `/api/rpTools/${planId}/${serviceNo}/service`, - method: 'put', - data - }) + return request({ + url: `/api/rpTools/${planId}/${serviceNo}/service`, + method: 'put', + data + }); } /** * 删除服务 */ export function delRpService(planId, serviceNo) { - return request({ - url: `/api/rpTools/${planId}/${serviceNo}/service`, - method: 'delete' - }) + return request({ + url: `/api/rpTools/${planId}/${serviceNo}/service`, + method: 'delete' + }); } - /** * 添加区域 */ export function createRpArea(planId, data) { - return request({ - url: `/api/rpTools/${planId}/area`, - method: 'post', - data - }) + return request({ + url: `/api/rpTools/${planId}/area`, + method: 'post', + data + }); } /** * 修改区域 */ export function modifyRpArea(planId, areaNo, data) { - return request({ - url: `/api/rpTools/${planId}/${areaNo}/area`, - method: 'put', - data - }) + return request({ + url: `/api/rpTools/${planId}/${areaNo}/area`, + method: 'put', + data + }); } /** * 修改区域文字 */ -export function modifyAreaNote(planId,areaNo, data) { - return request({ - url: `/api/rpTools/${planId}/${areaNo}/text`, - method: 'put', - data - }) +export function modifyAreaNote(planId, areaNo, data) { + return request({ + url: `/api/rpTools/${planId}/${areaNo}/text`, + method: 'put', + data + }); } /** * 删除区域 */ export function delRpArea(planId, areaNo) { - return request({ - url: `/api/rpTools/${planId}/${areaNo}/area`, - method: 'delete' - }) + return request({ + url: `/api/rpTools/${planId}/${areaNo}/area`, + method: 'delete' + }); } /** * 修改运行时间 */ export function justTripNoRunning(planId, tripNo, data) { - return request({ - url: `/api/rpTools/${planId}/${tripNo}/running`, - method: 'put', - data - }) + return request({ + url: `/api/rpTools/${planId}/${tripNo}/running`, + method: 'put', + data + }); } /** * 修改停站时间 */ export function justTripNoStop(planId, tripNo, data) { - return request({ - url: `/api/rpTools/${planId}/${tripNo}/stop`, - method: 'put', - data - }) + return request({ + url: `/api/rpTools/${planId}/${tripNo}/stop`, + method: 'put', + data + }); } /** * 修改折返时间 */ -export function justTripTurnBack(planId, tripNo, data) { - return request({ - url: `/api/rpTools/${planId}/${tripNo}/turnBack`, - method: 'put', - data - }) +export function justTripTurnBack(planId, tripNo, data) { + return request({ + url: `/api/rpTools/${planId}/${tripNo}/turnBack`, + method: 'put', + data + }); } diff --git a/src/api/runplan.js b/src/api/runplan.js index c5fe586f0..3dcf990ee 100644 --- a/src/api/runplan.js +++ b/src/api/runplan.js @@ -1,15 +1,15 @@ import request from '@/utils/request'; -/** - * 新建地图速度等级列表 - */ -export function newSpeedLevels(data) { - return request({ - url: '/api/runPlan/draft/speed', - method: 'post', - data: data - }); -} +// /** +// * 新建地图速度等级列表 +// */ +// export function newSpeedLevels(data) { +// return request({ +// url: '/api/runPlan/draft/speed', +// method: 'post', +// data: data +// }); +// } /** * 获取运行图的车站列表 @@ -30,16 +30,16 @@ export function populatingGenericData(planId, data) { }); } -/** - * 创建运行图 - */ -export function newRunPlan(data) { - return request({ - url: '/api/runPlan/draft', - method: 'post', - data: data - }); -} +// /** +// * 创建运行图 +// */ +// export function newRunPlan(data) { +// return request({ +// url: '/api/runPlan/draft', +// method: 'post', +// data: data +// }); +// } /** * 查询运行图获取数据 @@ -115,13 +115,13 @@ export function getRpListByMapId(mapId) { }); } -/** 获取站间运行时间*/ -export function getStationRunning(mapId) { - return request({ - url: `/api/runPlan/draft/${mapId}/stationRunning`, - method: 'get' - }); -} +// /** 获取站间运行时间*/ +// export function getStationRunning(mapId) { +// return request({ +// url: `/api/runPlan/draft/${mapId}/stationRunning`, +// method: 'get' +// }); +// } /** 获取地图原始站间运行等级 */ export function getMapStationRun(mapId) { return request({ diff --git a/src/api/scheduling.js b/src/api/scheduling.js index f0d5cdd05..3e8f0573b 100644 --- a/src/api/scheduling.js +++ b/src/api/scheduling.js @@ -1,43 +1,43 @@ import request from '@/utils/request'; -export function querySecheduling(group, params) { - return request({ - url: `/api/scheduling/${group}/day`, - method: 'get', - params - }); -} +// export function querySecheduling(group, params) { +// return request({ +// url: `/api/scheduling/${group}/day`, +// method: 'get', +// params +// }); +// } -export function generateScheduling(group, params) { - return request({ - url: `/api/scheduling/${group}/generate`, - method: 'post', - params - }); -} +// export function generateScheduling(group, params) { +// return request({ +// url: `/api/scheduling/${group}/generate`, +// method: 'post', +// params +// }); +// } -export function getSchedulingAllTrains(group) { - return request({ - url: `/api/scheduling/${group}/train/all`, - method: 'get' - }); -} +// export function getSchedulingAllTrains(group) { +// return request({ +// url: `/api/scheduling/${group}/train/all`, +// method: 'get' +// }); +// } -export function checkScheduling(group, data) { - return request({ - url: `/api/scheduling/${group}/check`, - method: 'post', - data - }); -} +// export function checkScheduling(group, data) { +// return request({ +// url: `/api/scheduling/${group}/check`, +// method: 'post', +// data +// }); +// } -export function saveScheduling(group, data) { - return request({ - url: `/api/scheduling/${group}/save`, - method: 'post', - data - }); -} +// export function saveScheduling(group, data) { +// return request({ +// url: `/api/scheduling/${group}/save`, +// method: 'post', +// data +// }); +// } export function generateSchedulingAgain(group) { return request({ @@ -45,14 +45,14 @@ export function generateSchedulingAgain(group) { method: 'delete' }); } -/** 生成地图通用派班计划 */ -export function generateCommonScheduling (data) { - return request({ - url: `/api/v1/scheduling/generate/common`, - method: 'post', - data - }); -} +// /** 生成地图通用派班计划 */ +// export function generateCommonScheduling (data) { +// return request({ +// url: `/api/v1/scheduling/generate/common`, +// method: 'post', +// data +// }); +// } /** 查询某天的派班计划 */ export function querySechedulingNew (group, params) { return request({ diff --git a/src/api/script.js b/src/api/script.js index eb2c7bfbd..83f17effc 100644 --- a/src/api/script.js +++ b/src/api/script.js @@ -1,14 +1,13 @@ import request from '@/utils/request'; -/** 分页查找上线的剧本*/ -export function getScriptPageListOnline(params) { - return request({ - url: `/api/script/paging/online`, - // url: `/api/script/paging/published`, - method: 'get', - params: params - }); -} +// /** 分页查找上线的剧本*/ +// export function getScriptPageListOnline(params) { +// return request({ +// url: `/api/script/paging/online`, +// method: 'get', +// params: params +// }); +// } /** 分页查找上线的剧本(新版)*/ export function getScriptPageListOnlineNew(params) { @@ -19,13 +18,13 @@ export function getScriptPageListOnlineNew(params) { }); } -/** 通过ID查询发布的剧本的详细信息 */ -export function getScriptById(id) { - return request({ - url: `/api/script/${id}/detail`, - method: 'get' - }); -} +// /** 通过ID查询发布的剧本的详细信息 */ +// export function getScriptById(id) { +// return request({ +// url: `/api/script/${id}/detail`, +// method: 'get' +// }); +// } /** 通过ID查询发布的剧本的详细信息(新版) */ export function getScriptByIdNew(id) { @@ -35,13 +34,13 @@ export function getScriptByIdNew(id) { }); } -/** 通过group查询未发布剧本的详细信息 */ -export function getDraftScriptByGroup(group) { - return request({ - url: `/api/simulation/${group}/script/loadedScript`, - method: 'get' - }); -} +// /** 通过group查询未发布剧本的详细信息 */ +// export function getDraftScriptByGroup(group) { +// return request({ +// url: `/api/simulation/${group}/script/loadedScript`, +// method: 'get' +// }); +// } /** 通过group查询未发布剧本的详细信息(新版) */ export function getDraftScriptByGroupNew(group) { @@ -52,7 +51,7 @@ export function getDraftScriptByGroupNew(group) { } /** 剧本撤销发布 */ -export function retractScript(id, data) { +export function retractScript(id) { return request({ url: `/api/script/draft/${id}/retract`, method: 'put' @@ -127,21 +126,21 @@ export function getAllSelectedScriptRole(group) { }); } -/** 加载剧本接口(仿真使用 竞赛) */ -export function loadScript(group, scriptId) { - return request({ - url: `/api/scriptSimulation/${group}/load/script/${scriptId}`, - method: 'PUT' - }); -} +// /** 加载剧本接口(仿真使用 竞赛) */ +// export function loadScript(group, scriptId) { +// return request({ +// url: `/api/scriptSimulation/${group}/load/script/${scriptId}`, +// method: 'PUT' +// }); +// } -/** 剧本实训结束 接口(仿真使用 竞赛) */ -export function endScriptTraining(group) { - return request({ - url: `/api/scriptSimulation/${group}/finish`, - method: 'get' - }); -} +// /** 剧本实训结束 接口(仿真使用 竞赛) */ +// export function endScriptTraining(group) { +// return request({ +// url: `/api/scriptSimulation/${group}/finish`, +// method: 'get' +// }); +// } /** 草稿剧本数据导入*/ export function postScriptImport(mapId, data) { diff --git a/src/api/simulation.js b/src/api/simulation.js index 8798f0d58..5ce0a98cb 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -1,22 +1,22 @@ import request from '@/utils/request'; -/** 获取故障规则列表*/ -export function getFailureGenerateRules(params) { - return request({ - url: `/api/simulation/failureGenerateRules`, - method: 'get', - params: params - }); -} +// /** 获取故障规则列表*/ +// export function getFailureGenerateRules(params) { +// return request({ +// url: `/api/simulation/failureGenerateRules`, +// method: 'get', +// params: params +// }); +// } -/** 设置自动故障*/ -export function setFailureMode(data, group) { - return request({ - url: `/api/simulation/${group}/failureMode`, - method: 'post', - data: data - }); -} +// /** 设置自动故障*/ +// export function setFailureMode(data, group) { +// return request({ +// url: `/api/simulation/${group}/failureMode`, +// method: 'post', +// data: data +// }); +// } /** 设置自动故障(新版)*/ export function setFailureModeNew(data, group) { @@ -41,14 +41,14 @@ export function getSimulationFaultRules(group) { }); } -// 创建故障规则（新版） -export function addFailureRule(data) { - return request({ - url: `/api/v1/faultRule`, - method: 'post', - data: data - }); -} +// // 创建故障规则（新版） +// export function addFailureRule(data) { +// return request({ +// url: `/api/v1/faultRule`, +// method: 'post', +// data: data +// }); +// } /** 根据id删除故障规则 */ export function deleteFailureRule(id) { @@ -58,52 +58,52 @@ export function deleteFailureRule(id) { }); } -/** 获取故障规则列表(新版)*/ -export function getFailureRulesNew(params) { - return request({ - url: `/api/v1/faultRule/page`, - method: 'get', - params: params - }); -} +// /** 获取故障规则列表(新版)*/ +// export function getFailureRulesNew(params) { +// return request({ +// url: `/api/v1/faultRule/page`, +// method: 'get', +// params: params +// }); +// } -// 修改故障规则（新版） -export function modifyFailureRule(data) { - return request({ - url: `/api/v1/faultRule`, - method: 'put', - data: data - }); -} +// // 修改故障规则（新版） +// export function modifyFailureRule(data) { +// return request({ +// url: `/api/v1/faultRule`, +// method: 'put', +// data: data +// }); +// } -/** 通过id获取故障规则(新版)*/ -export function getFailureRulesByIdNew(id) { - return request({ - url: `/api/v1/faultRule/${id}`, - method: 'get' - }); -} +// /** 通过id获取故障规则(新版)*/ +// export function getFailureRulesByIdNew(id) { +// return request({ +// url: `/api/v1/faultRule/${id}`, +// method: 'get' +// }); +// } -/** - * 仿真系统按计划行车 - */ -export function runDiagramStart(params, group) { - return request({ - url: `/api/simulation/${group}/start`, - method: 'put', - params: params - }); -} +// /** +// * 仿真系统按计划行车 +// */ +// export function runDiagramStart(params, group) { +// return request({ +// url: `/api/simulation/${group}/start`, +// method: 'put', +// params: params +// }); +// } -/** - * 仿真系统结束计划行车 - */ -export function runDiagramOver(group) { - return request({ - url: `/api/simulation/${group}/over`, - method: 'put' - }); -} +// /** +// * 仿真系统结束计划行车 +// */ +// export function runDiagramOver(group) { +// return request({ +// url: `/api/simulation/${group}/over`, +// method: 'put' +// }); +// } /** * 退出仿真系统 @@ -115,43 +115,43 @@ export function runDiagramQuit(group) { }); } -/** 获取仿真系统时间*/ -export function runDiagramGetTime(group) { - return request({ - url: `/api/simulation/${group}/systemTime`, - method: 'get' - }); -} +// /** 获取仿真系统时间*/ +// export function runDiagramGetTime(group) { +// return request({ +// url: `/api/simulation/${group}/systemTime`, +// method: 'get' +// }); +// } -// 查看是否开始按计划行车 -export function runDiagramIsStart(group) { - return request({ - url: `/api/simulation/${group}/isRunPlanStart`, - method: 'get' - }); -} +// // 查看是否开始按计划行车 +// export function runDiagramIsStart(group) { +// return request({ +// url: `/api/simulation/${group}/isRunPlanStart`, +// method: 'get' +// }); +// } -/** - * 仿真系统CBTC - * @param {*} mapId - */ -export function simulationNotify({ mapId, prdType }) { - return request({ - url: `/api/simulation/${mapId}/${prdType}`, - method: 'get' - }); -} +// /** +// * 仿真系统CBTC +// * @param {*} mapId +// */ +// export function simulationNotify({ mapId, prdType }) { +// return request({ +// url: `/api/simulation/${mapId}/${prdType}`, +// method: 'get' +// }); +// } -/** - * 实训系统CBTC - * @param {*} data - */ -export function trainingNotify({ trainingId }) { - return request({ - url: `/api/simulation/training/${trainingId}`, - method: 'get' - }); -} +// /** +// * 实训系统CBTC +// * @param {*} data +// */ +// export function trainingNotify({ trainingId }) { +// return request({ +// url: `/api/simulation/training/${trainingId}`, +// method: 'get' +// }); +// } /** 实训系统（新版地图） */ export function trainingNotifyNew({ trainingId }) { return request({ @@ -159,16 +159,16 @@ export function trainingNotifyNew({ trainingId }) { method: 'get' }); } -/** - * 考试系统CBTC - * @param {*} data - */ -export function examNotify({ examId }) { - return request({ - url: `/api/simulation/exam/${examId}`, - method: 'get' - }); -} +// /** +// * 考试系统CBTC +// * @param {*} data +// */ +// export function examNotify({ examId }) { +// return request({ +// url: `/api/simulation/exam/${examId}`, +// method: 'get' +// }); +// } /** 考试系统（新版地图）*/ export function examNotifyNew({ examId }) { return request({ @@ -211,29 +211,29 @@ export function deleteSimulationStats(statsId) { }); } -/** 获取用户鼠标左键选中的设备信息*/ -export function letfMouseSelectDevice(deviceCode, group) { - return request({ - url: `/api/simulation/${group}/device/${deviceCode}`, - method: 'get' - }); -} +// /** 获取用户鼠标左键选中的设备信息*/ +// export function letfMouseSelectDevice(deviceCode, group) { +// return request({ +// url: `/api/simulation/${group}/device/${deviceCode}`, +// method: 'get' +// }); +// } -/** 获取每日运行图*/ -export function getEveryDayRunPlanData(group) { - return request({ - url: `/api/simulation/${group}/runPlan`, - method: 'get' - }); -} +// /** 获取每日运行图*/ +// export function getEveryDayRunPlanData(group) { +// return request({ +// url: `/api/simulation/${group}/runPlan`, +// method: 'get' +// }); +// } -/** 录制脚本仿真*/ -export function scriptRecordNotify(scriptId) { - return request({ - url: `/api/simulation/scriptWrite/${scriptId}`, - method: 'get' - }); -} +// /** 录制脚本仿真*/ +// export function scriptRecordNotify(scriptId) { +// return request({ +// url: `/api/simulation/scriptWrite/${scriptId}`, +// method: 'get' +// }); +// } /** 录制脚本仿真(新版)*/ export function scriptRecordNotifyNew(scriptId) { @@ -243,13 +243,13 @@ export function scriptRecordNotifyNew(scriptId) { }); } -/** 保存剧本背景*/ -export function saveScriptScenes(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/scenes`, - method: 'put' - }); -} +// /** 保存剧本背景*/ +// export function saveScriptScenes(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/scenes`, +// method: 'put' +// }); +// } /** 保存剧本背景(新版)*/ export function saveScriptScenesNew(group) { @@ -267,13 +267,13 @@ export function scriptRePreview(group) { }); } -/** 保存录制任务数据*/ -export function saveScriptData(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/saveData`, - method: 'put' - }); -} +// /** 保存录制任务数据*/ +// export function saveScriptData(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/saveData`, +// method: 'put' +// }); +// } /** 保存录制任务数据(新版)*/ export function saveScriptDataNew(group) { @@ -283,14 +283,14 @@ export function saveScriptDataNew(group) { }); } -/** 更新任务地图定位信息*/ -export function updateMapLocation(group, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/mapLocation`, - method: 'put', - data - }); -} +// /** 更新任务地图定位信息*/ +// export function updateMapLocation(group, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/mapLocation`, +// method: 'put', +// data +// }); +// } /** 更新任务地图定位信息（新版）*/ export function updateMapLocationNew(group, data) { @@ -301,81 +301,81 @@ export function updateMapLocationNew(group, data) { }); } -/** 获取剧本编制的所有成员角色*/ -export function getScriptMemberData(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/members`, - method: 'get' - }); -} +// /** 获取剧本编制的所有成员角色*/ +// export function getScriptMemberData(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/members`, +// method: 'get' +// }); +// } -/** 获取剧本出演成员角色 */ -export function getScriptPlayMember(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/players`, - method: 'get' - }); -} +// /** 获取剧本出演成员角色 */ +// export function getScriptPlayMember(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/players`, +// method: 'get' +// }); +// } -/** 获取剧本出演成员角色(新版地图) */ -export function getScriptPlayMemberNew(group) { - return request({ - url: `/api/scriptSimulation/${group}/allPlayer`, - method: 'get' - }); -} +// /** 获取剧本出演成员角色(新版地图) */ +// export function getScriptPlayMemberNew(group) { +// return request({ +// url: `/api/scriptSimulation/${group}/allPlayer`, +// method: 'get' +// }); +// } -/** 取消剧本演出成员角色 */ -export function cancleScriptMembers(group, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/removePlayers`, - method: 'put', - data - }); -} +// /** 取消剧本演出成员角色 */ +// export function cancleScriptMembers(group, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/removePlayers`, +// method: 'put', +// data +// }); +// } -/** 取消剧本演出成员角色 */ -export function cancleScriptMembersNew(group, data) { - return request({ - url: `/api/scriptSimulation/${group}/removePlayers`, - method: 'put', - data - }); -} +// /** 取消剧本演出成员角色 */ +// export function cancleScriptMembersNew(group, data) { +// return request({ +// url: `/api/scriptSimulation/${group}/removePlayers`, +// method: 'put', +// data +// }); +// } -/** 选择剧本演出成员角色 */ -export function selectScriptMembers(group, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/choosePlayers`, - method: 'put', - data - }); -} +// /** 选择剧本演出成员角色 */ +// export function selectScriptMembers(group, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/choosePlayers`, +// method: 'put', +// data +// }); +// } -/** 选择剧本演出成员角色 (新版地图)*/ -export function selectScriptMembersNew(group, data) { - return request({ - url: `/api/scriptSimulation/${group}/choosePlayers`, - method: 'put', - data - }); -} +// /** 选择剧本演出成员角色 (新版地图)*/ +// export function selectScriptMembersNew(group, data) { +// return request({ +// url: `/api/scriptSimulation/${group}/choosePlayers`, +// method: 'put', +// data +// }); +// } -/** 修改剧本演出成员性别 */ -export function modifyScriptMemberSex(group, playerId, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/player/${playerId}?gender=${data.gender}`, - method: 'put' - }); -} +// /** 修改剧本演出成员性别 */ +// export function modifyScriptMemberSex(group, playerId, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/player/${playerId}?gender=${data.gender}`, +// method: 'put' +// }); +// } -/** 清除仿真剧本数据*/ -export function dumpScriptData(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/saveData`, - method: 'delete' - }); -} +// /** 清除仿真剧本数据*/ +// export function dumpScriptData(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/saveData`, +// method: 'delete' +// }); +// } /** 清除仿真剧本数据(新版)*/ export function dumpScriptDataNew(group) { @@ -385,56 +385,56 @@ export function dumpScriptDataNew(group) { }); } -/** 查询录制剧本步骤*/ -export function queryScriptStep(group) { - return request({ - url: `/api/simulation/${group}/scriptRecordStage`, - method: 'get' - }); -} +// /** 查询录制剧本步骤*/ +// export function queryScriptStep(group) { +// return request({ +// url: `/api/simulation/${group}/scriptRecordStage`, +// method: 'get' +// }); +// } -/** 获取指定时间里可加载列车的个数*/ -export function getDesignatedTimeTrainNum(params, group) { - return request({ - url: `/api/simulation/${group}/plan/trainNum`, - method: 'get', - params - }); -} -/** 添加剧本动作 */ -export function addScriptAction(group, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/action`, - method: 'post', - data - }); -} +// /** 获取指定时间里可加载列车的个数*/ +// export function getDesignatedTimeTrainNum(params, group) { +// return request({ +// url: `/api/simulation/${group}/plan/trainNum`, +// method: 'get', +// params +// }); +// } +// /** 添加剧本动作 */ +// export function addScriptAction(group, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/action`, +// method: 'post', +// data +// }); +// } -/** 添加剧本动作(新版) */ -export function addScriptActionNew(group, data) { - return request({ - url: `/api/scriptSimulation/${group}/addAction`, - method: 'PUT', - data - }); -} +// /** 添加剧本动作(新版) */ +// export function addScriptActionNew(group, data) { +// return request({ +// url: `/api/scriptSimulation/${group}/addAction`, +// method: 'PUT', +// data +// }); +// } -/** 删除剧本动作 */ -export function deleteScriptAction(group, actionId) { - return request({ - url: `/api/simulation/${group}/scriptWrite/action/${actionId}`, - method: 'delete' - }); -} +// /** 删除剧本动作 */ +// export function deleteScriptAction(group, actionId) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/action/${actionId}`, +// method: 'delete' +// }); +// } -/** 修改剧本动作 */ -export function modifyScriptAction(group, actionId, data) { - return request({ - url: `/api/simulation/${group}/scriptWrite/action/${actionId}`, - method: 'put', - data - }); -} +// /** 修改剧本动作 */ +// export function modifyScriptAction(group, actionId, data) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/action/${actionId}`, +// method: 'put', +// data +// }); +// } /** 修改剧本动作(新版) */ export function modifyScriptActionNew(group, data) { @@ -461,22 +461,22 @@ export function deleteExistingSimulation(group) { method: 'delete' }); } -/** 根据设备类型获取设备列表 */ -export function getDeviceCodeByDeviceType(group, params) { - return request({ - url: `/api/simulation/${group}/deviceType/devices`, - method: 'get', - params - }); -} +// /** 根据设备类型获取设备列表 */ +// export function getDeviceCodeByDeviceType(group, params) { +// return request({ +// url: `/api/simulation/${group}/deviceType/devices`, +// method: 'get', +// params +// }); +// } -/** 获取任务录制的数据 */ -export function getScriptRecord(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite`, - method: 'get' - }); -} +// /** 获取任务录制的数据 */ +// export function getScriptRecord(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite`, +// method: 'get' +// }); +// } /** 获取任务录制的所有动作（新版）*/ export function getScriptAllAction(group) { @@ -486,21 +486,21 @@ export function getScriptAllAction(group) { }); } -/** 加载任务*/ -export function loadQuest(questId, memberId, group) { - return request({ - url: `/api/simulation/${group}/quest/${questId}?memberId=${memberId}`, - method: 'post' - }); -} +// /** 加载任务*/ +// export function loadQuest(questId, memberId, group) { +// return request({ +// url: `/api/simulation/${group}/quest/${questId}?memberId=${memberId}`, +// method: 'post' +// }); +// } -/** 加载剧本 */ -export function loadScript(scriptId, memberId, group) { - return request({ - url: `api/simulation/${group}/script/${scriptId}?memberId=${memberId}`, - method: 'post' - }); -} +// /** 加载剧本 */ +// export function loadScript(scriptId, memberId, group) { +// return request({ +// url: `api/simulation/${group}/script/${scriptId}?memberId=${memberId}`, +// method: 'post' +// }); +// } /** 加载剧本(新版) */ export function loadScriptNew(scriptId, memberId, group) { @@ -510,13 +510,13 @@ export function loadScriptNew(scriptId, memberId, group) { }); } -/** 退出剧本*/ -export function quitScript(group) { - return request({ - url: `/api/simulation/${group}/script`, - method: 'delete' - }); -} +// /** 退出剧本*/ +// export function quitScript(group) { +// return request({ +// url: `/api/simulation/${group}/script`, +// method: 'delete' +// }); +// } /** 退出剧本(新版)*/ export function quitScriptNew(group) { @@ -526,47 +526,47 @@ export function quitScriptNew(group) { }); } -/** 退出任务*/ -export function quitQuest(group) { - return request({ - url: `/api/simulation/${group}/quest`, - method: 'put' - }); -} +// /** 退出任务*/ +// export function quitQuest(group) { +// return request({ +// url: `/api/simulation/${group}/quest`, +// method: 'put' +// }); +// } -/** 根据group获取仿真对象*/ -export function getSimulationInfo(group) { - return request({ - url: `/api/simulation/${group}`, - method: 'get' - }); -} +// /** 根据group获取仿真对象*/ +// export function getSimulationInfo(group) { +// return request({ +// url: `/api/simulation/${group}`, +// method: 'get' +// }); +// } -/** 获取可用的设备指令*/ -export function getAvailableDeviceCommand(params) { - return request({ - url: `/api/simulation/deviceCommand/available`, - method: 'get', - params - }); -} +// /** 获取可用的设备指令*/ +// export function getAvailableDeviceCommand(params) { +// return request({ +// url: `/api/simulation/deviceCommand/available`, +// method: 'get', +// params +// }); +// } -/** 保存/修改任务剧本*/ -export function saveTaskScript(group, data) { - return request({ - url: `/api/simulation/${group}/questRecord/script`, - method: 'post', - data - }); -} +// /** 保存/修改任务剧本*/ +// export function saveTaskScript(group, data) { +// return request({ +// url: `/api/simulation/${group}/questRecord/script`, +// method: 'post', +// data +// }); +// } -/** 暂停剧本编制的仿真 */ -export function scriptPause(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/pause`, - method: 'post' - }); -} +// /** 暂停剧本编制的仿真 */ +// export function scriptPause(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/pause`, +// method: 'post' +// }); +// } /** 暂停仿真 */ export function simulationPause(group) { @@ -576,57 +576,48 @@ export function simulationPause(group) { }); } -/** 恢复仿真运行并执行刚编辑的剧本动作 */ -export function executeScript(group) { - return request({ - url: `/api/simulation/${group}/scriptWrite/execute`, - method: 'post' - }); -} +// /** 恢复仿真运行并执行刚编辑的剧本动作 */ +// export function executeScript(group) { +// return request({ +// url: `/api/simulation/${group}/scriptWrite/execute`, +// method: 'post' +// }); +// } /** 恢复仿真运行并执行刚编辑的剧本动作(新版) */ export function executeScriptNew(group) { return request({ - // url: `/api/scriptSimulation/${group}/recoverAndExecute`, url: `/simulation/${group}/resume`, method: 'PUT' }); } -/** 生成用户自己的当日运行图*/ -export function generateDayRunPlan(planId, group) { - return request({ - url: `/api/simulation/${group}/loadRunPlan/${planId}`, - method: 'post' - }); -} - -/** 创建派班计划仿真*/ -export function schedulingNotify(params) { - return request({ - url: `/api/scheduling/simulation`, - method: 'post', - params - }); -} - -/** 获取PLC网关 */ -export function getPlcGateway(group) { - return request({ - url: `/api/simulation/${group}/plcGateway`, - method: 'get' - }); -} - -/** 处理ibp盘事件 */ -// export function handlerIbpEvent(group, data) { +// /** 生成用户自己的当日运行图*/ +// export function generateDayRunPlan(planId, group) { // return request({ -// url: `/api/simulation/${group}/ibp/event`, -// method: 'post', -// data: data +// url: `/api/simulation/${group}/loadRunPlan/${planId}`, +// method: 'post' // }); // } +// /** 创建派班计划仿真*/ +// export function schedulingNotify(params) { +// return request({ +// url: `/api/scheduling/simulation`, +// method: 'post', +// params +// }); +// } + +// /** 获取PLC网关 */ +// export function getPlcGateway(group) { +// return request({ +// url: `/api/simulation/${group}/plcGateway`, +// method: 'get' +// }); +// } + +/** 处理ibp盘事件 */ export function handlerIbpEvent(group, button, stationCode) { return request({ url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}`, @@ -673,14 +664,14 @@ export function getNewMapDataByGroup(group) { }); } -/** 新版地图指令操作定义 */ -export function newMapOperate(group, operationId, data) { - return request({ - url: `/simulation/${group}/operate/${operationId}`, - method: 'post', - data: data - }); -} +// /** 新版地图指令操作定义 */ +// export function newMapOperate(group, operationId, data) { +// return request({ +// url: `/simulation/${group}/operate/${operationId}`, +// method: 'post', +// data: data +// }); +// } /** 新版地图根据group获取仿真运行图 */ export function getEveryDayRunPlanNew(group) { return request({ @@ -705,14 +696,14 @@ export function clearSimulation(group) { }); } -/** 查询进路信息*/ -export function querySignalStatus(group, params) { - return request({ - url: `/api/simulation/${group}/status/signal`, - method: 'get', - params - }); -} +// /** 查询进路信息*/ +// export function querySignalStatus(group, params) { +// return request({ +// url: `/api/simulation/${group}/status/signal`, +// method: 'get', +// params +// }); +// } /** 获取仿真运行图车次号列表 */ export function getTripNumberList(group) { diff --git a/src/api/statistics.js b/src/api/statistics.js index ad16cd257..349dce602 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -1,89 +1,89 @@ -import request from '@/utils/request'; +// import request from '@/utils/request'; -// 课程列表 -export function getLessonList(code) { - return request({ - url: '/api/stats/lesson/list', - method: 'get', - params: { - wmCode: code - } - }); -} +// // 课程列表 +// export function getLessonList(code) { +// return request({ +// url: '/api/stats/lesson/list', +// method: 'get', +// params: { +// wmCode: code +// } +// }); +// } -// 课程内实训数据统计 -export function getLessonTimeChart(data) { - return request({ - url: `/api/stats/lesson/${data.id}/stats`, - method: 'get', - params: { - wmCode: data.code - } - }); -} +// // 课程内实训数据统计 +// export function getLessonTimeChart(data) { +// return request({ +// url: `/api/stats/lesson/${data.id}/stats`, +// method: 'get', +// params: { +// wmCode: data.code +// } +// }); +// } -// 查询参与考试的课程列表 -export function getExamTree(code) { - return request({ - url: '/api/stats/exam/lessonList', - method: 'get', - params: { - wmCode: code - } - }); -} +// // 查询参与考试的课程列表 +// export function getExamTree(code) { +// return request({ +// url: '/api/stats/exam/lessonList', +// method: 'get', +// params: { +// wmCode: code +// } +// }); +// } -// 查询参与考试的试题列表 -export function getstatsExamList(data) { - return request({ - url: `/api/stats/exam/${data.lessonId}/list`, - method: 'get', - params: { - wmCode: data.code - } - }); -} +// // 查询参与考试的试题列表 +// export function getstatsExamList(data) { +// return request({ +// url: `/api/stats/exam/${data.lessonId}/list`, +// method: 'get', +// params: { +// wmCode: data.code +// } +// }); +// } -// 个人考试数据统计 -export function getExamChart(data) { - return request({ - url: `/api/stats/exam/${data.examId}/stats`, - method: 'get', - params: { - wmCode: data.code - } - }); -} +// // 个人考试数据统计 +// export function getExamChart(data) { +// return request({ +// url: `/api/stats/exam/${data.examId}/stats`, +// method: 'get', +// params: { +// wmCode: data.code +// } +// }); +// } -// 个人关注地图数据统计列表 -export function getRelevanceMapList(code) { - return request({ - url: `/api/user/subscribe`, - method: 'get', - params: { - wmCode: code - } - }); -} +// // 个人关注地图数据统计列表 +// export function getRelevanceMapList(code) { +// return request({ +// url: `/api/user/subscribe`, +// method: 'get', +// params: { +// wmCode: code +// } +// }); +// } -// 仿真地图下产品列表 -export function getSimulationPrdList(mapId, code) { - return request({ - url: `/api/stats/simulation/${mapId}/prdList`, - method: 'get', - params: { - wmCode: code - } - }); -} +// // 仿真地图下产品列表 +// export function getSimulationPrdList(mapId, code) { +// return request({ +// url: `/api/stats/simulation/${mapId}/prdList`, +// method: 'get', +// params: { +// wmCode: code +// } +// }); +// } -// 个人仿真数据统计 -export function getSimulationTimeChart(data) { - return request({ - url: `/api/stats/simulation/${data.mapId}/stats`, - method: 'get', - params: { - wmCode: data.code - } - }); -} +// // 个人仿真数据统计 +// export function getSimulationTimeChart(data) { +// return request({ +// url: `/api/stats/simulation/${data.mapId}/stats`, +// method: 'get', +// params: { +// wmCode: data.code +// } +// }); +// } diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js index 8e05dae65..277ffebb1 100644 --- a/src/api/trainingPlatform.js +++ b/src/api/trainingPlatform.js @@ -1,75 +1,68 @@ import request from '@/utils/request'; +/** 根据cityCode后去对应地图及其子系统 */ export function getTrainingSystemList(cityCode, params) { - /** 根据cityCode后去对应地图及其子系统 */ return request({ url: `/api/mapSystem/city/${cityCode}`, method: 'get', params }); } - +/** 根据mapId生成地图子系统 */ export function generateMapSystem(mapId) { - /** 根据mapId生成地图子系统 */ return request({ url: `/api/mapSystem/generate/${mapId}`, method: 'post' }); } - +/** 查询子系统信息 */ export function getSubSystemInfo(id) { - /** 查询子系统信息 */ return request({ url: `/api/mapSystem/${id}`, method: 'get' }); } - +/** 查询子系统详情*/ export function getSubSystemDetail(id) { - /** 查询子系统详情*/ return request({ url: `/api/mapSystem/${id}/detail`, method: 'get' }); } - +/** 分页查询地图系统 */ export function getMapSystemPageList(params) { - /** 分页查询地图系统 */ return request({ url: `/api/mapSystem`, method: 'get', params }); } - +/** 创建地图系统 */ export function createMapSubSystem(data) { - /** 创建地图系统 */ return request({ url: `/api/mapSystem`, method: 'post', data: data }); } - +/** 查询子系统信息 */ export function updateSubSystem(id, data) { - /** 查询子系统信息 */ return request({ url: `/api/mapSystem/${id}`, method: 'put', data: data }); } - +/** 删除地图系统 */ export function deleteSubSystem(id) { - /** 删除地图系统 */ return request({ url: `/api/mapSystem/${id}`, method: 'delete' }); } +/** 根据项目编号查询地图子系统 */ export function getSubSystemByProjectCode() { - /** 根据项目编号查询地图子系统 */ return request({ url: `/api/mapSystem/project`, method: 'get' diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue index 149cd8be5..af860cd9b 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -392,15 +392,6 @@ export default { } catch (e) { this.$message.error('获取列车信息失败！'); } - - // getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => { - // if (resp.data) { - // this.formModel.serviceNumber = resp.data.serviceNumber; - // this.formModel.destinationCode = resp.data.destinationCode; - // } - // }).catch(() => { - // this.$message.error('获取列车信息失败！'); - // }); this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 906107c44..caa77f191 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -26,7 +26,7 @@ import { getPublishMapInfo } from '@/api/jmap/map'; import { getGoodsTryUse } from '@/api/management/goods'; import { PermissionType, UrlConfig } from '@/scripts/ConstDic'; import { launchFullscreen } from '@/utils/screen'; -import { simulationNotify, schedulingNotify, createSimulationNew } from '@/api/simulation'; +import { createSimulationNew } from '@/api/simulation'; import LimitList from '@/views/components/limits/index'; import { getSubSystemDetail } from '@/api/trainingPlatform'; import { getSessionStorage } from '@/utils/auth'; diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue index a6fbbc5c9..46706c5ea 100644 --- a/src/views/exam/detail/examDetail.vue +++ b/src/views/exam/detail/examDetail.vue @@ -50,12 +50,12 @@ @@ -611,7 +618,7 @@ export default { background: #f0a1a1; pointer-events: all; text-align: left; - font-size: 18px; + font-size: 18px; overflow: hidden; } } diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index 22af7449f..919f76315 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -61,7 +61,6 @@