From 00608f2cb26192d1a1923bb12307f749eb7542c9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 20 Jul 2020 15:19:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?heb=E5=8F=96=E6=B6=88=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA&=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=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/login/index.vue | 1 + .../newMap/jointTrainingNew/chatView/chatBox.vue | 1 + .../jointTrainingNew/chatView/chatContent.vue | 6 +++++- src/views/newMap/jointTrainingNew/menuDemon.vue | 1 - src/views/system/deviceManage/editConfigScreen.vue | 14 +++++++++++--- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1b678f5fe..a2633d3ac 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -79,6 +79,7 @@ {{ $t('login.autoLogin') }} diff --git a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue index cf4dd88bb..ea7b0d382 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue @@ -46,6 +46,10 @@ export default { userRole: { type: String, required: true + }, + commonConversation: { + type: Boolean, + required: true } }, data() { @@ -76,7 +80,7 @@ export default { } } this.scrollTop(); - } else if (this.userRole === 'AUDIENCE') { + } else if (this.userRole === 'AUDIENCE' || this.commonConversation) { this.$emit('changeMessageList', conversationInfo.message); if (member && member.userId != this.$store.state.user.id) { this.currentAudioList.push(this.baseUrl + '/audio/' + conversationInfo.message.audioPath); diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index bad3f34a7..625020727 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -37,7 +37,6 @@ import SetTime from '@/views/newMap/displayNew/demon/setTime'; import { ranAsPlan, exitRunPlan, clearSimulation } from '@/api/simulation'; import { exitFullscreen } from '@/utils/screen'; import { getSimulationQrcode } from '@/api/jointSimulation'; -// import { EventBus } from '@/scripts/event-bus'; import { getSessionStorage } from '@/utils/auth'; import RealDevice from './menuDraft/realDevice'; import { refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition'; diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue index e45b4ef47..f7fc3e223 100644 --- a/src/views/system/deviceManage/editConfigScreen.vue +++ b/src/views/system/deviceManage/editConfigScreen.vue @@ -190,7 +190,7 @@ export default { deviceCode: this.formData.deviceCode, quadrant: this.formData.quadrant }; - setLswConfig(this.data.id, param).then(response => { + setLswConfig(this.data.id, param).then(() => { self.$message.success('设置大屏工作站配置成功'); self.handleClose(); self.$emit('reloadTable'); @@ -203,7 +203,7 @@ export default { const param = { deviceCode: this.formData.deviceCode }; - setCctvConfig(this.data.id, param).then(response => { + setCctvConfig(this.data.id, param).then(() => { self.$message.success('设置CCTV工作站配置成功'); self.handleClose(); self.$emit('reloadTable'); @@ -217,7 +217,7 @@ export default { deviceCode: this.formData.deviceCode, psdCode: this.formData.psdCode }; - setVrPsdConfig(this.data.id, param).then(response => { + setVrPsdConfig(this.data.id, param).then(() => { self.$message.success('设置虚拟屏蔽门工作站配置成功'); self.handleClose(); self.$emit('reloadTable'); @@ -230,6 +230,14 @@ export default { handleClose() { this.dialogVisible = false; this.data = {}; + this.mapList = []; + this.stationList = []; + this.standList = []; + this.psdList = []; + this.mapId = ''; + this.stationCode = ''; + this.standCode = ''; + this.deviceList = []; this.$refs.form.resetFields(); } } From 1fb660d9e7535fabc59ae7e63e01ae3997a639b5 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 20 Jul 2020 15:20:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?heb=E5=8F=96=E6=B6=88=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a2633d3ac..30bcd3a31 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -79,7 +79,7 @@ {{ $t('login.autoLogin') }} Date: Mon, 20 Jul 2020 15:22:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?heb=E5=8F=96=E6=B6=88=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 30bcd3a31..dd85e37f8 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -79,7 +79,7 @@ {{ $t('login.autoLogin') }} Date: Mon, 20 Jul 2020 16:00:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE?= =?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/api/project.js | 8 ++ src/scripts/ConstConfig.js | 3 +- src/utils/baseUrl.js | 4 +- .../system/deviceManage/editConfigGateway.vue | 115 +++++++++++++----- src/views/system/deviceManage/index.vue | 2 +- 5 files changed, 100 insertions(+), 32 deletions(-) diff --git a/src/api/project.js b/src/api/project.js index 09f9ef76d..5fe727903 100644 --- a/src/api/project.js +++ b/src/api/project.js @@ -84,6 +84,14 @@ export function setIbpConfig(id, data) { data: data }); } +/** 添加/修改psc控制柜网关映射配置 */ +export function setPscConfig(id, data) { + return request({ + url: `/api/device/${id}/config/psc`, + method: 'put', + data: data + }); +} /** 查询项目下的所有设备 */ export function getAllDeviceInProject(params) { return request({ diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 108d44a8b..4ccd76d3f 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -231,7 +231,8 @@ export default { {label: '车辆段终端', value: 'DEPOT'}, {label: '虚拟CCTV', value: 'CCTV'}, {label: 'PLC网关', value: 'PLC_GATEWAY'}, - {label: '端头控制盒', value: 'PSL'} + {label: '端头控制盒', value: 'PSL'}, + {label: 'PSC控制柜', value: 'PSC'} ] } }; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..c59924e25 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ 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.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue index b857999a4..18255fe3f 100644 --- a/src/views/system/deviceManage/editConfigGateway.vue +++ b/src/views/system/deviceManage/editConfigGateway.vue @@ -1,7 +1,7 @@