diff --git a/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue new file mode 100644 index 000000000..d960ada1e --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue index 6f0e8d119..c2073391e 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue @@ -113,6 +113,7 @@ export default { if (this.mapData && this.mapData.skinVO) { const parser = parserFactory(ParserType.Graph.value); this.mapDevice = parser.parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig()); + console.log('parsed mapDevice', this.mapDevice) } }, loadData() { @@ -154,7 +155,7 @@ export default { const type = elem._type; // 列车不需要设置默认状态 type != deviceType.Train && - list.push({ code, _type: type, _free: true }); + list.push({ code, _type: type, _free: true }); }); this.map.update(list, false); diff --git a/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue new file mode 100644 index 000000000..80d49c381 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue index 6a3a8986f..31f54c8c8 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue @@ -31,7 +31,10 @@
车站 - + + + +
@@ -92,6 +95,9 @@ export default { data() { return { show: false, + form: { + station: 'shenyang', + }, } }, methods: { diff --git a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue new file mode 100644 index 000000000..8b9348ede --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index 4810414c2..b8c29b616 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -31,6 +31,9 @@ + + +
@@ -49,6 +52,9 @@ import { EventBus } from '@/scripts/event-bus' import SettingsMenu from './components/menu.vue' import BoardViewSetting from './dialog/boardViewSetting.vue' import RailViewSetting from './dialog/railViewSetting.vue' +import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue' +import BlockDevice from './dialog/blockDevice' +import RegionBatchOperation from './dialog/regionBatchOperation' export default { name: 'MenuPanel', @@ -57,6 +63,9 @@ export default { SettingsMenu, BoardViewSetting, RailViewSetting, + PowerSupplyArmSetting, + BlockDevice, + RegionBatchOperation, }, data() { return { @@ -82,22 +91,38 @@ export default { { label: '调车参数配置', id: 'shuntingParam', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '调车优先级配置', id: 'shuntingPriority', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '调车规则配置', id: 'shuntingRule', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '功能按钮设置', id: 'functionButton', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '站场界面显示设置', id: 'UIDisplay' }, { label: '报警提示设置', id: 'alarm' }, @@ -106,12 +131,42 @@ export default { T3MenuItems: [ { label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true }, { label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true }, - { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true }, - { label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true }, - { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true }, - { label: '操作日志查询', id: 'operationLog', ctc: true }, - { label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true }, - { label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true }, + { + label: '区域批量设备操作', + id: 'regionBatchOperation', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { + label: '站存车管理', + id: 'stationTrainManage', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { + label: '设备影响分析', + id: 'deviceAffectAnalyze', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { label: '操作日志查询', id: 'operationLog' }, + { label: '防溜设置查询', id: 'deviceAffectAnalyze' }, + { label: '设备影响分析', id: 'deviceAffectAnalyze' }, ], } }, @@ -188,6 +243,19 @@ export default { }, handleT3MenuSelect(id) { console.log(id) + this.closeMenus() + const params = id.split('-') + switch (params[0]) { + case 'powerSupplyArm': + this.$refs.powerSupplyArmSetting.doShow() + break + case 'blockedDeviceOperation': + this.$refs.blockDevice.doShow() + break + case 'regionBatchOperation': + if (!params[1]) return + this.$refs.regionBatchOperation.doShow(params[1]) + } }, dragEvent() { const offset = this.offset diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue index fac7a7a4d..490cfb79c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue @@ -71,6 +71,7 @@ export default { }, methods: { init() { + console.log(123) document.getElementById(this.canvasId).oncontextmenu = function (e) { return false; }; diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue index d7eff1ecd..827405b49 100644 --- a/src/views/newMap/mapDraftPicture/createPicture.vue +++ b/src/views/newMap/mapDraftPicture/createPicture.vue @@ -14,6 +14,7 @@ +