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-11-04 16:32:19 +08:00 committed by fan
parent 6b5700b394
commit 3cc7003085
6 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iscs/shape/text.js
View File

@ -66,7 +66,7 @@ export default class text extends Group {
this.model.point.y += dy;
}
setState(model) {
this.textName.setStyle('text', model.context);
model.context && this.textName.setStyle('text', model.context);
model.gbColor && this.textName.setStyle('textBackgroundColor', model.gbColor);
}
setSize(width, height) {

2
src/utils/baseUrl.js
View File

@ -5,7 +5,7 @@ export function getBaseUrl() {
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.114:9000'; // 旭强
// BASE_API = 'http://192.168.3.175:9000'; // 张赛
// BASE_API = 'http://192.168.8.109:9000'; // 张赛
// BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

6
src/views/iscs/iscsDraw/icscComponents/text.vue
View File

@ -1,11 +1,11 @@
<template>
<div style="overflow-y: scroll;height: calc(100% - 46px); width: 100%;">
<el-form ref="form" :rules="rules" :model="form" label-width="120px" style="width: 100%;padding: 10px 50px;">
<!-- <el-form-item label="code:" prop="code">
<el-form-item label="code:" prop="code">
<el-select v-model="form.code">
<el-option v-for="(item, index) in iscs.iscsTextList" :key="index" :label="item.code" :value="item.code" />
<el-option v-for="(item, index) in iscs.iscsTextList" :key="index" :label="item.code" :value="item.code" disabled />
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item label="文字内容:" prop="context">
<el-input v-model="form.context" type="textarea" size="small" />
</el-form-item>

11
src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue
View File

@ -173,6 +173,17 @@ export default {
device.instance.setState(el);
}
});
if (model.code == 'group_34' || model.code == 'group_22') {
const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
const device = this.$iscs.iscsDevice[code];
if (device && device.instance) {
device.instance.setState({
gbColor: judge ? '#2aff00' : '#ff0000'
});
}
});
}
}
}
};

13
src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
View File

@ -144,7 +144,7 @@ export default {
let models = {};
// valve true 变绿 false 红色
if (model.code == 'group_2' || model.code == 'group_52') {
models = this.$iscs.iscsDevice['group_23'].model;
models = this.$iscs.iscsDevice['group_54'].model;
models['valve'] = false;
} else if (model.code == 'group_3' || model.code == 'group_16') {
models = this.$iscs.iscsDevice['group_15'].model;
@ -213,6 +213,17 @@ export default {
this.$store.dispatch('iscs/setAddAlarmList', params);
this.$store.dispatch('iscs/setAddIncidentList', params);
}
if (model.code == 'group_34' || model.code == 'group_22') {
const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
const device = this.$iscs.iscsDevice[code];
if (device && device.instance) {
device.instance.setState({
gbColor: judge ? '#2aff00' : '#ff0000'
});
}
});
}
},
filterTime() {
const date = new Date();

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

@ -188,7 +188,7 @@ export default {
let model = {};
// valve true 变绿 false 红色
if (this.model.code == 'group_2' || this.model.code == 'group_52') {
model = this.$iscs.iscsDevice['group_23'].model;
model = this.$iscs.iscsDevice['group_54'].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;
@ -281,6 +281,17 @@ export default {
arrList.push(item);
});
this.$store.commit('iscs/setFaultList', arrList);
if (model.code == 'group_34' || model.code == 'group_22') {
const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
const device = this.$iscs.iscsDevice[code];
if (device && device.instance) {
device.instance.setState({
gbColor: judge ? '#2aff00' : '#ff0000'
});
}
});
}
},
doClose() {
this.dialogShow = false;