diff --git a/src/api/simulation.js b/src/api/simulation.js index 52387fe15..5463ecec4 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -523,6 +523,13 @@ export function sandTableTrainControl(group, params) { params }); } +/** 获取运行计划详情 */ +export function getSandTableRunPlanDetail(simulationId) { + return request({ + url: `http://192.168.3.233:9000/api/sandTable/${simulationId}/runPlanDetail`, + method: 'get', + }); +} /** 条件查询仿真中的ISCS资源 */ export function queryIscsResourcesByGroup(group, params) { return request({ diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue index 77c0cd390..d86640c1b 100644 --- a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue @@ -1,7 +1,8 @@ @@ -44,17 +46,28 @@ export default { trackCode: '', }, ], + trainList: [], } }, computed: { show() { return this.dialogShow && !this.$store.state.menuOperation.break }, + // trainList() { + // console.log(this.$store.state.activeTrainList) + // return this.$store.state.activeTrainList + // }, }, methods: { doShow() { this.dialogShow = true - console.log(1) + this.formData = [ + { + trainCode: '', + trackCode: '', + }, + ] + console.log(this.$store.state.activeTrainList) }, doClose() { this.dialogShow = false @@ -66,6 +79,10 @@ export default { deleteRow() { this.formData.pop() }, + confirm() {}, + cancel() { + this.doClose() + }, }, } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c3d8d55e6..91f950ca6 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.47:9000'; // 周寅 // 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/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue index d73089b4c..b41be28ec 100644 --- a/src/views/system/deviceManage/index.vue +++ b/src/views/system/deviceManage/index.vue @@ -29,7 +29,7 @@ export default { EditConfigIbp }, data() { - const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PLC_GATEWAY', 'UDP_LOW', 'PSC']; + const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PLC_GATEWAY', 'UDP_LOW', 'PSC', 'SAND_TABLE_RUN_PLAN']; return { examResultList: [], url: '',