From 1779f856be7b9faa7263a50188ea238057b65428 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 17 Jan 2020 17:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eiscs=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 23 +- src/utils/baseUrl.js | 4 +- .../iscsSystem/config/fire-alarm/stand.vue | 20 ++ .../config/fire-alarm/stationHall.vue | 20 ++ .../iscsSystem/config/fire-alarm/system.vue | 20 ++ src/views/system/iscsSystem/config/index.vue | 36 +++ src/views/system/iscsSystem/index.vue | 17 +- src/views/system/iscsSystem/nav.vue | 269 +++++++++++++++++- 8 files changed, 385 insertions(+), 24 deletions(-) create mode 100644 src/views/system/iscsSystem/config/fire-alarm/stand.vue create mode 100644 src/views/system/iscsSystem/config/fire-alarm/stationHall.vue create mode 100644 src/views/system/iscsSystem/config/fire-alarm/system.vue create mode 100644 src/views/system/iscsSystem/config/index.vue diff --git a/src/router/index.js b/src/router/index.js index 1ae084d1d..268420bd8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,7 +39,7 @@ const News = () => import('@/views/system/news/index'); const CommandDictionary = () => import('@/views/system/commandDictionary/index'); const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit'); const configLine = () => import('@/views/system/configLine/index'); -// const IscsSystem = () => import('@/views/system/iscsSystem/index'); +const IscsSystem = () => import('@/views/system/iscsSystem/index'); const Mapedit = () => import('@/views/mapdraft/index'); @@ -784,20 +784,13 @@ export const asyncRouter = [ } ] }, - // { - // path: 'iscs/system', - // component: IscsSystem, - // meta: { - // i18n: 'router.iscsSystem' - // }, - // children: [ - // { - // path: 'edit/:id/:mode', - // component: IscsDraw, - // hidden: true - // } - // ] - // }, + { + path: 'iscs/system', + component: IscsSystem, + meta: { + i18n: 'router.iscsSystem' + } + }, { path: 'dictionary', component: Dictionary, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 79d1c6346..1e9afea51 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.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/system/iscsSystem/config/fire-alarm/stand.vue b/src/views/system/iscsSystem/config/fire-alarm/stand.vue new file mode 100644 index 000000000..60d45af2a --- /dev/null +++ b/src/views/system/iscsSystem/config/fire-alarm/stand.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/system/iscsSystem/config/fire-alarm/stationHall.vue b/src/views/system/iscsSystem/config/fire-alarm/stationHall.vue new file mode 100644 index 000000000..62d7d4b27 --- /dev/null +++ b/src/views/system/iscsSystem/config/fire-alarm/stationHall.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/system/iscsSystem/config/fire-alarm/system.vue b/src/views/system/iscsSystem/config/fire-alarm/system.vue new file mode 100644 index 000000000..517ce8347 --- /dev/null +++ b/src/views/system/iscsSystem/config/fire-alarm/system.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/system/iscsSystem/config/index.vue b/src/views/system/iscsSystem/config/index.vue new file mode 100644 index 000000000..71a8357a0 --- /dev/null +++ b/src/views/system/iscsSystem/config/index.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/system/iscsSystem/index.vue b/src/views/system/iscsSystem/index.vue index 71b30094a..be6afac12 100644 --- a/src/views/system/iscsSystem/index.vue +++ b/src/views/system/iscsSystem/index.vue @@ -1,8 +1,8 @@