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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2020-08-31 13:27:38 +08:00
commit c44a081afa
11 changed files with 67 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/langs/zh/display.js
View File

@ -52,7 +52,7 @@ export default {
exitPlan: '退出计划',
initialize: '初始化',
back: '返回',
threeDimensionalView: '三维视图',
threeDimensionalView: '数字沙盘',
threeDimensionalStation: '三维车站',
passengerflow: 'cctv视图',
maintainer: '设备故障视图',

2
src/jmapNew/shape/Train/TrainBodyBox.js
View File

@ -41,7 +41,7 @@ export default class TrainBodyBox extends Group {
buckleTrain() {
if (this.trainBodyBox) {
this.trainBodyBox.setStyle('fill', 'yellow');
if (this.model.speed) { // 列车停稳状态下开始闪烁
if (!this.model.speed) { // 列车停稳状态下开始闪烁
this.trainBodyBox.animateStyle(true)
.when(0, { fill: this.model.style.backgroundColor })
.when(1000, { fill: 'yellow' })

13
src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
View File

@ -197,17 +197,20 @@ export default {
const sectionList = this.$store.getters['map/sectionList'];
if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => {
if (elem.isSwitchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示
// if (elem.switchSection && elem.parentCode) {
// // 道岔轨的区段名称默认不显示
// nameShow = false;
if (elem.type != '03') {
nameShow = false;
} else {
if (elem.type === '01') {
// 计轴区段名称
nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') {
// 轨道轨名称
// 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') {
// 道岔区段名称
} else if (elem.type === '04') {
// 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1;
}
}

14
src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
View File

@ -197,18 +197,20 @@ export default {
if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => {
elem._type = deviceType.Section;
if (elem.isSwitchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示
// if (elem.switchSection && elem.parentCode) {
// // 道岔轨的区段名称默认不显示
// nameShow = false;
if (elem.type != '03') {
nameShow = false;
} else {
if (elem.type === '01') {
// 计轴区段名称
// 计轴区段名称
nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') {
// 轨道轨名称
// 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') {
// 道岔区段名称
} else if (elem.type === '04') {
// 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1;
}
}

2
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -563,7 +563,7 @@ export default {
minDuration: 5,
operateType: 'Signal_Reopen_Signal',
skinCode: '06',
trainingName: '信号重开({3} 进路)',
trainingName: '信号重开({5})',
trainingRemark: '信号重开功能',
trainingType: 'Signal',
productTypes: ['01', '02'],

14
src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
View File

@ -199,18 +199,20 @@ export default {
if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => {
elem._type = deviceType.Section;
if (elem.isSwitchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示
// if (elem.switchSection && elem.parentCode) {
// // 道岔轨的区段名称默认不显示
// nameShow = false;
if (elem.type == '03') {
nameShow = false;
} else {
if (elem.type === '01') {
// 计轴区段名称
// 计轴区段名称
nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') {
// 轨道轨名称
// 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') {
// 道岔区段名称
} else if (elem.type === '04') {
// 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1;
}
}

9
src/jmapNew/theme/xian_02/menus/menuCancel.vue
View File

@ -1,6 +1,7 @@
<template>
<div>
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" />
<notice-info ref="noticeInfo" pop-class="xian-02__system" />
</div>
</template>
@ -9,11 +10,13 @@ import PopMenu from '@/components/PopMenu/index';
import { mapGetters } from 'vuex';
import { DeviceMenu } from '@/scripts/ConstDic';
import deviceType from '@/jmapNew/constant/deviceType';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'CancelMenu',
components: {
PopMenu
PopMenu,
NoticeInfo
},
data() {
return {
@ -243,10 +246,12 @@ export default {
if (requestList.length) {
this.commitEachCommand(requestList);
}
} else {
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.loading = false;
// this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
}
}

7
src/jmapNew/theme/xian_02/menus/menuRequest.vue
View File

@ -27,6 +27,7 @@
<el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">取消请求</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="xian-02__system" />
</div>
</div>
</template>
@ -35,10 +36,12 @@
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import deviceType from '@/jmapNew/constant/deviceType';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'CancelMenu',
components: {
NoticeInfo
},
data() {
return {
@ -148,10 +151,12 @@ export default {
if (requestList.length) {
this.commitEachCommand(requestList);
}
} else {
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.loading = false;
// this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
}
}

5
src/store/modules/map.js
View File

@ -61,7 +61,10 @@ function queryDeleteModels(state, device, dict) {
}
}
copyModel.relSwitchCode = '';
// 旧版地图 判断是否道岔区段为isSwitchSection，新版地图已经更换为switchSection
// 此处为了兼容旧版，暂时没有删除isSwitchSection，待旧版地图删除之后需要删除isSwitchSection
copyModel.isSwitchSection = false;
copyModel.switchSection = false;
copyModel.type = '01';
dict[elem.code] = copyModel;
}
@ -787,7 +790,7 @@ const map = {
state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
});
state.routeList = routeDataList;
state.routeList = routeDataList;
},
setOverlapData: (state, overlapList) => {
state.overlapData = {};

2
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -13,7 +13,7 @@
<!-- cctv视图 -->
<el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
<el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dfaultdevice">{{ $t('display.demon.maintainer') }}</el-button>
<el-button v-if="isAdmin" size="small" @click="otherVrView">通号行为视角</el-button>
<!-- <el-button v-if="isAdmin" size="small" @click="otherVrView">VR第三人称视角</el-button> -->
<el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
<el-button v-if="isAdmin" size="small" @click="memberManage">成员管理</el-button>
<el-button v-if="isAdmin && isProject" size="small" @click="handleEquipment">设备管理</el-button>

44
src/views/newMap/newMapdraft/mapoperate/index.vue
View File

@ -111,28 +111,28 @@ export default {
return {
lazy: true,
tabList:[
{label:this.$t('map.section'), name:'Section', menus:SectionDraft},
{label:this.$t('map.switch'), name:'Switch', menus:SwitchDraft},
{label:this.$t('map.station'), name:'Station', menus:StationDraft},
{label:this.$t('map.signal'), name:'Signal', menus:SignalDraft},
{label:this.$t('map.platform'), name:'StationStand', menus:StationStandDraft},
{label:this.$t('map.psd'), name:'Psd', menus:PsdDraft},
{label:this.$t('map.platformEmergencyStop'), name:'Esp', menus:EspDraft},
{label:this.$t('map.trainWindow'), name:'TrainWindow', menus:TrainWindowDraft},
{label:this.$t('map.zcZoneControl'), name:'ZcControl', menus:ZcControlDraft},
{label:this.$t('map.functionButton'), name:'ControlDraft', menus:ControlDraft},
{label:this.$t('map.saidLamp'), name:'ControlLamp', menus:ControlLamp},
{label:this.$t('map.train'), name:'Train', menus:TrainDraft},
{label:this.$t('map.line'), name:'Line', menus:LineDraft},
{label:'供电线', name:'Power', menus:PowerDraft},
{label:this.$t('map.text'), name:'Text', menus:TextDraft},
{label:this.$t('map.lcControl'), name:'LcControl', menus:LcControlDraft},
{label:this.$t('map.rectangularBox'), name:'OutFrame', menus:OutFrameDraft},
{label:this.$t('map.image'), name:'Resource', menus:ImageControlDraft},
{label:this.$t('map.boundingBox'), name:'CheckBox', menus:CheckboxDraft},
{label:'站间分隔', name:'SplitStation', menus:SplitStation},
{label:'箭头', name:'Arrow', menus:Arrow},
{label: '防淹门', name: 'FloodGate', menus: FloodGate}
{label: this.$t('map.section'), name:'Section', menus:SectionDraft},
{label: this.$t('map.switch'), name:'Switch', menus:SwitchDraft},
{label: this.$t('map.station'), name:'Station', menus:StationDraft},
{label: this.$t('map.signal'), name:'Signal', menus:SignalDraft},
{label: this.$t('map.platform'), name:'StationStand', menus:StationStandDraft},
{label: this.$t('map.psd'), name:'Psd', menus:PsdDraft},
{label: this.$t('map.platformEmergencyStop'), name:'Esp', menus:EspDraft},
{label: this.$t('map.trainWindow'), name:'TrainWindow', menus:TrainWindowDraft},
{label: this.$t('map.zcZoneControl'), name:'ZcControl', menus:ZcControlDraft},
{label: this.$t('map.functionButton'), name:'ControlDraft', menus:ControlDraft},
{label: this.$t('map.saidLamp'), name:'ControlLamp', menus:ControlLamp},
{label: this.$t('map.train'), name:'Train', menus:TrainDraft},
{label: this.$t('map.line'), name:'Line', menus:LineDraft},
{label: '供电线', name:'Power', menus:PowerDraft},
{label: this.$t('map.text'), name:'Text', menus:TextDraft},
{label: this.$t('map.lcControl'), name:'LcControl', menus:LcControlDraft},
{label: this.$t('map.rectangularBox'), name:'OutFrame', menus:OutFrameDraft},
{label: this.$t('map.image'), name:'Resource', menus:ImageControlDraft},
{label: this.$t('map.boundingBox'), name:'CheckBox', menus:CheckboxDraft},
{label: '站间分隔', name:'SplitStation', menus:SplitStation},
{label: '箭头', name:'Arrow', menus:Arrow},
{label: '防淹门', name: 'FloodGate', menus: FloodGate}
],
selectDevice:'',
enabledTab: 'Section',