From 55d4ff6e696cfaec20027f4646754a1fd39e453b Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 4 Aug 2022 17:26:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=96=B0=E5=BB=BA=20bug?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/mapDraftPicture/createPicture.vue | 6 ++-- src/views/newMap/registerBook/index.vue | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue index c56ba31df..18855223a 100644 --- a/src/views/newMap/mapDraftPicture/createPicture.vue +++ b/src/views/newMap/mapDraftPicture/createPicture.vue @@ -47,7 +47,7 @@ export default { return { centerDialogVisible: false, skinCodeList: [], - ruleForm: { name: '', type: '', stationCode: '', lineCode: '', deviceMap: {} }, + ruleForm: { name: '', type: '', stationCode: '', lineCode: '' }, rules: { name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }], type: [{ required: true, message: '请选择画面类型', trigger: 'change' }], @@ -78,9 +78,9 @@ export default { if (valid) { const map = this.$store.state.map.map; if (map && map.pictureList && map.pictureList.length) { - map.pictureList.push({...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}); + map.pictureList.push({...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}); } else { - map.pictureList = [{...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}]; + map.pictureList = [{...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}]; } if (map && parseInt(this.$route.params.mapId)) { saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => { diff --git a/src/views/newMap/registerBook/index.vue b/src/views/newMap/registerBook/index.vue index a39587237..30d164b70 100644 --- a/src/views/newMap/registerBook/index.vue +++ b/src/views/newMap/registerBook/index.vue @@ -423,6 +423,35 @@ + +
计数器
+
+ +
名称
+
S总人工解锁
+
S引导
+
S总锁闭
+
X总人工解锁
+
X引导
+
X总锁闭
+
S故障
+
S接车引导
+
南场
+ + +
号码
+
+
+
+
+
+
+
+
+
+ +
+ --> From 97966d1beceb902dc0fb30f93e75fdb424c89dc4 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 09:58:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=B0=BF=E5=86=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/cmdPlugin/CommandHandler.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index 768043571..8fc597397 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -77,6 +77,14 @@ class CommandHandle { Driver_Stop: { operate: 'Driver_Stop', paramList: [{name: 'groupNumber'}, {name: 'eb'}] + }, + RAIL_QUERY_REGISTER: { + operate: 'RAIL_QUERY_REGISTER', + paramList: [{name: 'stationCode'}] + }, + RAIL_FILL_IN_REGISTER: { + operate: 'RAIL_FILL_IN_REGISTER', + paramList: [{name: 'stationCode'}, {name: 'line'}] } } }; From 808ae31174b19057c0cb44203f7252d6a2818811 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:16:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B5=B0=E7=94=BB=E9=9D=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E9=9B=86=E4=B8=AD?= =?UTF-8?q?=E7=AB=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/jointTrainingNew/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 38c2811ca..3874bd574 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -482,6 +482,7 @@ export default { this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$jlmap.updatePicture(deviceList); this.$jlmap.updateTransform(picture.scaling, picture.origin); + this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]); } else { this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); this.mapViewLoadedOver && this.switchStationMode(deviceCode); From 91175f2d57105ef541ef4b6042f385c6b099f609 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:25:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=89=B4=E6=9D=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B5=B0=E6=AD=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/pushMessage.js | 1 + src/utils/baseUrl.js | 3 ++- src/utils/request.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/pushMessage.js b/src/api/pushMessage.js index 0a13502d1..3621017d7 100644 --- a/src/api/pushMessage.js +++ b/src/api/pushMessage.js @@ -28,6 +28,7 @@ export function postLicenseValidate(data) { return request({ url: `/api/license/validate`, method: 'post', + production: true, // baseURL: 'https://joylink.club/jlcloud', data }); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index b27593aec..13618efbc 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -66,5 +66,6 @@ export function handlerUrl(data) { UPLOAD_API = 'http://joylink.club/jlfile'; BASE_SITE = 'https://joylink.club/cbtc'; } - return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE}; + const PROD_API = 'https://joylink.club/jlcloud'; + return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE, PROD_API}; } diff --git a/src/utils/request.js b/src/utils/request.js index 5049fbb20..f31c561f9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -32,7 +32,9 @@ service.interceptors.request.use(config => { if (config.upload) { config.baseURL = urlData.UPLOAD_API; } - + if (config.production) { + config.baseURL = urlData.PROD_API; + } if (config.time) { config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改 } From ffc8275e546fc0656740be3a442948a1f5bf383e Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:56:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=AB=99=E9=97=B4=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Station/index.js | 2 +- src/jmapNew/theme/datie_02/menus/index.vue | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 06a4f250e..daca331af 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -167,7 +167,7 @@ export default class Station extends Group { const queryCtc = queryList.find(item => { return item.includes('ctc'); }); - if (queryCtc) { + if (queryCtc && model.createControlMode) { this.createCtcControlMode(); } else if (this.style.Station.StationControl.special) { if (model.visible && model.createControlMode) { // model.createControlMode 控制模式 diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 550d390de..3b639ef04 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -354,9 +354,23 @@ export default { for (const key in mapDevice) { list.push(mapDevice[key]); } - this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); - this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); - this.$jlmap.updateTransform(map.scaling, map.origin); + if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { + const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === this.showCentralizedStationCode && picture.type === 'chainStation'); + if (picture) { + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + const deviceList = []; + const mapDevice = this.$store.state.map.mapDevice; + for (const deviceCode in mapDevice) { + deviceList.push(deviceCode); + } + this.$jlmap.updatePicture(deviceList); + this.$jlmap.updateTransform(picture.scaling, picture.origin); + } + } else { + this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); + this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); + this.$jlmap.updateTransform(map.scaling, map.origin); + } }, getRailwaySimulationRunplanSend() { const stationCode = this.$store.state.training.roleDeviceCode;