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-06-11 14:48:40 +08:00
parent bee7b64e8d
commit 24acb1ba86
8 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/iscs/constant/iscsData.js
View File

File diff suppressed because one or more lines are too long

4
src/iscs/constant/keyboardEvents.js
View File

@ -1,7 +1,7 @@
export const keyboardEvents = {
C: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_C'}, // 绘图复制
V: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_V'} // 绘图粘贴
// DELETE: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Delete'}, // 快捷删除绘图元素
V: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_V'}, // 绘图粘贴
DELETE: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Delete'}, // 快捷删除绘图元素
// ENTER: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Update'} // 快捷修改绘图元素
};

4
src/iscs/shape/bas/jetFan.js
View File

@ -17,6 +17,10 @@ export default class jetFan extends Group {
position: [this.model.point.x, this.model.point.y]
});
this.path = createPathSvg(this.model);
if (this.model.rotate) {
this.grouper.origin = [this.model.width / 2, this.model.width / 2];
this.grouper.rotation = -Math.PI / 180 * Number(this.model.rotate);
}
this.add(this.grouper);
this.grouper.add(this.path);
}

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

@ -38,7 +38,7 @@ export default class Text2 extends Group {
x: model.position.x,
y: model.position.y,
text: content,
textFont: model.font,
fontSize: Number(model.font),
textFill: model.fontColor,
textAlign: 'middle'
}

6
src/views/iscs/iscsDesign/demonList.vue
View File

@ -163,6 +163,12 @@ export default {
mode: 'bas',
id: '28',
type: 'interface'
},
{
name: '隧道通风-射流风机图',
mode: 'bas',
id: '29',
type: 'interface'
}
]
},

1
src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue
View File

@ -117,6 +117,7 @@ export default {
code:'',
isRight:true,
width: 40,
rotate: 0,
x: 10,
y: 10
};

7
src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue
View File

@ -7,6 +7,9 @@
<el-form-item label="图形宽度" prop="width">
<el-input-number v-model="form.width" :min="20" />
</el-form-item>
<el-form-item label="旋转角度" prop="rotate">
<el-input-number v-model="form.rotate" />
</el-form-item>
<el-form-item label="X轴坐标" prop="x">
<el-input-number v-model="form.x" controls-position="right" :min="1" />
</el-form-item>
@ -34,6 +37,7 @@ export default {
form:{
code:'',
width: 40,
rotate: 0,
x: 10,
y: 10
},
@ -67,6 +71,7 @@ export default {
this.isUpdate = true;
this.form.code = model.code;
this.form.width = model.width;
this.form.rotate = model.rotate || 0;
this.form.x = model.point.x;
this.form.y = model.point.y;
}
@ -87,6 +92,7 @@ export default {
_type: 'JetFan',
code: this.isUpdate ? this.form.code : getUID('JetFan', this.iscs.jetFanList),
width: this.form.width,
rotate: this.form.rotate,
color:'#00ff00'
};
this.$emit('createJetFan', jetFanModel);
@ -104,6 +110,7 @@ export default {
this.form = {
code:'',
width: 40,
rotate: 0,
x: 10,
y: 10
};

20
src/views/iscsSystem/index.vue
View File

@ -147,7 +147,7 @@ export default {
list.forEach(item => {
if (item && item.code) {
const copyModel = this.copyModelInfo(item, 30);
const type1 = item._type.charAt(0).toLowerCase() + item._type.slice(1); // .toLowerCase()
const type1 = item._type.charAt(0).toLowerCase() + item._type.slice(1);
if (!mapIscs[type1 + 'List']) {
mapIscs[type1 + 'List'] = this.iscs[type1 + 'List'] || [];
}
@ -159,7 +159,7 @@ export default {
});
} else if (this.selected._type != 'CheckBox') {
this.copyModel = this.copyModelInfo(this.selected, 10);
const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1); // .toLowerCase()
const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1);
this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
} else {
this.copyModel = {};
@ -175,12 +175,16 @@ export default {
this.copyModel.code && this.createDataModel(this.copyModel);
}
} break;
// case 'Delete': this.$store.dispatch('map/setDeleteCount');
// break;
// case 'Update':
// this.$refs.offsetX.focus();
// this.$store.dispatch('map/setUpdateCount');
// break;
case 'Delete': {
const list = this.getSelectList();
if (list.length) {
list.forEach(item => {
item && item.code && this.$store.dispatch('iscs/deleteIscsDevices', item);
});
} else {
this.copyModel.code && this.$store.dispatch('iscs/deleteIscsDevices', this.copyModel);
}
} break;
}
}
},