diff --git a/src/assets/iscs_picture/drum.png b/src/assets/iscs_picture/drum.png
new file mode 100644
index 000000000..a6eed61fe
Binary files /dev/null and b/src/assets/iscs_picture/drum.png differ
diff --git a/src/assets/iscs_picture/exhaustFan.png b/src/assets/iscs_picture/exhaustFan.png
new file mode 100644
index 000000000..019396a64
Binary files /dev/null and b/src/assets/iscs_picture/exhaustFan.png differ
diff --git a/src/assets/iscs_picture/fm-blue.png b/src/assets/iscs_picture/fm-blue.png
new file mode 100644
index 000000000..ed6b09e6f
Binary files /dev/null and b/src/assets/iscs_picture/fm-blue.png differ
diff --git a/src/assets/iscs_picture/fm-gray.png b/src/assets/iscs_picture/fm-gray.png
new file mode 100644
index 000000000..6b2fc9027
Binary files /dev/null and b/src/assets/iscs_picture/fm-gray.png differ
diff --git a/src/assets/iscs_picture/fm-green.png b/src/assets/iscs_picture/fm-green.png
new file mode 100644
index 000000000..33096dd35
Binary files /dev/null and b/src/assets/iscs_picture/fm-green.png differ
diff --git a/src/assets/iscs_picture/gufengji-gray-l.png b/src/assets/iscs_picture/gufengji-gray-l.png
new file mode 100644
index 000000000..8d329885b
Binary files /dev/null and b/src/assets/iscs_picture/gufengji-gray-l.png differ
diff --git a/src/assets/iscs_picture/gufengji-gray-r.png b/src/assets/iscs_picture/gufengji-gray-r.png
new file mode 100644
index 000000000..4c67325f0
Binary files /dev/null and b/src/assets/iscs_picture/gufengji-gray-r.png differ
diff --git a/src/assets/iscs_picture/gufengji-red-l.png b/src/assets/iscs_picture/gufengji-red-l.png
new file mode 100644
index 000000000..448142b01
Binary files /dev/null and b/src/assets/iscs_picture/gufengji-red-l.png differ
diff --git a/src/assets/iscs_picture/gufengji-red-r.png b/src/assets/iscs_picture/gufengji-red-r.png
new file mode 100644
index 000000000..ba6cdfdb1
Binary files /dev/null and b/src/assets/iscs_picture/gufengji-red-r.png differ
diff --git a/src/assets/iscs_picture/hand.png b/src/assets/iscs_picture/hand.png
new file mode 100644
index 000000000..ed55e939d
Binary files /dev/null and b/src/assets/iscs_picture/hand.png differ
diff --git a/src/assets/iscs_picture/kongtiao.png b/src/assets/iscs_picture/kongtiao.png
new file mode 100644
index 000000000..f27f1f31d
Binary files /dev/null and b/src/assets/iscs_picture/kongtiao.png differ
diff --git a/src/assets/iscs_picture/mul-kongtiao.png b/src/assets/iscs_picture/mul-kongtiao.png
new file mode 100644
index 000000000..68e5dd3d3
Binary files /dev/null and b/src/assets/iscs_picture/mul-kongtiao.png differ
diff --git a/src/assets/iscs_picture/setting.png b/src/assets/iscs_picture/setting.png
new file mode 100644
index 000000000..800342dd6
Binary files /dev/null and b/src/assets/iscs_picture/setting.png differ
diff --git a/src/assets/iscs_picture/textBgBluePoint.png b/src/assets/iscs_picture/textBgBluePoint.png
new file mode 100644
index 000000000..6d4db7c2a
Binary files /dev/null and b/src/assets/iscs_picture/textBgBluePoint.png differ
diff --git a/src/assets/iscs_picture/ventilationFan.png b/src/assets/iscs_picture/ventilationFan.png
new file mode 100644
index 000000000..159854dca
Binary files /dev/null and b/src/assets/iscs_picture/ventilationFan.png differ
diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js
index dcb297d0c..a3953db31 100644
--- a/src/iscs/shape/picture.js
+++ b/src/iscs/shape/picture.js
@@ -6,10 +6,24 @@ import psdSystem from '@/assets/iscs_picture/iscs-psd.png';
import psdRight from '@/assets/iscs_picture/iscs-psd-right.png';
import fireBlue from '@/assets/iscs_picture/iscs-fire-blue.png';
import fireRed from '@/assets/iscs_picture/iscs-fire-red.png';
-import envPersonDoor from '@/assets/iscs_picture/renfangmen.png'
-
-
+import envPersonDoor from '@/assets/iscs_picture/renfangmen.png';
+import hand from '@/assets/iscs_picture/hand.png';
+import fmBlue from '@/assets/iscs_picture/fm-blue.png';
+import fmGray from '@/assets/iscs_picture/fm-gray.png';
+import fmGreen from '@/assets/iscs_picture/fm-green.png';
+import airCond from '@/assets/iscs_picture/kongtiao.png';
+import airCondMul from '@/assets/iscs_picture/mul-kongtiao.png';
+import setting from '@/assets/iscs_picture/setting.png';
+import blowerRedLeft from '@/assets/iscs_picture/gufengji-red-l.png';
+import blowerGrayLeft from '@/assets/iscs_picture/gufengji-gray-l.png';
+import blowerRedRight from '@/assets/iscs_picture/gufengji-red-r.png';
+import blowerGrayRight from '@/assets/iscs_picture/gufengji-gray-r.png';
import iscsAPF from '@/assets/iscs_picture/iscs_APF.png';
+import drum from '@/assets/iscs_picture/drum.png';
+import exhaustFan from '@/assets/iscs_picture/exhaustFan.png'
+import waterCooler from '@/assets/iscs_picture/ZSDF533.png';
+import textBgBluePoint from '@/assets/iscs_picture/textBgBluePoint.png';
+import ventilationFan from '@/assets/iscs_picture/ventilationFan.png'
const pictureObj = {
'psdLeft': psdLeft,
@@ -18,7 +32,23 @@ const pictureObj = {
'APF': iscsAPF,
'envPersonDoor': envPersonDoor,
's': fireBlue,
- 'a': fireRed
+ 'a': fireRed,
+ hand,
+ fmBlue,
+ fmGray,
+ fmGreen,
+ airCond,
+ airCondMul,
+ setting,
+ blowerRedLeft,
+ blowerGrayLeft,
+ blowerRedRight,
+ blowerGrayRight,
+ drum,
+ exhaustFan,
+ waterCooler,
+ textBgBluePoint,
+ ventilationFan
};
export default class Picture extends Group {
constructor(device) {
@@ -39,7 +69,9 @@ export default class Picture extends Group {
});
this.imageButton = new Image({
zlevel: model.zlevel,
- z: model.z,
+ z: model.z,
+ origin: [model.width/2, model.height/2],
+ rotation: (model.rotation||0)*Math.PI/180,
style: {
x: 0,
y: 0,
diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue
index 1436e47de..6e82f8cbb 100644
--- a/src/views/iscs/iscsDraw/icscComponents/picture.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue
@@ -9,6 +9,9 @@
+
+
+
@@ -47,7 +50,8 @@ export default {
type: '',
size: 10,
width: 50,
- height: 50,
+ height: 50,
+ rotation: 0,
x: 10,
y: 10
},
@@ -59,6 +63,22 @@ export default {
{ name: '蓝色FIRE', value: 's'},
{ name: '红色FIRE', value: 'a'},
{ name: 'APF', value: 'APF'},
+ { name: '手动阀', value: 'hand'},
+ { name: '蓝色-阀门', value: 'fmBlue'},
+ { name: '灰色-阀门', value: 'fmGray'},
+ { name: '绿色-阀门', value: 'fmGreen'},
+ { name: '空调', value: 'airCond'},
+ { name: '多联空调', value: 'airCondMul'},
+ { name: '管件', value: 'setting'},
+ { name: '汽包', value: 'drum' },
+ { name: '红色-左侧-鼓风机', value: 'blowerRedLeft'},
+ { name: '灰色-左侧-鼓风机', value: 'blowerGrayLeft'},
+ { name: '红色-右侧-鼓风机', value: 'blowerRedRight'},
+ { name: '灰色-右侧-鼓风机', value: 'blowerGrayRight'},
+ { name: '排风机', value: 'exhaustFan' },
+ { name: '冷水机', value: 'waterCooler'},
+ { name: '顶部排风机', value: 'ventilationFan'},
+ { name: '文字蓝色背景', value: 'textBgBluePoint'}
],
rules: {
@@ -85,7 +105,8 @@ export default {
this.isUpdate = true;
this.form.code = model.code;
this.form.type = model.type;
- this.form.size = model.size;
+ this.form.size = model.size;
+ this.form.rotation = model.rotation;
this.form.width = model.width;
this.form.height = model.height;
this.form.x = model.point.x;
@@ -106,7 +127,8 @@ export default {
code: this.isUpdate ? this.form.code : getUID('IscsPicture', this.iscs.iscsPictureList),
_type: 'IscsPicture',
type: this.form.type,
- size: this.form.size,
+ size: this.form.size,
+ rotation: this.form.rotation,
width: this.form.width,
height: this.form.height
};
@@ -126,7 +148,8 @@ export default {
code: this.form.code,
_type: 'IscsPicture',
type: this.form.type,
- size: this.form.size
+ size: this.form.size,
+ rotation: this.form.rotation,
};
this.$emit('deleteDataModel', rectModel);
},
@@ -137,7 +160,8 @@ export default {
this.form = {
code: '',
type: '',
- size: 10,
+ size: 10,
+ rotation: 0,
width: 50,
height: 50,
x: 10,
diff --git a/src/views/iscs/iscsDraw/index.vue b/src/views/iscs/iscsDraw/index.vue
index ec8df6585..9abb07a62 100644
--- a/src/views/iscs/iscsDraw/index.vue
+++ b/src/views/iscs/iscsDraw/index.vue
@@ -114,15 +114,6 @@ export default {
}).catch(() => {
this.$message.error('ISCS数据保存异常！');
});
- // {
- // "graphData": "string",
- // "id": 0,
- // "lineCode": "string",
- // "stationCode": "string",
- // "system": "string",
- // "totalSystem": "string",
- // "userInterface": "string"
- // }
}
}
};