joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
sunzhenyu 2021-11-30 16:22:43 +08:00
commit 8bf9d272d5
12 changed files with 129 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -96,7 +96,7 @@ class SkinCode extends defaultStyle {
faultLockColor: '#00FF00', // 区段故障锁定颜色
invalidColor: '#ff0000', // 计轴故障
invalidColor: '', // 计轴故障
undefinedColor: '#0071C1', // 区段未定义颜色
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色

13
src/jmapNew/shape/graph/Section/ELines.js
View File

@ -408,8 +408,15 @@ export default class ELines extends Group {
}
}
setCrossBlock() {
this.crossSection && this.crossSection.setStyle({fill:this.model.style.Section.cross.centerSquare.blockColor});
setCrossBlock(routeLock) {
this.centerSquare && this.centerSquare.setStyle({fill:this.model.style.Section.cross.centerSquare.blockColor});
if (routeLock) {
this.centerSquare && this.centerSquare.animateStyle(true)
.when(0, { fill: this.model.style.Section.cross.centerSquare.blockColor })
.when(1000, { fill: this.model.style.backgroundColor })
.when(2000, { fill: this.model.style.Section.cross.centerSquare.blockColor })
.start();
}
}
setCrossUnBlock() {
this.crossSection && this.crossSection.setStyle({fill:this.model.style.Section.cross.centerSquare.defaultColor});
@ -582,6 +589,8 @@ export default class ELines extends Group {
recover() {
this.section && this.section.show();
this.centerSquare && this.centerSquare.stopAnimation(true);
this.centerSquare && this.centerSquare.setStyle({fill: this.model.style.Section.cross.centerSquare.defaultColor});
}
setState() {

25
src/jmapNew/shape/graph/Section/index.js
View File

@ -198,16 +198,17 @@ export default class Section extends Group {
stroke: this.style.Section.line.communicationOccupiedColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
this.line.setCrossRouteLock();
}
this.axle && this.axle.setStyle({
stroke: this.style.Section.line.communicationOccupiedColor,
fill:this.style.Section.line.communicationOccupiedColor
});
if (this.model.parentCode && this.model.type == '01') {
const section = this.mapDevice[this.model.parentCode];
section && section.instance && section.instance.line.setCrossRouteLock();
}
// if (this.model.parentCode && this.model.type == '01') {
// const section = this.mapDevice[this.model.parentCode];
// section && section.instance && section.instance.line.setCrossRouteLock();
// }
}
closeSection() {
if (this.line) {
@ -225,6 +226,7 @@ export default class Section extends Group {
stroke: this.style.Section.line.unCommunicationOccupiedColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
this.line.setCrossRouteLock();
}
this.axle && this.axle.setStyle({
stroke: this.style.Section.line.unCommunicationOccupiedColor,
@ -234,10 +236,10 @@ export default class Section extends Group {
this.name.setStyle({ textFill: this.style.Section.name.occupyColor });
}
if (this.model.parentCode && this.model.type == '01') {
const section = this.mapDevice[this.model.parentCode];
section && section.instance && section.instance.line.setCrossRouteLock();
}
// if (this.model.parentCode && this.model.type == '01') {
// const section = this.mapDevice[this.model.parentCode];
// section && section.instance && section.instance.line.setCrossRouteLock();
// }
}
/** ARB故障 */
invalid() {
@ -245,7 +247,7 @@ export default class Section extends Group {
return;
}
this.line && this.line.setStyle({
this.style.Section.line.invalidColor && this.line && this.line.setStyle({
stroke: this.style.Section.line.invalidColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
@ -290,7 +292,7 @@ export default class Section extends Group {
});
}
if (this.style.Section.cross && this.model.type == '05') {
this.line.setCrossBlock();
this.line.setCrossBlock(routeLock);
}
if (this.style.Section.block && this.style.Section.block.blockGlint && this.line && this.model.type !== '03') {
this.line.animateStyle(true, [
@ -388,6 +390,9 @@ export default class Section extends Group {
this.sectionMiddle && this.sectionMiddle.setStyle({stroke: this.style.Section.sectionMiddle.preResetColor});
this.sectionMiddle && this.sectionMiddle.show();
}
if (this.model.type == '05') {
this.line && this.line.setCross({fill: this.style.Section.sectionMiddle.preResetColor});
}
}
// 延时解锁
delayUnlock() {

2
src/jmapNew/shape/graph/Signal/index.js
View File

@ -995,7 +995,7 @@ class Signal extends Group {
// 只响应前端自定义类型的状态变化
if (this.model.showMode === '05') {
this.eachChild(item => { item.hide(); });
} if (!store.getters['map/checkDeviceShow'](this._code)) {
} else if (!store.getters['map/checkDeviceShow'](this._code)) {
this.eachChild(item => { item.hide(); });
} else if (model._free) {
this.setAshShow();

6
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -234,9 +234,9 @@ export default {
{label: '反位短闪', value: 'REVERSE_SPLIT'},
{label: '长闪', value: 'SQUEEZE'},
{label: '道岔区段灰显', value: 'SECTION_NO_STATUS'},
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
{label: '红光带故障', value: 'AXLE_FAULT'},
{label: '橙光带故障', value: 'ARB'}
{label: '红光带故障', value: 'CBTC_OCCUPIED_FAULT'},
{label: '紫光带故障', value: 'AXLE_FAULT'},
{label: '计轴受扰', value: 'ARB'}
];
} else if (selected._type === 'Server' && this.popClass === 'nanjing-02__systerm') {
this.faultList = [

19
src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
View File

@ -9,6 +9,7 @@
<notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
<stand-back-strategy ref="standBackStrategy" />
<set-fault ref="setFault" pop-class="fuzhou-01__systerm" />
<psl ref="psl" pop-class="xian-01__systerm" />
</div>
</template>
@ -22,6 +23,7 @@ import StandStopTime from './dialog/standStopTime';
import StandDetainTrainAll from './dialog/standDetainTrainAll';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
@ -39,7 +41,8 @@ export default {
StandBackStrategy,
StandStopTime,
StandDetainTrainAll,
SetFault
SetFault,
Psl
},
props: {
selected: {
@ -198,6 +201,16 @@ export default {
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
// 非故障模式 且 角色为车站值班员时 增加PSL盘
if (this.operatemode !== OperateMode.FAULT && this.$store.state.training.prdType === '01') {
this.menu = [
...this.menu,
{
label: 'PSL',
handler: this.openPsl
}
];
}
// this.menu = MenuContextHandler.covert(this.menu);
},
@ -334,6 +347,10 @@ export default {
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
},
// 打开PSL面板
openPsl() {
this.$refs.psl.doShow(this.selected);
}
}
};

1
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -1103,6 +1103,7 @@ export default {
this.securityCommand = '';
this.speedLimitValue = '';
this.secondConfirm = false;
this.dialogVisible = false;
this.overlap = null;
this.cr1Confrim = false;
if (this.oldClickObj) {

10
src/layout/components/Navbar.vue
View File

@ -82,6 +82,7 @@ import UserLogout from './Logout';
import QuickEntry from './Entry';
import SystemTitle from './Title';
import {getSessionStorage } from '@/utils/auth';
import { ThirdLoginList } from '@/scripts/ProjectConfig';
export default {
components: {
@ -94,15 +95,17 @@ export default {
routes: [],
isShow: false,
activePath: '',
index: '',
thirdLogin:''
index: ''
};
},
computed: {
...mapGetters([
'avatar',
'routers'
])
]),
thirdLogin() {
return ThirdLoginList.includes(getSessionStorage('project'));
}
},
watch: {
@ -115,7 +118,6 @@ export default {
}
},
mounted() {
this.thirdLogin = getSessionStorage('project') == 'richor';
this.routes = this.$router.options.routes;
if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
this.activePath = '/design/usermap/home';

76
src/scripts/ProjectConfig.js
View File

@ -57,6 +57,7 @@ export const loginInfo = {
systemType: '011'
},
xzexam:{
<<<<<<< HEAD
title: '城市轨道交通标准化培训软件',
loginPath: '/login?project=xzexam',
loginParam: 'DEFAULT',
@ -66,6 +67,16 @@ export const loginInfo = {
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
systemType: '011'
=======
title: '城市轨道交通标准化培训软件',
loginPath: '/login?project=xzexam',
loginParam: 'DEFAULT',
loginTitle: '空串',
logoWidth: '140px',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px',
systemType: '011'
>>>>>>> c33502b31addf90a7737e6845b983e598c590404
},
bjd: {
title: '城市轨道交通列车运行智慧辅助系统',
@ -543,7 +554,31 @@ export const loginInfo = {
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '025'
systemType: '024'
},
designrichorygy: {
title: '扬州工业职业技术学院城市轨道交通设计平台',
loginPath: '/design/login?project=richorygy',
bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
loginParam: 'RICHOR_YGY',
linkIcon: FaviconRichor,
titleIcon: FaviconRichor,
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '011'
},
richorygy: {
title: '扬州工业职业技术学院城市轨道交通实训平台',
loginPath: '/login?project=richorygy',
bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
loginParam: 'RICHOR_YGY',
linkIcon: FaviconRichor,
titleIcon: FaviconRichor,
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '011'
},
designjxgm: {
title: '江西工业贸易职业技术学院城市轨道交通设计平台',
@ -635,7 +670,9 @@ export const ProjectIcon = {
srsandbox: FaviconRichor,
designsrsandbox:FaviconRichor,
jxgm: FaviconRichor,
designjxgm: FaviconRichor
designjxgm: FaviconRichor,
richorygy: FaviconRichor,
designrichorygy: FaviconRichor
};
export const ProjectCode = {
@ -678,26 +715,43 @@ export const ProjectCode = {
designsrsandbox: 'SR_SANDBOX',
jxgm: 'JXGM',
designjxgm: 'JXGM',
richorygy: 'RICHOR_YGY',
designrichorygy: 'RICHOR_YGY',
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 ThirdLoginList = ['richor', 'designrichor', 'richorygy', 'designrichorygy'];
/** 底部栏仅展示公司信息不展示备案号 */
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', 'richorygy',
'designrichorygy'];
/** 实训设计平台通过项目code获取地图列表的项目 */
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', 'jxgm', 'designjxgm']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm',
'richorygy', 'designrichorygy'];
/** 案例展示隐藏的项目 */
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', 'jxgm', 'designjxgm','xzexam']; // 登录页右下角版本开发基于不展示
'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy'];
/** 登录页右下角主体不展示 */
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', 'jxgm', 'designjxgm','xzexam']; // 登录页右下角主体不展示
'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy'];
/** 登录页项目 title 登录输入框上方 大字体 加粗居中 */
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', 'jxgm', 'designjxgm','xzexam']; // 登录页样式
'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam',
'richorygy', 'designrichorygy'];
/** 登录页 登录输入框无二维码 */
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
/** 综合演练 无二维码 */
export const NoSimulationQrCodeList = ['heb', 'bjd'];
export const RegisterCodeList = ['cgy', 'designcgy'];
export const goOtherPlatformMenu = { // 导航栏快速切换平台
/** 导航栏快速切换平台 */
export const goOtherPlatformMenu = {
login: '/design/login',
design: '/login',
xty: '/design/login?project=xty',
@ -762,8 +816,10 @@ export const ProjectList = [
{value: 'richor_joint', label: '中航锐创（实训室）'},
{value: 'nologo', label: '无logo' },
{value: 'sr_sandbox', label: '上饶沙盘'},
{value: 'jxgm', label: '江西工贸' }
{value: 'jxgm', label: '江西工贸' },
{value: 'richor_ygy', label: '扬州工业'}
];
/** 本地项目打包 */
export const localPackageProject = {
localdesign: 'designheb',
locallogin: 'heb',

2
src/views/newMap/displayBaSiDi/troDetail.vue
View File

@ -141,7 +141,7 @@ export default {
const station = this.stationList.find((item) => {
return item.sn === stationSn;
});
if (station.depot) {
if (station && station.depot) {
this.changeStation(value * 2);
} else if (station) {
this.deviceCode = station.code;

4
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -148,7 +148,7 @@ export default {
{ prop: 'roadType', label: '线路类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.sectionRoadTypeList, clearable: true, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType, deviceChange: this.roadTypeChange },
{ prop: 'leftSectionCode', label: this.$t('map.leftAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'leftSection', buttonShowType: this.isLeftSectionButtonShow, isHidden: !this.hasAssociatedSection }, // 左关联区段
{ prop: 'rightSectionCode', label: this.$t('map.rightAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'rightSection', buttonShowType: this.isRightSectionButtonShow, isHidden: !this.hasAssociatedSection }, // 右关联区段
{ prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode }, // 所属物理/道岔区段code
{ prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isCrossSectionType, options: this.sectionList, isHidden: !this.isParentCode }, // 所属物理/道岔区段code
{ prop: 'sepTypeLeft', label: this.$t('map.sepTypeLeft'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType },
{ prop: 'sepTypeRight', label: this.$t('map.sepTypeRight'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType },
{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint, lastDisabled: true },
@ -332,7 +332,7 @@ export default {
return this.hasAssociatedSection && this.editModel.rightAxlePosition;
},
isParentCode() {
return this.editModel.type == '02' || this.editModel.type == '03' || (this.editModel.type == '01' && this.editModel.parentCode);
return this.editModel.type == '02' || this.editModel.type == '03' || (this.editModel.type == '01' && this.editModel.parentCode) || this.editModel.type == '05';
},
isstandTrackNameShow() {
return this.editModel.type == '01' && this.editModel.standTrack;

6
src/views/system/deviceManage/index.vue
View File

@ -45,7 +45,8 @@ export default {
{label: '苏电院', value:'SDY'},
{ label: '中航锐创（实训室）', value: 'RICHOR_JOINT' },
{label: '上饶沙盘', value: 'SR_SANDBOX'},
{label: '江西工贸', value: 'JXGM'}
{label: '江西工贸', value: 'JXGM'},
{label: '扬州工业', value: 'RICHOR_YGY'}
],
projectMap: {
designxty: 'XTY',
@ -54,7 +55,8 @@ export default {
designsdy: 'SDY',
designrichorjoint: 'RICHOR_JOINT',
designsrsandbox: 'SR_SANDBOX',
designjxgm: 'JXGM'
designjxgm: 'JXGM',
designygy: 'RICHOR_YGY'
},
queryForm: {
labelWidth: '120px',