diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js index b22d67ce5..b51e26a54 100644 --- a/src/api/jmap/training.js +++ b/src/api/jmap/training.js @@ -198,18 +198,12 @@ export function getAllPublishTrainingList(params) { params }); } -/** 根据mapId查所有的已发布单操实训的基础信息 */ -export function getPublishSingleList(mapId) { +/** 查询组织已发布实训的基础信息 */ +export function getPublishTrainingListInOrg(params) { return request({ - url: `/api/v2/training/published/${mapId}/singles`, - method: 'get' - }); -} -/** 根据mapId查所有的已发布场景实训的基础信息 */ -export function getPublishScenesList(mapId) { - return request({ - url: `/api/v2/training/published/${mapId}/scenes`, - method: 'get' + url: `/api/v2/training/published/infos`, + method: 'get', + params }); } /** 根据实训id查该已发布实训的所有信息 */ diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue index db1217282..b669c37e8 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue @@ -69,6 +69,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; // import { mouseCancelState } from '../utils/menuItemStatus'; import NoticeInfo from '../childDialog/noticeInfo'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'RouteDetail', @@ -153,8 +154,10 @@ export default { }, commit() { const operate = { - send: true, - operation: OperationEvent.Signal.detail.menu.operation + // send: true, + over: true, + operation: OperationEvent.Signal.detail.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_DETAIL }; this.loading = true; diff --git a/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue index d702a018f..ea75bd767 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue @@ -316,8 +316,9 @@ export default { }); }, confirm2() { - const operate = {}; - + const operate = { + send: true + }; if (this.operation == OperationEvent.Section.unlock.menu.operation) { /** 区段解封*/ operate.operation = OperationEvent.Section.unlock.confirm2.operation; diff --git a/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue index 41257f6ce..f7b92ca3e 100644 --- a/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue @@ -1,13 +1,13 @@