From 31d50d95e20a501c560d1f8b2c4d92e87e91ea68 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 13 Mar 2020 13:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BF=E7=9C=9F=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20iscs=E5=B7=A5=E4=BD=9C=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/map.js | 8 + src/router/index.js | 14 + src/scripts/ConstConfig.js | 3 +- src/utils/baseUrl.js | 6 +- src/views/demonstration/detail/index.vue | 25 +- .../iscsSystem/config/fire-alarm/stand.vue | 1 - src/views/iscs/iscsSystem/groupNav.vue | 393 ++++++++++++++++++ src/views/iscs/iscsSystem/index.vue | 12 +- 8 files changed, 452 insertions(+), 10 deletions(-) create mode 100644 src/views/iscs/iscsSystem/groupNav.vue diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js index 23c3032ad..8213c4c5c 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -173,3 +173,11 @@ export function toSortMap(data) { data: data }); } + +/** 根据group获取排序的车站列表(包含车辆段/停车场) */ +export function getByGroupStationList(group) { + return request({ + url: `/simulation/${group}/stationWithDepot`, + method: 'get' + }); +} diff --git a/src/router/index.js b/src/router/index.js index 499502108..79531d1f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -503,6 +503,20 @@ export const asyncRouter = [ }, hidden: true }, + { + path: '/displayIscs/system', + component: IscsSystem, + meta: { + }, + hidden: true, + children: [ + { + path: 'config/:mode', + component: IscsConfig, + hidden: true + } + ] + }, { // 综合演练室 path: '/trainroom', component: TrainRoom, diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 31d3b9617..427ecf9c7 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -145,7 +145,8 @@ export default { { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: '02'}, { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03'}, { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04'}, - { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'} + { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'}, + { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'} ] } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index ebe4a12e5..0a29bb813 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,11 +3,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - // BASE_API = 'http://192.168.8.125:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛automaticRouteButtonList diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index a9baa81bc..3c6cd7204 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -24,7 +24,7 @@ + + diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue index 8edd7dc07..95e2a93ec 100644 --- a/src/views/iscs/iscsSystem/index.vue +++ b/src/views/iscs/iscsSystem/index.vue @@ -1,7 +1,8 @@