From 7cdf99a6992a63c26ee689a389579d5d46cd6946 Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Tue, 9 Nov 2021 19:44:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E6=8E=A7=E5=88=B6bug=E3=80=81=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=BD=A6=E8=AF=86=E5=88=AB=E5=8F=B7=E5=8F=AA=E6=9C=89=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/menus/dialog/trainControl.vue | 5 ++++- .../theme/fuzhou_01/menus/menuDialog/trainOperation.vue | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue index a69d37618..b3d17ff8f 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -27,7 +27,7 @@ /> - + { this.changeSpeedFlag = false; }) }, inputSpeed(val) { this.changeSpeedFlag = true; From 71270fbb431c3ffddf367a063accf69834e70160 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 10 Nov 2021 13:45:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=92=8C=E5=88=A9=E6=97=B6=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BB=BF=E7=9C=9F=E6=8A=A5=E9=94=99=E8=B0=83=E6=95=B4?= =?UTF-8?q?&=E4=B8=8A=E9=A5=B6=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/fuzhou_01/menus/menuDialog/trainOperation.vue | 2 +- src/scripts/ProjectConfig.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue index 471fac38c..df4e5fb37 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue @@ -82,9 +82,9 @@ export default { } if (this.speed != train.speed && !this.changeSpeedFlag) { this.speed = train.speed; + this.$nextTick(() => { this.changeSpeedFlag = false; }); } this.dialogVisible = true; - this.$nextTick(() => { this.changeSpeedFlag = false; }) }, inputSpeed(val) { this.changeSpeedFlag = true; diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 55861e98c..21d9ede12 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -643,7 +643,9 @@ export const ProjectCode = { nologo: 'NOLOGO', designnologo: 'NOLOGO', srsandbox: 'SR_SANDBOX', - designsrsandbox: 'SR_SANDBOX' + designsrsandbox: 'SR_SANDBOX', + hls: 'DEFAULT', + designhls: 'DEFAULT' }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 底部栏仅展示公司信息不展示备案号 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', From ba7b9f39ebb352fdb7c27bb923e658fab0e4a968 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 11 Nov 2021 14:32:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B1=9F=E8=A5=BF?= =?UTF-8?q?=E5=B7=A5=E8=B4=B8=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 22 ++++++++++++++ src/scripts/ProjectConfig.js | 39 ++++++++++++++++++++----- src/store/modules/permission.js | 6 ++-- src/views/system/deviceManage/index.vue | 6 ++-- 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 96a84881b..bd3e60cf6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -232,6 +232,7 @@ export const projectSdy = '021';// 苏电院 export const projectRichor = '022';// 中航锐创 export const projectRichorJoint = '023'; // 中航锐创（实训室） export const projectSrsandbox = '024'; // 上饶沙盘 +export const projectJxgm = '025'; // 江西工贸 export const userTrainingPlatform = '016'; // 实训系统 // export const refereePlatform = '017'; // 裁判系统 @@ -1528,6 +1529,27 @@ export const projectRoute = { } ] } + ], + designjxgm: [ + { // 系统管理 + path: '/system', + component: Layout, + merge: true, + mergeIndex: 4, + meta: { + i18n: 'router.systemManage', + roles: [admin] + }, + children: [ + { + path: 'deviceManage', + component: DeviceManage, + meta: { + i18n: 'router.deviceManage' + } + } + ] + } ] }; const createRouter = () => new Router({ diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 21d9ede12..c82cbbe0e 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -532,6 +532,24 @@ export const loginInfo = { titleDistance: '-150px', navigationLogoWidth: '40px', navigationMarginLeft: '60px', + systemType: '025' + }, + designjxgm: { + title: '江西工业贸易职业技术学院城市轨道交通设计平台', + loginPath: '/design/login?project=jxgm', + loginParam: 'JXGM', + titleDistance: '-150px', + navigationLogoWidth: '40px', + navigationMarginLeft: '60px', + systemType: '025' + }, + jxgm: { + title: '江西工业贸易职业技术学院城市轨道交通实训平台', + loginPath: '/login?project=jxgm', + loginParam: 'JXGM', + titleDistance: '-150px', + navigationLogoWidth: '40px', + navigationMarginLeft: '60px', systemType: '024' }, nologo: { @@ -603,7 +621,9 @@ export const ProjectIcon = { nologo: TransparentIcon, designnologo: TransparentIcon, srsandbox: FaviconRichor, - designsrsandbox:FaviconRichor + designsrsandbox:FaviconRichor, + jxgm: FaviconRichor, + designjxgm: FaviconRichor }; export const ProjectCode = { @@ -644,22 +664,24 @@ export const ProjectCode = { designnologo: 'NOLOGO', srsandbox: 'SR_SANDBOX', designsrsandbox: 'SR_SANDBOX', + jxgm: 'JXGM', + designjxgm: 'JXGM', hls: 'DEFAULT', designhls: 'DEFAULT' }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 底部栏仅展示公司信息不展示备案号 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', - 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts']; // 实训设计平台通过项目code获取地图列表的项目 + 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', - 'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts']; // 登录页右下角版本开发基于不展示 + 'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm']; // 登录页右下角版本开发基于不展示 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorlesson3d', 'richorjoint', 'nologo', 'designnologo', - 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts']; // 登录页右下角主体不展示 + 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm']; // 登录页右下角主体不展示 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', - 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts']; // 登录页样式 + 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl']; export const NoSimulationQrCodeList = ['heb', 'bjd']; export const RegisterCodeList = ['cgy', 'designcgy']; @@ -703,7 +725,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台 nologo: '/design/login?project=nologo', designnologo: '/login?project=nologo', srsandbox: '/design/login?project=srsandbox', - designsrsandbox: '/login?project=srsandbox' + designsrsandbox: '/login?project=srsandbox', + jxgm: '/design/login?project=jxgm', + designjxgm: '/login?project=jxgm' }; export const ProjectList = [ {value:'xty', label:'西铁院'}, @@ -725,7 +749,8 @@ export const ProjectList = [ {value: 'richorlesson3d', label: '中航锐创(三维课程)'}, {value: 'richor_joint', label: '中航锐创（实训室）'}, {value: 'nologo', label: '无logo' }, - {value: 'sr_sandbox', label: '上饶沙盘'} + {value: 'sr_sandbox', label: '上饶沙盘'}, + {value: 'jxgm', label: '江西工贸' } ]; export const localPackageProject = { localdesign: 'designheb', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index ac97142bc..406439863 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -1,4 +1,4 @@ -import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectRichorJoint, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy, projectSrsandbox } from '@/router/index'; +import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectRichorJoint, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy, projectSrsandbox, projectJxgm } from '@/router/index'; import { loginInfo } from '@/scripts/ProjectConfig'; import { getSessionStorage } from '@/utils/auth'; @@ -36,9 +36,9 @@ function hasPermission(roles, route, parentsRoles) { function resetAsyncRouter({ systemType }) { let list = publicAsyncRoute; const projectList = [projectTrain, projectXian, projectJyd, projectTky, projectDrts, projectRichor]; - const specialProjects = [projectXty, projectGzzb, projectHeb, projectSdy, projectRichorJoint, projectSrsandbox]; + const specialProjects = [projectXty, projectGzzb, projectHeb, projectSdy, projectRichorJoint, projectSrsandbox, projectJxgm]; const specialProjectEnum = {[projectXty]:'designxty', [projectGzzb]:'designgzb', [projectHeb]:'designheb', - [projectSdy]:'designsdy', [projectRichorJoint]:'designrichorjoint', [projectSrsandbox]: 'designsrsandbox' }; + [projectSdy]:'designsdy', [projectRichorJoint]:'designrichorjoint', [projectSrsandbox]: 'designsrsandbox', [projectJxgm]: 'designjxgm' }; if (projectList.includes(systemType)) { list = [...list, ...asyncRouter]; } else if (specialProjects.includes(systemType) ) { diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue index ef14ac197..03b8e58b1 100644 --- a/src/views/system/deviceManage/index.vue +++ b/src/views/system/deviceManage/index.vue @@ -44,7 +44,8 @@ export default { {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}, { label: '中航锐创（实训室）', value: 'RICHOR_JOINT' }, - {label: '上饶沙盘', value: 'SR_SANDBOX'} + {label: '上饶沙盘', value: 'SR_SANDBOX'}, + {label: '江西工贸', value: 'JXGM'} ], projectMap: { designxty: 'XTY', @@ -52,7 +53,8 @@ export default { designheb: 'HEB', designsdy: 'SDY', designrichorjoint: 'RICHOR_JOINT', - designsrsandbox: 'SR_SANDBOX' + designsrsandbox: 'SR_SANDBOX', + designjxgm: 'JXGM' }, queryForm: { labelWidth: '120px', From f270cbfb3b94bbd74f55691f14c5c906f434505d Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 11 Nov 2021 15:08:13 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=81=93=E5=B2=94=E9=92=A9=E9=94=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=BB=93=E6=9D=9F=E6=B8=85=E9=99=A4operation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/menus/dialog/switchHookLock.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue index 0f4beda54..e7e087dfb 100644 --- a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue +++ b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue @@ -89,7 +89,7 @@ export default { }, methods: { doShow(selected, operate = null) { - this.$root.$emit('dialogOpen', selected); + this.$root.$emit('dialogOpen', selected); this.selected = selected; if (!this.dialogShow) { this.switchName = ''; @@ -119,7 +119,8 @@ export default { doClose() { this.loading = false; this.dialogShow = false; - this.$root.$emit('dialogClose', this.selected); + this.operation = ''; + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); }, commit() { From f5cca2da38af6080487d4cde866a3f641dad87f9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 12 Nov 2021 09:43:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8A=E9=A5=B6=E6=B2=99=E7=9B=98&?= =?UTF-8?q?=E6=B1=9F=E8=A5=BF=E5=B7=A5=E8=B4=B8=20=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E4=B8=8D=E5=B1=95=E7=A4=BA=20chatView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/menuDemon.vue | 13 ++++++++++--- src/views/newMap/jointTrainingNew/menuDemon.vue | 5 ++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index 14c25c092..4bf0081db 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -1,7 +1,7 @@