From d3a06586ba05baa1a890fe0da8b0702b9ca0fffb Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 21 Sep 2022 13:15:14 +0800 Subject: [PATCH] =?UTF-8?q?ISCS=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4&&=E5=B9=BF=E6=92=AD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 +- .../config/broadcast/stationHome.vue | 65 ++++++++++++++++--- src/views/login/index.vue | 34 ++++++++-- src/views/system/deviceManage/editConfig.vue | 64 +++++++++++++----- .../system/deviceManage/editConfigIbp.vue | 7 +- .../system/deviceManage/editConfigScreen.vue | 20 ++++-- 6 files changed, 148 insertions(+), 46 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index b23886d27..0c6bfc252 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -24,8 +24,8 @@ export function handlerUrl(data) { if (process.env.NODE_ENV === 'development') { // const data = null; // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://192.168.3.233/rtss-server'; + BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.90:9100'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue index 49390ce2d..05e0c0880 100644 --- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue @@ -62,12 +62,42 @@
ATC广播
 -
{{ this.enableAreaList.includes('LCD')? '启用':'未启用' }}
 -
{{ this.enableAreaList.includes('UP_STAND')? '启用':'未启用' }}
 -
{{ this.enableAreaList.includes('DOWN_STAND')? '启用':'未启用' }}
 -
{{ this.enableAreaList.includes('ADMINISTRATIVE_AREA')? '启用':'未启用' }}
 -
{{ this.enableAreaList.includes('GATE')? '启用':'未启用' }}
 -
{{ this.enableAreaList.includes('TRANSFER_CHANNEL')? '启用':'未启用' }}
 + +
+ {{ this.atcBroadcast.includes('LCD')? '启用':'未启用' }} +
+
+ + +
+ {{ this.atcBroadcast.includes('UP_STAND')? '启用':'未启用' }} +
+
+ + +
+ {{ this.atcBroadcast.includes('DOWN_STAND')? '启用':'未启用' }} +
+
+ + +
+ {{ this.atcBroadcast.includes('ADMINISTRATIVE_AREA')? '启用':'未启用' }} +
+
+ + +
+ {{ this.atcBroadcast.includes('GATE')? '启用':'未启用' }} +
+
+ + +
+ {{ this.atcBroadcast.includes('TRANSFER_CHANNEL')? '启用':'未启用' }} +
+
+
@@ -200,8 +230,8 @@
ATC广播
 -
启用
-
停用
+
启用
+
停用
@@ -239,6 +269,7 @@ export default { delayTime: '' }, enableAreaList: [], + atcBroadcast: [], bgmResources: '', videoMode: 'RECORDING', messageIndex: 0, @@ -322,7 +353,7 @@ export default { if (device) { this.$set(this.deviceMap[device.position], 'state', item.state); const div = document.getElementById(device.position); - if (this.$route.query.stationId === item.stationCode && !['0', '12', '13'].includes(item.state)) { + if (this.$route.query.stationId === item.stationCode && !['0', '12', '13'].includes(item.state) && this.atcBroadcast.includes(item.position)) { const audio = document.getElementById('voice'); audio.src = this.$store.state.user.resourcesUrl + item.url; audio.play(); @@ -409,7 +440,6 @@ export default { checkHasDevice(position) { const device = this.iscsDeviceList.find(item => item.position === position); this.deviceMap[position] = device; - console.log(device, position, this.iscsDeviceList, '------'); return !!device; }, getResourcesList() { @@ -428,6 +458,21 @@ export default { this.enableAreaList = ['LCD', 'UP_STAND', 'DOWN_STAND', 'ADMINISTRATIVE_AREA', 'GATE', 'TRANSFER_CHANNEL']; } }, + enableAtcBroadcast() { + this.enableAreaList.forEach(item => { + if (!this.atcBroadcast.includes(item)) { + this.atcBroadcast.push(item); + } + }); + }, + stopAtcBroadcast() { + this.enableAreaList.forEach(item => { + const index = this.atcBroadcast.findIndex(elem => item === elem); + if (index > -1) { + this.atcBroadcast.splice(index, 1); + } + }); + }, playBgm() { const iscsDeviceCodes = []; this.enableAreaList.forEach(item => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4d66a10ac..f63729f9d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -484,12 +484,34 @@ export default { this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: {...query, prdType:resp.data.prodType} }); } } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') { - this.$router.push({ path: `/displayIscs/system`, query: { - group: res.data.group, - lineCode: resp.data.map.lineCode, - mapId:resp.data.map.id, - projectDevice: this.$route.query.projectDevice, - type: this.$route.query.type} }); + const config = JSON.parse(res.data.deviceVO.config); + if (config.picture === 'paMain') { + // displayIscs/system/stationConfig/paMain?stationName=象峰站&stationId=Station25166&group=20-120-196-193&mapId=196&lineCode=02 + this.$router.push({ path: `displayIscs/system/stationConfig/paMain`, query: { + stationId: config.stationCode, + group: res.data.group, + mapId:resp.data.map.id, + lineCode: resp.data.map.lineCode, + projectDevice: this.$route.query.projectDevice, + type: this.$route.query.type + } }); + } else if (config.picture === 'pidsMain') { + this.$router.push({ path: `displayIscs/system/stationConfig/pidsMain`, query: { + stationId: config.stationCode, + group: res.data.group, + mapId:resp.data.map.id, + lineCode: resp.data.map.lineCode, + projectDevice: this.$route.query.projectDevice, + type: this.$route.query.type + } }); + } else { + this.$router.push({ path: `/displayIscs/system`, query: { + group: res.data.group, + lineCode: resp.data.map.lineCode, + mapId:resp.data.map.id, + projectDevice: this.$route.query.projectDevice, + type: this.$route.query.type} }); + } } else if (this.$route.query.type == 'CCTV') { if (RealCctvList.includes(this.project)) { this.$router.push({ diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index 254354c4e..52cb73840 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -55,6 +55,26 @@ /> + + + + + + + + + + {{ $t('global.confirm') }} @@ -64,7 +84,7 @@