Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/iscs/shape/picture.js

@@ -41,6 +41,7 @@ import iscsRAFEAFGreen from '@/assets/iscs_picture/iscs-RAF-EAF_green.png';
 import iscsRAFEAFGray from '@/assets/iscs_picture/iscs-RAF-EAF_gray.png';
 import iscsSEF from '@/assets/iscs_picture/iscs-SEF.png';
 import iscsValue from '@/assets/iscs_picture/iscs-value.png';
+import fanCoil from '@/assets/iscs_picture/fanCoil.png';
 
 const pictureObj = {
     'psdLeft': psdLeft,
@@ -82,7 +83,8 @@ const pictureObj = {
     iscsRAFEAFGreen,
     iscsRAFEAFGray,
     iscsSEF,
-    iscsValue
+	iscsValue,
+	fanCoil
 };
 export default class Picture extends Group {
     constructor(device) {

src/views/iscs/iscsDraw/icscComponents/picture.vue

@@ -95,7 +95,8 @@ export default {
                 { name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' },
                 { name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' },
                 { name: '排烟风机', value: 'iscsSEF' },
-                { name: '阀门', value: 'iscsValue' }
+				{ name: '阀门', value: 'iscsValue' },
+				{ name: '风扇机', value: 'fanCoil'}
             ],
 
             rules: {