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

Merge remote-tracking branch 'remotes/origin/test'

Browse Source
This commit is contained in:
lVAL 2021-02-23 18:23:37 +08:00
commit fa4b30b08e
8 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/langs/en/planMonitor.js
View File

@ -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',

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

@ -215,7 +215,7 @@ export default {
addTaskHint1: '请先设置开始区段',
addTaskHint2: '终到区段',
addTaskHint3: '的站间运行时间',
normalNew: '正常新建',
normalNew: '新建',
runGraphName: '运行图名称',
createFromTheReleaseRunGraph: '从发布运行图创建',
releaseRunGraph: '发布运行图',

1
src/jmapNew/shape/Station/EStationText.js
View File

@ -83,7 +83,6 @@ class EStationText extends Group {
setBackground(color) {
const style = this.model.style;
if (style.Station.StationControl.disPlayNone) {
console.log('///////////');
this.stationName.setStyle('textBackgroundColor', color);
this.subheadText && this.subheadText.setStyle('textBackgroundColor', color);
}

2
src/jmapNew/shape/Station/index.js
View File

@ -568,7 +568,7 @@ export default class Station extends Group {
handleComplexControl(controller) {
// const controller = model.controller;
const memberData = store.state.training.memberData;
console.log(controller, memberData[controller], memberData[controller].userId, store.state.user.id, '88888888');
// console.log(controller, memberData[controller], memberData[controller].userId, store.state.user.id, '88888888');
if (memberData[controller].userId && memberData[controller].userId == store.state.user.id) {
this.stationText.setColor(this.style.Station.stationText.currentModeColor);
} else {

8
src/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi.vue
View File

@ -69,13 +69,13 @@
</el-table-column>
<el-table-column prop="confirmedUserName" label="确认人编号" width="120px" />
<el-table-column prop="confirmTime" label="确认时间" width="150px" />
<el-table-column prop="recoverTime" label="恢复">
<el-table-column prop="recovered" label="恢复">
<template slot-scope="scope">
<span>{{ scope.row.recovered? 'Y':'N' }}</span>
</template>
</el-table-column>
<el-table-column prop="address" label="恢复时间" />
<el-table-column prop="address" label="备注信息" width="200px" />
<el-table-column prop="recoverTime" label="恢复时间" width="150px" />
<el-table-column prop="address" label="备注信息" width="100px" />
</el-table>
</div>
</el-dialog>
@ -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) {

18
src/views/newMap/mapsystemNew/index.vue
View File

@ -48,8 +48,7 @@ export default {
'$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
this.mapBoxP = document.getElementById(this.canvasId).children[0];
this.mapBoxP.style.cursor = '';
this.initMemberUserInfo();
this.subscribe();
this.initMemberUserInfo(true);
},
'$store.state.socket.memberChangeCount': function () { // 仿真成员变更
this.initMemberUserInfo();
@ -164,18 +163,21 @@ export default {
}
}, 1000);
},
initMemberUserInfo() {
initMemberUserInfo(isFirst = false) {
// 获取仿真成员列表
getSimulationMemberList(this.$route.query.group).then(resp => {
this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.$store.state.user.id });
getAllSimulationUser(this.$route.query.group).then(resp => {
this.$store.dispatch('training/setSimulationUserList', resp.data);
if (isFirst) {
this.subscribe();
}
}).catch(() => {
this.$messageBox('获取所有仿真用户失败！');
});
}).catch(() => {
this.$messageBox('获取仿真成员列表失败！');
});
getAllSimulationUser(this.$route.query.group).then(resp => {
this.$store.dispatch('training/setSimulationUserList', resp.data);
}).catch(() => {
this.$messageBox('获取所有仿真用户失败！');
});
},
handlerMemberOnOff(data) {
this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: data, userId: this.userId });

2
src/views/newMap/newMapdraft/mapoperate/line.vue
View File

@ -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: {

8
src/views/planMonitor/editTool/routingoperate/routeConfig.vue
View File

@ -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);