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

调整综合监控流程

Browse Source
This commit is contained in:
zyy 2020-10-26 15:24:08 +08:00
parent f99eea7aa1
commit cdf91f98d2
4 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/map.js
View File

@ -256,7 +256,6 @@ class Jlmap {
} else {
elem['points'] = { x: model.points[model.points.length - 1].x, y: model.points[model.points.length - 1].y };
}
console.log(elem, 'overAp');
}
// const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
const oDevice = deviceFactory(type, elem, this.showConfig);

49
src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
View File

@ -128,18 +128,47 @@ export default {
},
// 固定关联关系 模块变化
relevance() {
let model = {};
// valve true 变绿 false 红色
if (this.model.code == 'group_2' || this.model.code == 'group_52') {
model = this.$iscs.iscsDevice['group_23'].model;
model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
} else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
model = this.$iscs.iscsDevice['group_15'].model;
model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
let time = 0;
let modelRelevance = {};
if (this.model.code == 'group_2' && this.model['valve']) {
modelRelevance = this.$iscs.iscsDevice['group_34'].model;
modelRelevance['valve'] = this.model['valve'];
} else if (this.model.code == 'group_52' && this.model['valve']) {
modelRelevance = this.$iscs.iscsDevice['group_22'].model;
modelRelevance['valve'] = this.model['valve'];
}
if (model && model.code) {
this.handleModel(model);
if (modelRelevance && modelRelevance.code) {
this.handleModel(modelRelevance);
time = 1500;
}
setTimeout(() => {
let model = {};
// valve true 变绿 false 红色
if (this.model.code == 'group_2' || this.model.code == 'group_52') {
model = this.$iscs.iscsDevice['group_23'].model;
model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
} else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
model = this.$iscs.iscsDevice['group_15'].model;
model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
}
if (model && model.code) {
this.handleModel(model);
time = 1500;
}
setTimeout(() => {
if (this.model.code == 'group_2' && !this.model['valve']) {
modelRelevance = this.$iscs.iscsDevice['group_34'].model;
modelRelevance['valve'] = this.model['valve'];
} else if (this.model.code == 'group_52' && !this.model['valve']) {
modelRelevance = this.$iscs.iscsDevice['group_22'].model;
modelRelevance['valve'] = this.model['valve'];
}
if (modelRelevance && modelRelevance.code) {
this.handleModel(modelRelevance);
}
}, time);
}, time);
},
// 执行操作
handleModel(model) {

2
src/views/newMap/displayNew/demonMenu.vue
View File

@ -15,7 +15,7 @@
<!-- 故障设备视图 -->
<el-button v-if="jlmap3dFaultShow" size="small" @click="jumpjlmap3dFault">故障设备</el-button>
<!-- 司机视角 -->
<el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">{{ $t('joinTraining.driverPerspective') }}</el-button>
<el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">司机视角</el-button>
<!-- 排班计划 -->
<el-button v-if="scheduleLoadShow" type="primary" size="small" @click="jumpScheduling">派班计划加载</el-button>
<el-button v-if="schedulePreviewShow" type="primary" size="small" @click="schedulingView">派班计划预览</el-button>

1
src/views/newMap/displayNew/menuDemon.vue
View File

@ -181,6 +181,7 @@ export default {
} else {
this.userRole = 'AUDIENCE';
}
console.log(this.$route.query.prdType, '=======');
},
beforeDestroy() {
if (this.time) {