From 801d2186ccc697cd0907fca94acb2e51f5164aad Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 8 Dec 2022 16:40:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/xian_01/menus/menuSignal.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue index ec93dfd5b..63eab3df1 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue @@ -186,7 +186,9 @@ export default { isDisabled: (signal, work) => { return false; }, - isShow: (signal, work) => work === 'dispatchWork' + isShow: (signal, work, lineCode) => { + return work === 'dispatchWork' || lineCode == '11'; + } }, { label: '进路交ATS自动控', @@ -195,7 +197,9 @@ export default { isDisabled: (signal, work) => { return false; }, - isShow: (signal, work) => work === 'dispatchWork' + isShow: (signal, work, lineCode) => { + return work === 'dispatchWork' || lineCode == '11'; + } }, { label: '查询进路状态', @@ -236,6 +240,9 @@ export default { ]), group() { return this.$route.query.group; + }, + lineCode() { + return this.$route.query.lineCode; } }, watch: { @@ -269,7 +276,7 @@ export default { this.menuNormal.forEach(menuItem => { const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work); menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false; - menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true; + menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work, this.lineCode) : true; this.menu.push(menuItem); }); // 故障模式菜单列表 From bd5b1548836d5d323fa3f92521760cf0e4b4dd6e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 8 Dec 2022 17:03:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/deviceManage/editConfig.vue | 9 +++++++++ src/views/system/deviceManage/editConfigGateway.vue | 2 ++ src/views/system/deviceManage/editConfigScreen.vue | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index 019784336..25bbd11c9 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -254,15 +254,19 @@ export default { initData(row) { getDeviceDetail(row.id).then(resp => { if (resp.data.config && resp.data.type === 'VR_IBP') { + this.formIbp = {part: '', deviceCode: '', roleCode:'', client:''}; const form = JSON.parse(resp.data.config); this.formIbp = Object.assign(this.formIbp, form); } else if (resp.data.config && resp.data.type === 'LW') { + this.formLw = {stationCode: '', roleCode:'', client:''}; const form = JSON.parse(resp.data.config); this.formLw = Object.assign(this.formLw, form); } else if (resp.data.config && ['IM', 'CW', 'DRIVE', 'DEPOT'].includes(resp.data.type)) { + this.formIm = { roleCode:'', client:''}; const form = JSON.parse(resp.data.config); this.formIm = Object.assign(this.formIm, form); } else if (resp.data.config && (resp.data.type === 'ISCS_LW' || resp.data.type === 'ISCS_CW')) { + this.formIscs = {deviceCode: '', picture: '', stationCode: '', roleCode:'', client:''}; const form = JSON.parse(resp.data.config); this.formIscs = Object.assign(this.formIscs, form); } @@ -296,6 +300,7 @@ export default { getBackProjectConfigByCode(row.project).then(res=>{ const data = res.data; this.dialogVisible = true; + this.roleList = []; if (data.functionId) { if (data.mapId) { this.mapIdChange(data.mapId, data.functionId); } } else { @@ -374,6 +379,10 @@ export default { this.dialogVisible = false; this.data = {}; this.lwList = []; + this.formIbp = {part: '', deviceCode: '', roleCode:'', client:''}; + this.formLw = {stationCode: '', roleCode:'', client:''}; + this.formIm = { roleCode:'', client:''}; + this.formIscs = {deviceCode: '', picture: '', stationCode: '', roleCode:'', client:''}; this.$refs.formIbp.resetFields(); this.$refs.formLw.resetFields(); this.$refs.formIscs.resetFields(); diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue index 3a192100e..a771f616e 100644 --- a/src/views/system/deviceManage/editConfigGateway.vue +++ b/src/views/system/deviceManage/editConfigGateway.vue @@ -146,6 +146,7 @@ export default { initData(row) { this.jsonConfig = '{}'; getDeviceDetail(row.id).then(resp => { + this.formPis = {roleCode:'', client:''}; if (resp.data.config) { // this.formModel = JSON.parse(resp.data.config); const config = JSON.parse(resp.data.config); @@ -157,6 +158,7 @@ export default { getBackProjectConfigByCode(row.project).then(res=>{ const data = res.data; this.dialogVisible = true; + this.roleList = []; if (config.roleCode) { this.formPis.roleCode = config.roleCode; } if (config.client) { this.formPis.client = config.client; } if (data.functionId) { diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue index bb2b8eb0d..30e789deb 100644 --- a/src/views/system/deviceManage/editConfigScreen.vue +++ b/src/views/system/deviceManage/editConfigScreen.vue @@ -159,13 +159,12 @@ export default { quadrant: data.quadrant, deviceCode: data.deviceCode, psdCode: data.psdCode, - // mapId:data.mapId, - roleCode:data.roleCode, - client:data.client, + roleCode:data.roleCode || '', + client:data.client || '', addr: data.addr, quantity: data.quantity }; - if (['VR_PSD', 'LSW', 'CCTV', 'SANDBOX'].includes(row.type)) { + if (['VR_PSD', 'LSW', 'CCTV', 'SANDBOX', 'ILW'].includes(row.type)) { // getPublishMapListOnline().then(resp => { // if (resp.data && resp.data.length) { // this.mapList = resp.data; @@ -177,6 +176,7 @@ export default { getBackProjectConfigByCode(row.project).then(res=>{ const data = res.data; this.dialogVisible = true; + this.roleList = []; if (data.functionId) { if (data.mapId) { this.mapIdChange(data.mapId, data.functionId); } } else {