diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 9c42272f9..22d63de3e 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -260,11 +260,19 @@ export default { initTerminalList() { this.terminalList = []; this.commonTerminal.forEach(item => { - if (item.roleList.includes(this.roles) && item.isShow()) { + if (item.roleList.includes(this.roles) && item.isShow() && this.checkClientSet(item)) { this.terminalList.push(item); } }); }, + checkClientSet(client) { + const clientSet = this.$store.state.map.map ? this.$store.state.map.map.clientSet : ''; + if (clientSet) { + return clientSet.includes(client.code); + } else { + return true; + } + }, noEvent(code) { this.$emit('pictureChange', code); }, @@ -291,10 +299,14 @@ export default { } }, changePictureShow(code) { - this.$emit('loadingChange'); - setTimeout(() => { - this.$emit('pictureChange', code); - }, 100); + if (!this.$store.state.map.map.clientSet || this.$store.state.map.map.clientSet.includes(code)) { + this.$emit('loadingChange'); + setTimeout(() => { + this.$emit('pictureChange', code); + }, 100); + } else if (this.terminalList[0]) { + this.$emit('pictureChange', this.terminalList[0].code); + } } } }; diff --git a/src/views/newMap/newMapdraft/clientConfig.vue b/src/views/newMap/newMapdraft/clientConfig.vue new file mode 100644 index 000000000..94525c5df --- /dev/null +++ b/src/views/newMap/newMapdraft/clientConfig.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue index 70de97c87..e6b24eaef 100644 --- a/src/views/newMap/newMapdraft/index.vue +++ b/src/views/newMap/newMapdraft/index.vue @@ -32,6 +32,7 @@ @updateMapModel="updateMapModel" @generateDepotCiEvent="generateDepotCiEvent" @setMapFunctionConfig="setMapFunctionConfig" + @setClientConfig="setClientConfig" @setCenter="setCenter" @selectView="selectViewDraft" @showMap="showMap" @@ -51,6 +52,7 @@ + @@ -71,10 +73,9 @@ import ElementImport from './elementImport'; import PopMenu from '@/components/PopMenu'; import DepotStation from './depotStation'; import mapFunctionConfig from './mapFunctionConfig'; - import ConfigMap from './configMap'; - import DataRelation from './dataRelation/index'; +import ClientConfig from './clientConfig'; export default { name: 'MapView', @@ -88,7 +89,8 @@ export default { CheckConfig, ElementImport, DepotStation, - mapFunctionConfig + mapFunctionConfig, + ClientConfig }, data() { return { @@ -320,6 +322,9 @@ export default { setMapFunctionConfig() { this.$refs.mapFunctionConfig.show(); }, + setClientConfig() { + this.$refs.clientConfig.show(); + }, handleSelectControlPage(model) { if (this.$refs.mapOperate) { this.$refs.mapOperate.handleSelectControlPage(model); diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue index 1388a9155..c89fd99db 100644 --- a/src/views/newMap/newMapdraft/mapoperate/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/index.vue @@ -14,6 +14,7 @@ 配置
地图配置
+
客户端配置
@@ -217,6 +218,9 @@ export default { setMapFunctionConfig() { this.$emit('setMapFunctionConfig'); }, + setClientConfig() { + this.$emit('setClientConfig'); + }, generateDepotCiEvent() { this.$emit('generateDepotCiEvent'); }