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

# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue

src/iscs/shape/picture.js

@@ -23,8 +23,12 @@ 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';
 import kongzhixiang from '@/assets/iscs_picture/iscs_kongzhixiang.png';
+import ventilationFan from '@/assets/iscs_picture/ventilationFan.png';
+import escalator from '@/assets/iscs_picture/escalator.png';
+import toUp from '@/assets/iscs_picture/to-up.png';
+import toDown from '@/assets/iscs_picture/to-down.png';
+import lift from '@/assets/iscs_picture/lift.png';
 
 const pictureObj = {
     'psdLeft': psdLeft,
@@ -50,7 +54,11 @@ const pictureObj = {
     waterCooler,
     textBgBluePoint,
     ventilationFan,
-    kongzhixiang
+    kongzhixiang,
+    escalator,
+    toUp,
+    toDown,
+    lift
 };
 export default class Picture extends Group {
     constructor(device) {

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

@@ -79,7 +79,11 @@ export default {
                 { name: '冷水机', value: 'waterCooler'},
                 { name: '顶部排风机', value: 'ventilationFan'},
                 { name: '文字蓝色背景', value: 'textBgBluePoint'},
-                { name: '风井', value: 'kongzhixiang' }
+                { name: '风井', value: 'kongzhixiang' },
+                { name: '扶梯', value: 'escalator'},
+                { name: '扶梯-朝上指示', value: 'toUp'},
+                { name: '扶梯-朝下执行', value: 'toDown'},
+                { name: '电梯', value: 'lift' }
             ],
 
             rules: {