diff --git a/src/router/index.js b/src/router/index.js index c2079e5ee..8b411d628 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,16 +33,17 @@ const ExistingSimulation = () => import('@/views/system/existingSimulation/index const CacheControl = () => import('@/views/system/cacheControl/index'); const SystemGenerate = () => import('@/views/system/systemGenerate/index'); const IbpDraw = () => import('@/views/system/ibpDraw/index'); -const IscsDraw = () => import('@/views/system/iscsDraw/index'); -const IscsDesign = () => import('@/views/system/iscsDesign/index'); 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 Mapedit = () => import('@/views/mapdraft/index'); +const IscsSystem = () => import('@/views/iscs/iscsSystem/index'); +const IscsDraw = () => import('@/views/iscs/iscsDraw/index'); +const IscsDesign = () => import('@/views/iscs/iscsDesign/index'); +const IscsConfig = () => import('@/views/iscs/iscsSystem/config/index'); + const NewMapDraft = () => import('@/views/newMap/newMapdraft/index'); const NewDesignPlatformUser = () => import('@/views/newMap/newDesignUser/index'); @@ -518,21 +519,6 @@ export const asyncRouter = [ component: JointTraining, hidden: true }, - // { // iscs系统 - // path: '/iscs/system', - // component: IscsSystem, - // meta: { - // roles: [admin], - // i18n: 'router.iscsSystem' - // }, - // children: [{ - // path: '', - // component: IscsSystem, - // meta: { - // i18n: 'router.iscsSystem' - // } - // }] - // }, { path: '/jlmap3d', component: Jlmap3d, @@ -785,27 +771,6 @@ export const asyncRouter = [ i18n: 'router.ibpDraw' } }, - // { - // path:'iscs/design', - // component: IscsDesign, - // meta: { - // i18n: 'router.iscsDraw' - // }, - // children: [ - // { - // path: 'edit/:id/:mode', - // component: IscsDraw, - // hidden: true - // } - // ] - // }, - // { - // path: 'iscs/system', - // component: IscsSystem, - // meta: { - // i18n: 'router.iscsSystem' - // } - // }, { path: 'dictionary', component: Dictionary, @@ -998,7 +963,14 @@ export const asyncRouter = [ component: IscsSystem, meta: { i18n: 'router.iscsSystem' - } + }, + children: [ + { + path: 'config/:mode', + component: IscsConfig, + hidden: true + } + ] } ] } diff --git a/src/views/system/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue similarity index 100% rename from src/views/system/iscsDesign/demonList.vue rename to src/views/iscs/iscsDesign/demonList.vue diff --git a/src/views/system/iscsDesign/index.vue b/src/views/iscs/iscsDesign/index.vue similarity index 100% rename from src/views/system/iscsDesign/index.vue rename to src/views/iscs/iscsDesign/index.vue diff --git a/src/views/system/iscsDraw/index.vue b/src/views/iscs/iscsDraw/index.vue similarity index 100% rename from src/views/system/iscsDraw/index.vue rename to src/views/iscs/iscsDraw/index.vue diff --git a/src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue b/src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue rename to src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue diff --git a/src/views/system/iscsDraw/iscsAcsOperate/index.vue b/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAcsOperate/index.vue rename to src/views/iscs/iscsDraw/iscsAcsOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue rename to src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue diff --git a/src/views/system/iscsDraw/iscsAfcOperate/index.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAfcOperate/index.vue rename to src/views/iscs/iscsDraw/iscsAfcOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue rename to src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue diff --git a/src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue similarity index 100% rename from src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue rename to src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue b/src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/chiller.vue b/src/views/iscs/iscsDraw/iscsBasOperate/chiller.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/chiller.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/chiller.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/coolTower.vue b/src/views/iscs/iscsDraw/iscsBasOperate/coolTower.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/coolTower.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/coolTower.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue b/src/views/iscs/iscsDraw/iscsBasOperate/fireDamper.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/fireDamper.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue b/src/views/iscs/iscsDraw/iscsBasOperate/frozenPump.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/frozenPump.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/index.vue b/src/views/iscs/iscsDraw/iscsBasOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/index.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/jetFan.vue b/src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/jetFan.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue b/src/views/iscs/iscsDraw/iscsBasOperate/orbitalVentilator.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/orbitalVentilator.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue b/src/views/iscs/iscsDraw/iscsBasOperate/smookProofFd.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/smookProofFd.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue b/src/views/iscs/iscsDraw/iscsBasOperate/tunnelFan.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/tunnelFan.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/ventilator.vue b/src/views/iscs/iscsDraw/iscsBasOperate/ventilator.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/ventilator.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/ventilator.vue diff --git a/src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue b/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue similarity index 100% rename from src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue rename to src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue diff --git a/src/views/system/iscsDraw/iscsCctvOperate/index.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsCctvOperate/index.vue rename to src/views/iscs/iscsDraw/iscsCctvOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsCctvOperate/vidicon.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue similarity index 100% rename from src/views/system/iscsDraw/iscsCctvOperate/vidicon.vue rename to src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue diff --git a/src/views/system/iscsDraw/iscsCctvOperate/vidiconCloud.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/vidiconCloud.vue similarity index 100% rename from src/views/system/iscsDraw/iscsCctvOperate/vidiconCloud.vue rename to src/views/iscs/iscsDraw/iscsCctvOperate/vidiconCloud.vue diff --git a/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue rename to src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue diff --git a/src/views/system/iscsDraw/iscsOperate/gasFireControl.vue b/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/gasFireControl.vue rename to src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue diff --git a/src/views/system/iscsDraw/iscsOperate/index.vue b/src/views/iscs/iscsDraw/iscsOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/index.vue rename to src/views/iscs/iscsDraw/iscsOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue rename to src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue diff --git a/src/views/system/iscsDraw/iscsOperate/smokeDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/smokeDetector.vue rename to src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue diff --git a/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue similarity index 100% rename from src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue rename to src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue diff --git a/src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue b/src/views/iscs/iscsDraw/iscsPsdOperate/borderRadius.vue similarity index 100% rename from src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue rename to src/views/iscs/iscsDraw/iscsPsdOperate/borderRadius.vue diff --git a/src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue b/src/views/iscs/iscsDraw/iscsPsdOperate/endDoor.vue similarity index 100% rename from src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue rename to src/views/iscs/iscsDraw/iscsPsdOperate/endDoor.vue diff --git a/src/views/system/iscsDraw/iscsPsdOperate/index.vue b/src/views/iscs/iscsDraw/iscsPsdOperate/index.vue similarity index 100% rename from src/views/system/iscsDraw/iscsPsdOperate/index.vue rename to src/views/iscs/iscsDraw/iscsPsdOperate/index.vue diff --git a/src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue b/src/views/iscs/iscsDraw/iscsPsdOperate/platformScreenDoor.vue similarity index 100% rename from src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue rename to src/views/iscs/iscsDraw/iscsPsdOperate/platformScreenDoor.vue diff --git a/src/views/system/iscsSystem/bottom.vue b/src/views/iscs/iscsSystem/bottom.vue similarity index 100% rename from src/views/system/iscsSystem/bottom.vue rename to src/views/iscs/iscsSystem/bottom.vue diff --git a/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue new file mode 100644 index 000000000..a38b86bae --- /dev/null +++ b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/views/system/iscsSystem/config/fire-alarm/stand.vue b/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue similarity index 100% rename from src/views/system/iscsSystem/config/fire-alarm/stand.vue rename to src/views/iscs/iscsSystem/config/fire-alarm/stand.vue diff --git a/src/views/system/iscsSystem/config/fire-alarm/stationHall.vue b/src/views/iscs/iscsSystem/config/fire-alarm/stationHall.vue similarity index 100% rename from src/views/system/iscsSystem/config/fire-alarm/stationHall.vue rename to src/views/iscs/iscsSystem/config/fire-alarm/stationHall.vue diff --git a/src/views/system/iscsSystem/config/fire-alarm/system.vue b/src/views/iscs/iscsSystem/config/fire-alarm/system.vue similarity index 100% rename from src/views/system/iscsSystem/config/fire-alarm/system.vue rename to src/views/iscs/iscsSystem/config/fire-alarm/system.vue diff --git a/src/views/system/iscsSystem/config/index.vue b/src/views/iscs/iscsSystem/config/index.vue similarity index 91% rename from src/views/system/iscsSystem/config/index.vue rename to src/views/iscs/iscsSystem/config/index.vue index d705bf9a2..b56ca0df5 100644 --- a/src/views/system/iscsSystem/config/index.vue +++ b/src/views/iscs/iscsSystem/config/index.vue @@ -35,16 +35,15 @@ export default { StationNetwork, EmergencyRelease }, - props: { - mode: { - type: String, - required: true - } - }, data() { return { - mes: '1111' + mode: 'standFAS' }; + }, + watch: { + '$route': function(val) { + this.mode = this.$route.params.mode; + } } }; diff --git a/src/views/system/iscsSystem/config/pis/emergencyRelease.vue b/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue similarity index 100% rename from src/views/system/iscsSystem/config/pis/emergencyRelease.vue rename to src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue diff --git a/src/views/system/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue similarity index 100% rename from src/views/system/iscsSystem/config/pis/lcdControl.vue rename to src/views/iscs/iscsSystem/config/pis/lcdControl.vue diff --git a/src/views/system/iscsSystem/config/pis/mainScreen.vue b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue similarity index 100% rename from src/views/system/iscsSystem/config/pis/mainScreen.vue rename to src/views/iscs/iscsSystem/config/pis/mainScreen.vue diff --git a/src/views/system/iscsSystem/config/pis/stationNetwork.vue b/src/views/iscs/iscsSystem/config/pis/stationNetwork.vue similarity index 100% rename from src/views/system/iscsSystem/config/pis/stationNetwork.vue rename to src/views/iscs/iscsSystem/config/pis/stationNetwork.vue diff --git a/src/views/system/iscsSystem/config/pis/timePreview.vue b/src/views/iscs/iscsSystem/config/pis/timePreview.vue similarity index 100% rename from src/views/system/iscsSystem/config/pis/timePreview.vue rename to src/views/iscs/iscsSystem/config/pis/timePreview.vue diff --git a/src/views/system/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue similarity index 83% rename from src/views/system/iscsSystem/index.vue rename to src/views/iscs/iscsSystem/index.vue index 9b5bd1239..0febe2f54 100644 --- a/src/views/system/iscsSystem/index.vue +++ b/src/views/iscs/iscsSystem/index.vue @@ -2,8 +2,7 @@
- - +
@@ -26,9 +25,6 @@ export default { }; }, methods: { - selectMode(type) { - this.mode = type; - } } }; diff --git a/src/views/system/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue similarity index 98% rename from src/views/system/iscsSystem/nav.vue rename to src/views/iscs/iscsSystem/nav.vue index 4e7d6f8eb..e3abcdbcc 100644 --- a/src/views/system/iscsSystem/nav.vue +++ b/src/views/iscs/iscsSystem/nav.vue @@ -205,13 +205,13 @@ export default { this.selectIndex = index; this.selectChildIndex = 0; if (item.children.length) { - this.$emit('selectMode', item.children[0].type); + this.$router.push({ path: `/iscs/system/config/${item.children[0].type}` }); } } }, selectChildren(item, index) { // 选择子菜单 this.selectChildIndex = index; - this.$emit('selectMode', item.type); + this.$router.push({ path: `/iscs/system/config/${item.type}` }); }, selectStation(item, index) { // 选择子菜单 console.log(item); diff --git a/src/views/system/iscsSystem/config/broadcast/homeScreen.vue b/src/views/system/iscsSystem/config/broadcast/homeScreen.vue deleted file mode 100644 index 6ca50a464..000000000 --- a/src/views/system/iscsSystem/config/broadcast/homeScreen.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - -