From cb19a6b4230e82865eb99f0f0ded35d738bc54ae Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 14 Oct 2022 18:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/map.js | 8 + src/utils/baseUrl.js | 4 +- .../mapoperate/simulationMember/index.vue | 24 +++ .../publish/publishMap/editSubsystem.vue | 162 ++++++++++++++---- 4 files changed, 162 insertions(+), 36 deletions(-) diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js index 2c3883e7f..f28384170 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -292,3 +292,11 @@ export function querySimulationMemberByMapId(id) { method: 'get' }); } + +/** 根据地图查询车站(含车辆段停车场) */ +export function querySimulationStationsByMapId(id) { + return request({ + url: `/api/map/${id}/stations`, + method: 'get' + }); +} diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 5317762c9..0929e8877 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.90:9100'; // 周寅 // 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/newMap/newMapdraft/mapoperate/simulationMember/index.vue b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue index 9ab22c6be..80e5a818a 100644 --- a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue @@ -274,6 +274,23 @@ 一键生成 + + + + + + + + +
+ 一键清空 +
+
@@ -341,6 +358,9 @@ export default { }, generationForm: { systemType: 'METRO' + }, + clearForm: { + systemType: 'METRO' } }; }, @@ -756,6 +776,10 @@ export default { } this.$message.success('一键生成成功!'); this.resetForm(); + }, + keyClear() { + const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList }; + memberMap[this.clearForm.systemType].splice(0, memberMap[this.clearForm.systemType].length); } } }; diff --git a/src/views/publish/publishMap/editSubsystem.vue b/src/views/publish/publishMap/editSubsystem.vue index 691d202cd..77d17a879 100644 --- a/src/views/publish/publishMap/editSubsystem.vue +++ b/src/views/publish/publishMap/editSubsystem.vue @@ -2,6 +2,7 @@ @@ -10,39 +11,32 @@ - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -79,7 +73,7 @@