diff --git a/src/i18n/langs/en/planMonitor.js b/src/i18n/langs/en/planMonitor.js index 9a00d9953..9e652dc71 100644 --- a/src/i18n/langs/en/planMonitor.js +++ b/src/i18n/langs/en/planMonitor.js @@ -212,7 +212,7 @@ export default { addTaskHint1: 'Please set the section running time of the start section ', addTaskHint2: 'to the section', addTaskHint3: '', - normalNew: 'Normal new', + normalNew: 'New', createFromTheReleaseRunGraph: 'Create from the release run graph', releaseRunGraph: 'Release run graph', newRunGraph: 'New run graph', diff --git a/src/i18n/langs/zh/planMonitor.js b/src/i18n/langs/zh/planMonitor.js index 7f237d34d..c8087acea 100644 --- a/src/i18n/langs/zh/planMonitor.js +++ b/src/i18n/langs/zh/planMonitor.js @@ -215,7 +215,7 @@ export default { addTaskHint1: '请先设置开始区段', addTaskHint2: '终到区段', addTaskHint3: '的站间运行时间', - normalNew: '正常新建', + normalNew: '新建', runGraphName: '运行图名称', createFromTheReleaseRunGraph: '从发布运行图创建', releaseRunGraph: '发布运行图', diff --git a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue index 41cee7a81..50dee18af 100644 --- a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue @@ -186,7 +186,7 @@ export default { let name = section.name; if (section.type == '02') { const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); - name = `${sectionParent.name}${section.name}`; + name = `${sectionParent.name}-${section.name}`; } if (section.stationCode == this.selected.stationCode) { list.push({ name: name, code: section.code }); diff --git a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue index a77c1b0f3..b237878a1 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue @@ -69,13 +69,13 @@ - + - - + + @@ -136,7 +136,7 @@ export default { confirmAlarm(this.$route.query.group, codes).then(resp => { this.queryData(true); }).catch(() => { - EventBus.$emit('sendMsg', {message: '确认消息失败！'}); + EventBus.$emit('sendMsg', {message: '确认消息失败！'}); }); }, handleDeviceName(code) { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue index a90d5d51f..0b1dfa61d 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue @@ -138,6 +138,11 @@ export default { }, getDisabled(code, type) { const newStation = this.$store.getters['map/getDeviceByCode'](code); + const centralizedStationCode = this.stationCentralizedMap[code]; + const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); + if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') { + return true; + } if (type === 'apply') { return newStation.controller === this.memberId; } else if (type === 'release') { @@ -155,7 +160,11 @@ export default { }, applyAll() { this.tableData.forEach(item => { - if (item.controller !== this.memberId) { + const centralizedStationCode = this.stationCentralizedMap[item.code]; + const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); + if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') { + item.apply = false; + } else if (item.controller !== this.memberId) { item.apply = true; } }); @@ -167,7 +176,11 @@ export default { }, releaseAll() { this.tableData.forEach(item => { - if (item.controller === this.memberId) { + const centralizedStationCode = this.stationCentralizedMap[item.code]; + const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); + if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') { + item.apply = false; + } else if (item.controller === this.memberId) { item.release = true; } }); diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index 801f84396..0073bad6f 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -5,7 +5,7 @@ {{ item.name }} - +
{{ $t(item.name) }} @@ -14,7 +14,7 @@
- {{el.name}} + {{ el.name }} @@ -58,7 +58,7 @@ export default { handle: this.goEmpty, isHelp:true, style:'padding-right:0px;', - hidden:getSessionStorage('project').endsWith('heb') + hidden: CaseHideProjectList.includes(getSessionStorage('project')) }, { name: 'global.scan', // 扫码 @@ -75,28 +75,28 @@ export default { handle: this.switchLanguage, hidden: false, tip: true + } + // { + // name: 'global.help', + // handle: this.goToHelp, + // hidden: getSessionStorage('project').endsWith('heb') + // } + + ], + caseList: [ + { + name: '西安铁路职业技术学院', + url: 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf' }, { - name: 'global.help', - handle: this.goToHelp, - hidden: getSessionStorage('project').endsWith('heb') + name: '贵州装备制造职业学院', + url: 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf' + }, + { + name: '江苏电子信息职业学院', + url: 'https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf' } - - ], - caseList: [ - { - name: '西安铁路职业技术学院', - url: 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf' - }, - { - name: '贵州装备制造职业学院', - url: 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf' - }, - { - name: '江苏电子信息职业学院', - url: 'https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf' - } - ], + ], stomp: null, header: null, lang: 'zh' @@ -108,10 +108,6 @@ export default { }, project() { return getSessionStorage('project'); - }, - isShown() { - const project = getSessionStorage('project'); - return !CaseHideProjectList.includes(project); } }, watch: { diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index c63275bcf..cf77e2fc6 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -474,9 +474,9 @@ export const ProjectCode = { }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 底部栏仅展示公司信息不展示备案号 export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy']; // 实训设计平台通过项目code获取地图列表的项目 -export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目 +export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示 -export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 登录页右下角主体不展示 +export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb']; @@ -513,9 +513,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台 ntyl: '/design/login?project=ntyl', designntyl: '/login?project=ntyl', ntyc: '/design/login?project=ntyc', - designntyc: '/login?project=ntyc', - cgy: '/design/login?project=cgy', - designcgy: '/login?project=cgy' + designntyc: '/login?project=ntyc' + // cgy: '/design/login?project=cgy', + // designcgy: '/login?project=cgy' }; export const ProjectList = [ {value:'xty', label:'西铁院'}, diff --git a/src/views/newMap/newMapdraft/mapoperate/line.vue b/src/views/newMap/newMapdraft/mapoperate/line.vue index db9677c0a..74b1b7d99 100644 --- a/src/views/newMap/newMapdraft/mapoperate/line.vue +++ b/src/views/newMap/newMapdraft/mapoperate/line.vue @@ -119,7 +119,7 @@ export default { { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }, { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList }, { prop: 'offsetX', label: '右侧设备X偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine }, - { prop: 'offsetY', label: '左侧设备Y偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine } + { prop: 'offsetY', label: '右侧设备Y偏移:', type: 'number', min: 0, isHidden: !this.isFoldLine } ] }, map: { diff --git a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue index 4cc5e0235..7b01d6e01 100644 --- a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue +++ b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue @@ -487,17 +487,13 @@ export default { addStartSectionData(isStation) { if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') { this.isStartSelected = true; - const result = this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation); - return result; + this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation); } - return false; }, addEndSectionData(isStation) { if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') { - const result = this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation); - return result; + this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation); } - return false; }, buildModel(code) { const model = Object.assign({}, this.addModel);