{{ $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:'西铁院'},
From 68cbbbab991dc919f150fbbbebe02ac2dad4f070 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 24 Feb 2021 10:21:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=EF=BC=9A?=
=?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9=E9=99=90=E5=88=B6=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ningbo_01/menus/menuDialog/areaSelection.vue | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
index ed1c52d1f..0b1dfa61d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
@@ -140,6 +140,9 @@ export default {
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') {
@@ -157,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;
}
});
@@ -169,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;
}
});
From b47cff956a30d5d0fcce46e3b0bfb78bd11df5c2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 24 Feb 2021 10:43:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=20=E6=8E=A7=E5=88=B6=E6=9D=83=E8=BD=AC=E7=A7=BB=20?=
=?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/shape/Station/EStationText.js | 5 ++
src/jmapNew/shape/Station/index.js | 13 ++++++
src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 14 +++++-
.../menus/menuDialog/stationRequest.vue | 3 +-
.../menus/menuDialog/stationTransfer.vue | 46 ++++++++++---------
5 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/src/jmapNew/shape/Station/EStationText.js b/src/jmapNew/shape/Station/EStationText.js
index cca7d4fb4..9350b2f67 100644
--- a/src/jmapNew/shape/Station/EStationText.js
+++ b/src/jmapNew/shape/Station/EStationText.js
@@ -88,6 +88,11 @@ class EStationText extends Group {
}
}
+ setFlash() {
+ this.stopAnimate();
+ this.stationName.animateStyle(true).when(500, {opacity: 1}).when(1000, {opacity: 0}).when(1500, {opacity: 1}).start();
+ }
+
getBoundingRect() {
return this.stationName.getBoundingRect();
}
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 7ce68abdb..0df2402d5 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -503,6 +503,7 @@ export default class Station extends Group {
// if()
this.stationText.setColor(this.style.Station.stationText.noneModeColor);
this.stationText.setBackground(this.style.Station.stationText.defaultBackColor);
+ this.stationText && this.stationText.stopAnimate();
// sationEle.controller
} else {
this.stationText && this.stationText.stopAnimate();
@@ -529,6 +530,8 @@ export default class Station extends Group {
model.preResetValidDuration && this.handlePreResetLamp();
model.controller && this.handleComplexControl(model.controller);
model.emergencyController && this.handleEmergencyController();
+ // model.controlApplicant
+ model.controlApplicant && this.handleControlApplicant(model);
if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller || model.emergencyController) && model.centralized) {
model.chargeStationCodeList.forEach(item => {
const device = store.getters['map/getDeviceByCode'](item);
@@ -559,6 +562,16 @@ export default class Station extends Group {
this.controlPreReset && this.controlPreReset.setColor('#f00');
}
+ handleControlApplicant(model) {
+ // const controlApplicant = model.controlApplicant;
+ if (this.style.Station.stationText.isSpecialType) {
+ const memberData = store.state.training.memberData;
+ if (memberData[model.controller].userId == store.state.user.id ) {
+ this.stationText.setFlash();
+ }
+ }
+ }
+
handleEmergencyController() {
if (this.style.Station.stationText.isSpecialType) {
this.stationText.setBackground(this.style.Station.stationText.emergencyBackColor);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index 7f680d741..3caf01371 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -344,7 +344,7 @@ export default {
},
{
title: '跳停',
- operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
+ operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
click: this.setJumpStop
},
{
@@ -1346,6 +1346,9 @@ export default {
// if (list && list.length) {
this.checkRoleChange(oldval, newval);
// }
+ },
+ '$store.state.menuOperation.selectedCount': function (val) {
+ this.selectedChange();
}
},
@@ -1361,6 +1364,13 @@ export default {
});
},
methods: {
+ selectedChange() {
+ const model = this.$store.state.menuOperation.selected;
+ if (model && model._type && model._type == 'Station' && model.controlApplicant) {
+ const item = {operate: OperationEvent.Command.commandNingBo3.line_stand_transfer};
+ this.authorizeTransfer(item);
+ }
+ },
checkRoleChange(oldval, newval) {
this.$nextTick(()=>{
const memberData = this.$store.state.training.memberData;
@@ -1374,7 +1384,7 @@ export default {
const oldStation = this.$store.getters['map/getDeviceByCode'](oldMember.deviceCode);
const newStation = this.$store.getters['map/getDeviceByCode'](newMember.deviceCode);
if (oldStation.controller || newStation.controller) {
- console.log(9999999999, oldStation.controller, newStation.controller);
+ // console.log(9999999999, oldStation.controller, newStation.controller);
if (newStation.controller) {
let centerStation;
if (newStation.centralized) {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
index e8502c734..f2f4d9858 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
@@ -2,7 +2,7 @@