From 2bb8c6df92508536eb33abda5a293dbc3fb564c1 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 12 Apr 2023 18:34:06 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 30763300acb5d7ce9e3ff7af5e4d8c27139abc44 Author: dong <58670809@qq.com> Date: Wed Apr 12 18:31:39 2023 +0800 修改前端配置带id commit cde33feb22f90f2af2d305bb97781473d61db0ea Author: fan Date: Wed Apr 12 18:07:47 2023 +0800 宁波三进路选择表示样式不取消 commit 34a94e2c6dcf7b7b496752dbeb764f762db934d5 Author: fan Date: Wed Apr 12 17:58:11 2023 +0800 区域选择界面调整 commit 52af1d994bdda8eb6b689e3f4c33181ecff986b0 Author: fan Date: Wed Apr 12 13:33:03 2023 +0800 系统管理-教学考试数据管理 commit 6187b449c16b486929e43d0984d198a3f78da7c9 Author: dong <58670809@qq.com> Date: Fri Apr 7 15:22:33 2023 +0800 代码调整 commit 074453ece74675c3528026c7d3d5857a9a46f4e4 Author: weizhihong Date: Fri Mar 31 16:52:08 2023 +0800 【删除注释】 --- .../menus/menuDialog/areaSelection.vue | 39 ++++++++----------- .../menus/menuDialog/routeCommand.vue | 1 + .../system/frontProjectConfigManage/add.vue | 2 +- src/views/system/userExam/index.vue | 8 ++++ src/views/system/userTraining/index.vue | 8 ++++ 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue index 8dc294630..da68e047f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue @@ -30,9 +30,9 @@ - + @@ -93,9 +93,12 @@ export default { } }, watch: { - '$store.state.map.mapStateLoadedCount': function () { + '$store.state.map.mapStationStateUpdateCount': function() { if (this.show) { - this.tableData = [...this.tableData]; + this.tableData.forEach(item => { + const station = this.$store.getters['map/getDeviceByCode'](item.code); + item.controller = station.controller; + }); } } }, @@ -122,24 +125,18 @@ export default { this.memberId = this.$store.state.training.myMemberId; const centralizedStationCode = this.stationCentralizedMap[this.$store.state.training.roleDeviceCode]; const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); - this.$set(centralizedStation, 'apply', false); - this.$set(centralizedStation, 'release', false); - this.$set(centralizedStation, 'distribution', false); - this.tableData.push(centralizedStation); + const data = { code: centralizedStation.code, name: centralizedStation.name, apply: false, release: false, distribution: false, controller: null }; + this.tableData.push(data); centralizedStation.chargeStationCodeList.forEach(elem => { const station = this.$store.getters['map/getDeviceByCode'](elem); - this.$set(station, 'apply', false); - this.$set(station, 'release', false); - this.$set(station, 'distribution', false); - this.tableData.push(station); + const data1 = { code: station.code, name: station.name, apply: false, release: false, distribution: false, controller: null }; + this.tableData.push(data1); }); } else if (this.$store.state.training.roles === 'DISPATCHER') { this.memberId = this.$store.state.training.myMemberId; this.stationList.forEach(item => { - this.$set(item, 'apply', false); - this.$set(item, 'release', false); - this.$set(item, 'distribution', false); - this.tableData.push(item); + const data = { code: item.code, name: item.name, apply: false, release: false, distribution: false, controller: null }; + this.tableData.push(data); }); } this.show = true; @@ -154,9 +151,8 @@ export default { } }); }, - getControlStatus(code) { - const newStation = this.$store.getters['map/getDeviceByCode'](code); - return newStation.controller === this.memberId ? '自控' : '未控'; + getControlStatus(controller) { + return controller === this.memberId ? '自控' : '未控'; }, getDisabled(code, type) { const newStation = this.$store.getters['map/getDeviceByCode'](code); @@ -172,9 +168,8 @@ export default { } }, getController(station) { - const newStation = this.$store.getters['map/getDeviceByCode'](station.code); - if (newStation.controller) { - const controller = this.$store.state.training.memberData[newStation.controller]; + if (station.controller) { + const controller = this.$store.state.training.memberData[station.controller]; return controller.label; } else { return ''; diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue index 6a5ad4675..26fd32c25 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue @@ -324,6 +324,7 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); + this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$refs.endTable.setCurrentRow(); this.$refs.singleTable.setCurrentRow(); diff --git a/src/views/system/frontProjectConfigManage/add.vue b/src/views/system/frontProjectConfigManage/add.vue index d9ac4302e..93d204bb0 100644 --- a/src/views/system/frontProjectConfigManage/add.vue +++ b/src/views/system/frontProjectConfigManage/add.vue @@ -85,7 +85,7 @@ export default { this.loading = true; const data = Object.assign({}, this.formModel); // 检查项目markKey - checkFrontProjectExist({markKey:data.markKey}).then(res=>{ + checkFrontProjectExist({markKey:data.markKey, id: data.id}).then(res=>{ if (!res.data) { if (data.id) { // 更新前端项目配置 diff --git a/src/views/system/userExam/index.vue b/src/views/system/userExam/index.vue index e3163496b..8f317dc5d 100644 --- a/src/views/system/userExam/index.vue +++ b/src/views/system/userExam/index.vue @@ -39,6 +39,14 @@ export default { config: { data: this.$ConstSelect.examResultList } + }, + userMobile: { + type: 'text', + label: '手机号' + }, + userId: { + type: 'text', + label: '用户Id' } } diff --git a/src/views/system/userTraining/index.vue b/src/views/system/userTraining/index.vue index 23efdcc8a..860142850 100644 --- a/src/views/system/userTraining/index.vue +++ b/src/views/system/userTraining/index.vue @@ -35,6 +35,14 @@ export default { userName: { type: 'text', label: this.$t('system.userName') + }, + userMobile: { + type: 'text', + label: '手机号' + }, + userId: { + type: 'text', + label: '用户Id' } }