From 291af56b2f106edda84214cec1bf7852dd634366 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 6 Feb 2020 14:54:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?iscs=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/shape/Vidicon.js                     |  1 +
 .../iscs/iscsDraw/iscsAfcOperate/index.vue    |  2 +-
 .../iscs/iscsDraw/iscsCctvOperate/index.vue   | 12 +++++++-
 .../iscs/iscsDraw/iscsCctvOperate/vidicon.vue | 29 +++++++------------
 .../brakeMachine.vue                          |  0
 5 files changed, 24 insertions(+), 20 deletions(-)
 rename src/views/iscs/iscsDraw/{iscsAfcOperate => iscsCommonElem}/brakeMachine.vue (100%)

diff --git a/src/iscs/shape/Vidicon.js b/src/iscs/shape/Vidicon.js
index cbaac8965..0c6a6c54b 100644
--- a/src/iscs/shape/Vidicon.js
+++ b/src/iscs/shape/Vidicon.js
@@ -76,6 +76,7 @@ export default class Vidicon extends Group {
         } else {
             this.grouper.add(this.PolylineLeft);
         }
+        this.grouper.rotation = Math.PI / 180 * (this.model.rotationAngle || 0);
         this.add(this.grouper);
     }
 
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
index a24e16c7d..7438ffe8e 100644
--- a/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
@@ -65,7 +65,7 @@
 </template>
 <script>
 import {deviceFactory} from '@/iscs/utils/parser';
-import BrakeMachine from './brakeMachine';
+import BrakeMachine from '../iscsCommonElem/brakeMachine';
 import TicketMachine from './ticketMachine';
 import SemiAutomaticTicketMachine from './semiAutomaticTicketMachine';
 import IscsLine from '../iscsCommonElem/line';
diff --git a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
index 94d015bf6..6edfb5519 100644
--- a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
@@ -26,6 +26,14 @@
               @deleteDataModel="deleteDataModel"
             />
           </el-tab-pane>
+            <el-tab-pane label="闸机" name="BrakeMachine">
+                <brake-machine
+                    ref="brakeMachine"
+                    style="width: 90%;"
+                    @createDataModel="createDataModel"
+                    @deleteDataModel="deleteDataModel"
+                />
+            </el-tab-pane>
             <el-tab-pane label="文字" name="IscsText">
                 <iscs-text
                     ref="iscsText"
@@ -62,6 +70,7 @@ import VidiconCloud from './vidiconCloud';
 import IscsLine from '../iscsCommonElem/line';
 import IscsText from '../iscsCommonElem/text';
 import IscsRect from '../iscsCommonElem/rect';
+import BrakeMachine from '../iscsCommonElem/brakeMachine';
 
 export default {
     name: 'IscsOperate',
@@ -70,7 +79,8 @@ export default {
         VidiconCloud,
         IscsRect,
         IscsLine,
-        IscsText
+        IscsText,
+        BrakeMachine
     },
     mixins: [
     ],
diff --git a/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
index fe907c7de..81d62d822 100644
--- a/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
+++ b/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
@@ -13,6 +13,9 @@
       <el-form-item label="镜头向右">
         <el-checkbox v-model="addModel.right" />
       </el-form-item>
+        <el-form-item label="旋转角度">
+            <el-input-number v-model="addModel.rotationAngle"></el-input-number>
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit()">{{ buttonText }}</el-button>
         <el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
@@ -36,7 +39,8 @@ export default {
                 width: 50,
                 x: 10,
                 y: 10,
-                right: true
+                right: true,
+                rotationAngle: 0
             },
             rules: {
                 width:[{ required: true, message:'请输入宽度', trigger: 'blur' }],
@@ -65,6 +69,7 @@ export default {
                 this.addModel.x = model.point.x;
                 this.addModel.y = model.point.y;
                 this.addModel.right = model.right;
+                this.addModel.rotationAngle = model.rotationAngle || 0;
             }
         }
     },
@@ -81,7 +86,8 @@ export default {
                         point: {
                             x: this.addModel.x,
                             y: this.addModel.y
-                        }
+                        },
+                        rotationAngle: this.addModel.rotationAngle
                     };
                     this.$emit('createDataModel', model);
                     this.initPage();
@@ -91,26 +97,12 @@ export default {
             });
         },
         deleteDevice() {
-            // const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code);
-            // if (selected && selected._type.toUpperCase() === 'Psd'.toUpperCase()) {
-            //     const _that = this;
-            //     this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
-            //         confirmButtonText: this.$t('tip.confirm'),
-            //         cancelButtonText: this.$t('tip.cancel'),
-            //         type: 'warning'
-            //     }).then(() => {
-            //         _that.$emit('updateMapModel', {...selected, _dispose: true});
-            //         _that.deviceSelect();
-            //         this.$refs.dataform.resetFields();
-            //     }).catch(() => {
-            //         _that.$message.info(this.$t('tip.cancelledDelete'));
-            //     });
-            // }
             const model = {
                 _type: 'Vidicon',
                 code: this.addModel.code,
                 width: this.addModel.width,
                 right: this.addModel.right,
+                rotationAngle: this.addModel.rotationAngle || 0,
                 point: {
                     x: this.addModel.x,
                     y: this.addModel.y
@@ -128,7 +120,8 @@ export default {
                 width: 50,
                 x: 10,
                 y: 10,
-                right: true
+                right: true,
+                rotationAngle: 0
             };
         }
     }
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue b/src/views/iscs/iscsDraw/iscsCommonElem/brakeMachine.vue
similarity index 100%
rename from src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue
rename to src/views/iscs/iscsDraw/iscsCommonElem/brakeMachine.vue

From 0e10532316fecea08317d921d235bb6bceb875b1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 6 Feb 2020 15:04:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?iscs=20=E7=BB=98=E5=9B=BE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/constant/deviceRender.js             |   7 +-
 src/iscs/constant/deviceType.js               |   3 +-
 src/iscs/constant/iscsData.js                 |   4 +-
 src/iscs/shape/Vidicon.js                     |   1 -
 src/iscs/shape/components/pathsvg.js          |   4 +
 src/iscs/shape/escalator.js                   |  27 ++++
 src/iscs/shape/factory.js                     |   2 +
 src/iscs/shape/gasFireControl.js              |   2 +-
 src/iscs/shape/smokeDetector.js               |   2 +-
 src/iscs/utils/parser.js                      |   9 +-
 .../iscsDraw/iscsAcsOperate/entranceGuard.vue |   2 +-
 .../iscsDraw/iscsAfcOperate/brakeMachine.vue  | 126 ++++++++++++++++++
 .../iscs/iscsDraw/iscsAfcOperate/index.vue    |   2 +-
 .../semiAutomaticTicketMachine.vue            |   2 +-
 .../iscsDraw/iscsAfcOperate/ticketMachine.vue |   2 +-
 .../iscs/iscsDraw/iscsCctvOperate/index.vue   |  12 +-
 .../iscs/iscsDraw/iscsCctvOperate/vidicon.vue |  29 ++--
 .../brakeMachine.vue                          |   1 +
 .../iscs/iscsDraw/iscsOperate/escalator.vue   | 119 +++++++++++++++++
 src/views/iscs/iscsDraw/iscsOperate/index.vue |  20 +++
 20 files changed, 343 insertions(+), 33 deletions(-)
 create mode 100644 src/iscs/shape/escalator.js
 create mode 100644 src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue
 rename src/views/iscs/iscsDraw/{iscsCommonElem => iscsOperate}/brakeMachine.vue (99%)
 create mode 100644 src/views/iscs/iscsDraw/iscsOperate/escalator.vue

diff --git a/src/iscs/constant/deviceRender.js b/src/iscs/constant/deviceRender.js
index f1ff9f13e..fd46d4d25 100644
--- a/src/iscs/constant/deviceRender.js
+++ b/src/iscs/constant/deviceRender.js
@@ -182,6 +182,11 @@ deviceRender[deviceType.IscsRect] = {
     _type: deviceType.IscsRect,
     zlevel:1,
     z: 3
-}
+};
+deviceRender[deviceType.Escalator] = {
+    _type: deviceType.Escalator,
+    zlevel:1,
+    z: 4
+};
 
 export default deviceRender;
diff --git a/src/iscs/constant/deviceType.js b/src/iscs/constant/deviceType.js
index 3712360e1..ee0fcd999 100644
--- a/src/iscs/constant/deviceType.js
+++ b/src/iscs/constant/deviceType.js
@@ -27,7 +27,8 @@ const deviceType = {
     VolumeControlDamper: 'VolumeControlDamper',
     IscsText: 'IscsText',
     IscsLine: 'IscsLine',
-    IscsRect: 'IscsRect'
+    IscsRect: 'IscsRect',
+    Escalator:'Escalator'
 };
 
 export default deviceType;
diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index 627dd7688..89071bb3f 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -5,7 +5,9 @@ const iscsData = {
     '31': {},
     '41': {},
     '42': {"vidiconList":[{"_type":"Vidicon","code":"Vidicon_1","width":40,"right":true,"point":{"x":311,"y":248},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_2","width":40,"right":true,"point":{"x":321,"y":158},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_3","width":40,"right":true,"point":{"x":324,"y":93},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_4","width":40,"right":true,"point":{"x":559,"y":72},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_5","width":40,"right":true,"point":{"x":547,"y":163},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_6","width":40,"right":true,"point":{"x":562,"y":272},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_7","width":40,"right":true,"point":{"x":751,"y":98},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_8","width":40,"right":true,"point":{"x":750,"y":156},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_9","width":40,"right":false,"point":{"x":846,"y":71},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_10","width":40,"right":false,"point":{"x":846,"y":269},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_11","width":40,"right":false,"point":{"x":940,"y":182},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_12","width":40,"right":false,"point":{"x":1082,"y":90},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_13","width":40,"right":false,"point":{"x":1079,"y":245},"zlevel":1,"z":4}],"iscsRectList":[{"point":{"x":25,"y":176},"code":"IscsRect_1","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":96,"y":176},"code":"IscsRect_2","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":167,"y":176},"code":"IscsRect_3","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":238,"y":176},"code":"IscsRect_4","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":309,"y":149},"code":"IscsRect_5","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":380,"y":124},"code":"IscsRect_6","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":45,"height":80,"zlevel":1,"z":3},{"point":{"x":425,"y":134},"code":"IscsRect_7","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":30,"zlevel":1,"z":3},{"point":{"x":425,"y":164},"code":"IscsRect_8","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":30,"zlevel":1,"z":3},{"point":{"x":739,"y":149},"code":"IscsRect_9","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":60,"zlevel":1,"z":3},{"point":{"x":1060,"y":135},"code":"IscsRect_10","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":80,"zlevel":1,"z":3},{"point":{"x":1115,"y":150},"code":"IscsRect_11","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":65,"zlevel":1,"z":3},{"point":{"x":1170,"y":150},"code":"IscsRect_12","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":65,"zlevel":1,"z":3},{"point":{"x":1225,"y":135},"code":"IscsRect_13","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":125,"height":80,"zlevel":1,"z":3}],"vidiconCloudList":[{"_type":"VidiconCloud","code":"VidiconCloud_1","r":18,"point":{"x":59,"y":211},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_2","r":18,"point":{"x":131,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_3","r":18,"point":{"x":203,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_4","r":18,"point":{"x":273,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_5","r":18,"point":{"x":511,"y":131},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_6","r":18,"point":{"x":1010,"y":141},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_7","r":18,"point":{"x":1255,"y":140},"zlevel":1,"z":4}],"iscsLineList":[{"point1":{"x":370,"y":50},"point2":{"x":1075,"y":50},"code":"IscsLine_1","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":370,"y":306},"point2":{"x":1075,"y":306},"code":"IscsLine_2","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":380,"y":50},"point2":{"x":380,"y":90},"code":"IscsLine_3","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":50}},{"point1":{"x":380,"y":90},"point2":{"x":395,"y":100},"code":"IscsLine_4","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":90}},{"point1":{"x":395,"y":100},"point2":{"x":380,"y":110},"code":"IscsLine_5","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":395,"y":100}},{"point1":{"x":380,"y":110},"point2":{"x":380,"y":245},"code":"IscsLine_6","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":110}},{"point1":{"x":380,"y":245},"point2":{"x":395,"y":255},"code":"IscsLine_7","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":245}},{"point1":{"x":395,"y":255},"point2":{"x":380,"y":265},"code":"IscsLine_8","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":395,"y":255}},{"point1":{"x":1060,"y":50},"point2":{"x":1060,"y":90},"code":"IscsLine_9","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":1060,"y":90},"point2":{"x":1045,"y":100},"code":"IscsLine_10","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":90}},{"point1":{"x":1045,"y":100},"point2":{"x":1060,"y":110},"code":"IscsLine_11","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1045,"y":100}},{"point1":{"x":1060,"y":110},"point2":{"x":1060,"y":245},"code":"IscsLine_12","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":110}},{"point1":{"x":1060,"y":245},"point2":{"x":1045,"y":255},"code":"IscsLine_13","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":245}},{"point1":{"x":1045,"y":255},"point2":{"x":1060,"y":265},"code":"IscsLine_14","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1045,"y":255}},{"point1":{"x":1060,"y":265},"point2":{"x":1060,"y":305},"code":"IscsLine_15","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4}],"iscsTextList":[{"point":{"x":40,"y":187},"code":"IscsText_1","_type":"IscsText","context":"控制室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":103,"y":180},"code":"IscsText_2","_type":"IscsText","context":"  35KV\n开关柜室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":173,"y":181},"code":"IscsText_3","_type":"IscsText","context":"  直流\n开关柜室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":252,"y":183},"code":"IscsText_4","_type":"IscsText","context":"0.4KV\n低压室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":388,"y":137},"code":"IscsText_5","_type":"IscsText","context":"排热\n风室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":439,"y":144},"code":"IscsText_6","_type":"IscsText","context":"男厕","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":438,"y":175},"code":"IscsText_7","_type":"IscsText","context":"女厕","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":758,"y":192},"code":"IscsText_8","_type":"IscsText","context":"电梯","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1066,"y":150},"code":"IscsText_9","_type":"IscsText","context":"屏蔽门\n控制室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1175,"y":166},"code":"IscsText_10","_type":"IscsText","context":"配电间","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1235,"y":186},"code":"IscsText_11","_type":"IscsText","context":"商用通\n信设备","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":37,"y":238},"code":"IscsText_12","_type":"IscsText","context":"01015#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":110,"y":238},"code":"IscsText_13","_type":"IscsText","context":"01016#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":180,"y":239},"code":"IscsText_14","_type":"IscsText","context":"01017#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":251,"y":238},"code":"IscsText_15","_type":"IscsText","context":"01018#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":323,"y":182},"code":"IscsText_16","_type":"IscsText","context":"01039#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":324,"y":118},"code":"IscsText_17","_type":"IscsText","context":"01049#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":311,"y":272},"code":"IscsText_18","_type":"IscsText","context":"01050#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":488,"y":159},"code":"IscsText_19","_type":"IscsText","context":"01020#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":559,"y":95},"code":"IscsText_20","_type":"IscsText","context":"01044#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":547,"y":187},"code":"IscsText_21","_type":"IscsText","context":"01042#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":563,"y":256},"code":"IscsText_22","_type":"IscsText","context":"01043#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":752,"y":119},"code":"IscsText_23","_type":"IscsText","context":"01045#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":749,"y":177},"code":"IscsText_24","_type":"IscsText","context":"01057#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":842,"y":93},"code":"IscsText_25","_type":"IscsText","context":"01047#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":934,"y":204},"code":"IscsText_26","_type":"IscsText","context":"01046#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":839,"y":254},"code":"IscsText_27","_type":"IscsText","context":"01048#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":986,"y":166},"code":"IscsText_28","_type":"IscsText","context":"01019#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1077,"y":111},"code":"IscsText_29","_type":"IscsText","context":"01041#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1073,"y":265},"code":"IscsText_30","_type":"IscsText","context":"01040#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1232,"y":164},"code":"IscsText_31","_type":"IscsText","context":"01021#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4}]},
-    '51': {},
+    '51': {
+        "iscsLineList":[{"point1":{"x":89,"y":117},"point2":{"x":789,"y":117},"code":"IscsLine_1","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4},{"point1":{"x":89,"y":117},"point2":{"x":89,"y":617},"code":"IscsLine_2","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4}]
+    },
     '61': {},
     '62': {}
 
diff --git a/src/iscs/shape/Vidicon.js b/src/iscs/shape/Vidicon.js
index 0c6a6c54b..cbaac8965 100644
--- a/src/iscs/shape/Vidicon.js
+++ b/src/iscs/shape/Vidicon.js
@@ -76,7 +76,6 @@ export default class Vidicon extends Group {
         } else {
             this.grouper.add(this.PolylineLeft);
         }
-        this.grouper.rotation = Math.PI / 180 * (this.model.rotationAngle || 0);
         this.add(this.grouper);
     }
 
diff --git a/src/iscs/shape/components/pathsvg.js b/src/iscs/shape/components/pathsvg.js
index 59e344cc7..b36245964 100644
--- a/src/iscs/shape/components/pathsvg.js
+++ b/src/iscs/shape/components/pathsvg.js
@@ -39,6 +39,10 @@ const map = {
     TunnelFan:{
         width:68,
         path:'M40,112L5,94V91H73v3ZM6,26H73V89H6V26Zm4,59H69V30H10V85Zm29.5-1A26.5,26.5,0,1,1,66,57.5,26.5,26.5,0,0,1,39.5,84ZM52,77l7-7-2-2-7,7ZM36,66l-5-4-2,2,5,4ZM27,77l2-2-8-7-2,2Zm0-38-9,8,3,2,8-7Zm7,10-5,5,3,2,5-5Zm9,6H37v6h6V55Zm2,13,5-5-2-2-5,5ZM44,49l5,5,2-3-5-5Zm9-12-3,2,8,8,2-2ZM5,22L40,4,73,22v3H5V22Z'
+    },
+    Escalator:{
+        width:335,
+        path:'M338,202H3V171H3.135v0l47,0V142H21v-6H50.135V108l-47,.161V108H3V4H338V202ZM332,10H9.826v92H232.135V89l-210,0v0H22V27h0.135V26.838L308,27V177H9.826v19H332V10ZM89.135,136V108H56.826v28h32.31Zm-32.31,6v29h32.31V142H56.826Zm57.309-6V108H95.826v28h18.309Zm-18.309,6v29h18.309V142H95.826Zm41.309-6V108H120.826v28h16.309Zm-16.309,6v29h16.309V142H120.826Zm41.309-6V108H143.826v28h18.309Zm-18.309,6v29h18.309V142H143.826Zm42.309-6V108H168.826v28h17.309Zm-17.309,6v29h17.309V142H168.826Zm36.309-6V108H192.826v28h12.309Zm-12.309,6v29h12.309V142H192.826Zm33.309-6V108H211.826v28h14.309Zm-14.309,6v29h14.309V142H211.826Zm0-86V83h14.309V56H211.826Zm14.309-6V33H211.826V50h14.309Zm-33.309,6V83h12.309V56H192.826Zm12.309-6V33H192.826V50h12.309Zm-36.309,6V83h17.309V56H168.826Zm17.309-6V33H168.826V50h17.309Zm-42.309,6V83h18.309V56H143.826Zm18.309-6V33H143.826V50h18.309Zm-41.309,6V83h16.309V56H120.826Zm16.309-6V33H120.826V50h16.309Zm-26.219,6,0.039,10.487L95.826,61.619V83h18.309V56h-3.219Zm3.219-6V33H95.826V43.627l14.953-4.539L110.916,50h3.219Zm-25-4.342V33H56.826V83h32.31V59.466L67.055,52.361ZM50.135,83V33H28.826V83H50.135Zm182.691,25v28H265.25V56H232.826V83h6v25h-6ZM271.25,49.868V50h0.008l0,92H271.25v0l-38.424,0v29H302V33H232.826V50Z'
     }
 };
 
diff --git a/src/iscs/shape/escalator.js b/src/iscs/shape/escalator.js
new file mode 100644
index 000000000..985bd9b56
--- /dev/null
+++ b/src/iscs/shape/escalator.js
@@ -0,0 +1,27 @@
+import Group from 'zrender/src/container/Group';
+import createPathSvg from './components/pathsvg';
+
+export default class Escalator extends Group {
+    constructor(device) {
+        super();
+        this.model = device.model;
+        this.zlevel = device.model.zlevel;
+        this.z = device.model.z;
+        this._type = device.model._type;
+        this.code = device.model.code;
+        this.create();
+    }
+    create() {
+        this.grouper = new Group({
+            id: this.model.code,
+            position: [this.model.point.x, this.model.point.y]
+        });
+        this.path = createPathSvg(this.model);
+        this.add(this.grouper);
+        this.grouper.add(this.path);
+    }
+    setModel(dx, dy) {
+        this.model.point.x += dx;
+        this.model.point.y += dy;
+    }
+}
diff --git a/src/iscs/shape/factory.js b/src/iscs/shape/factory.js
index fc5d872b1..cd74d50db 100644
--- a/src/iscs/shape/factory.js
+++ b/src/iscs/shape/factory.js
@@ -28,6 +28,7 @@ import VolumeControlDamper from './bas/volumeControlDamper';
 import IscsText from './text';
 import IscsLine from './line';
 import IscsRect from './rect';
+import Escalator from './escalator';
 
 const iscsShape = {};
 iscsShape[deviceType.ManualAlarmButton] = ManualAlarmButton;
@@ -60,6 +61,7 @@ iscsShape[deviceType.VolumeControlDamper] = VolumeControlDamper;
 iscsShape[deviceType.IscsText] = IscsText;
 iscsShape[deviceType.IscsLine] = IscsLine;
 iscsShape[deviceType.IscsRect] = IscsRect;
+iscsShape[deviceType.Escalator] = Escalator;
 
 function shapefactory(device, iscs) {
     const type = device.model._type;
diff --git a/src/iscs/shape/gasFireControl.js b/src/iscs/shape/gasFireControl.js
index 27783e04a..499c72fa4 100644
--- a/src/iscs/shape/gasFireControl.js
+++ b/src/iscs/shape/gasFireControl.js
@@ -8,7 +8,7 @@ export default class GasFireControl extends Group {
         super();
         this.model = device.model;
         this.zlevel = device.model.zlevel;
-        this.z = device.model.z;
+        this.z = device.z;
         this._type = device.model._type;
         this._code = device.model.code;
         this.create();
diff --git a/src/iscs/shape/smokeDetector.js b/src/iscs/shape/smokeDetector.js
index 86ea6b87b..72829f275 100644
--- a/src/iscs/shape/smokeDetector.js
+++ b/src/iscs/shape/smokeDetector.js
@@ -7,7 +7,7 @@ export default class SmokeDetector extends Group {
         super();
         this.model = device.model;
         this.zlevel = device.model.zlevel;
-        this.z = device.model.z;
+        this.z = device.z;
         this._type = device.model._type;
         this._code = device.model.code;
         this.create();
diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js
index 71bf7d432..671b4f7e1 100644
--- a/src/iscs/utils/parser.js
+++ b/src/iscs/utils/parser.js
@@ -130,6 +130,11 @@ export function parser(data) {
         zrUtil.each(data.iscsRectList || [], elem=> {
             iscsDevice[elem.code] = deviceFactory(deviceType.IscsRect, elem);
         });
+        zrUtil.each(data.escalatorList || [], elem=> {
+            iscsDevice[elem.code] = deviceFactory(deviceType.Escalator, elem);
+        });
+
+        
     }
 
     return iscsDevice;
@@ -239,7 +244,9 @@ export function updateIscsData(state, device) {
     case deviceType.IscsLine:
         updateIscsListByDevice(state, 'iscsLineList', device);
         break;
+    case deviceType.Escalator:
+        updateIscsListByDevice(state, 'escalatorList', device);
+        break;
     }
-
     // store.dispatch('iscs/setIscsData', state.iscs);
 }
diff --git a/src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue b/src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue
index 5d718baaa..183d53858 100644
--- a/src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue
+++ b/src/views/iscs/iscsDraw/iscsAcsOperate/entranceGuard.vue
@@ -73,7 +73,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('EntranceGuard', this.iscs.entranceGuardList),
+                        code: this.isUpdate ? this.addModel.code : getUID('EntranceGuard', this.iscs.entranceGuardList),
                         _type: 'EntranceGuard',
                         width: this.addModel.width
                     };
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue
new file mode 100644
index 000000000..b8fd28586
--- /dev/null
+++ b/src/views/iscs/iscsDraw/iscsAfcOperate/brakeMachine.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
+      <el-form-item v-if="isUpdate" label="按钮编号" prop="code">
+        <el-input v-model="addModel.code" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="图形宽度" prop="width">
+        <el-input-number v-model="addModel.width" />
+      </el-form-item>
+      <el-form-item label="闸机朝右" prop="isRight">
+        <el-checkbox v-model="addModel.isRight" />
+      </el-form-item>
+      <el-form-item label="X轴坐标" prop="x">
+        <el-input-number v-model="addModel.x" />
+      </el-form-item>
+      <el-form-item label="Y轴坐标" prop="y">
+        <el-input-number v-model="addModel.y" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+        <el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
+        <el-button v-show="showDeleteButton" @click="initPage">{{ $t('global.cancel') }}</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
+export default {
+    name: 'BrakeMachine',
+    data() {
+        return {
+            addModel:{
+                code: '',
+                width: 25,
+                x: 10,
+                y: 10,
+                isRight:false
+            },
+            rules: {
+                width:[{ required: true, message:'请输入设备图形宽度', trigger: 'blur' }],
+                x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
+                y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
+            },
+            isUpdate:false,
+            showDeleteButton: false,
+            buttonText: '立即创建'
+        };
+    },
+    computed:{
+        ...mapGetters('iscs', [
+            'iscs'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'BrakeMachine' ) {
+                this.buttonText = '修改';
+                this.showDeleteButton = true;
+                this.isUpdate = true;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
+                this.addModel.isRight = model.isRight;
+            }
+        }
+    },
+    methods: {
+        onSubmit(form) {
+            this.$refs[form].validate((valid) => {
+                if (valid) {
+                    const maButtonModel = {
+                        point: {
+                            x: this.addModel.x,
+                            y: this.addModel.y
+                        },
+                        isRight: this.addModel.isRight,
+                        code: this.isUpdate ? this.addModel.code : getUID('BrakeMachine', this.iscs.brakeMachineList),
+                        _type: 'BrakeMachine',
+                        width: this.addModel.width
+                    };
+                    this.$emit('createDataModel', maButtonModel);
+                    this.initPage();
+                } else {
+                    return false;
+                }
+            });
+        },
+        deleteDevice() {
+            const maButtonModel = {
+                point: {
+                    x: this.addModel.x,
+                    y: this.addModel.y
+                },
+                code: this.addModel.code,
+                isRight: this.addModel.isRight,
+                _type: 'BrakeMachine',
+                width: this.addModel.width
+            };
+            this.$emit('deleteDataModel', maButtonModel);
+            this.initPage();
+        },
+        initPage() {
+            this.isUpdate = false;
+            this.buttonText = '立即创建';
+            this.showDeleteButton = false;
+            this.addModel = {
+                code: '',
+                width: 25,
+                x: 10,
+                y: 10,
+                isRight:false
+            };
+        }
+    }
+
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
index 7438ffe8e..a24e16c7d 100644
--- a/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
@@ -65,7 +65,7 @@
 </template>
 <script>
 import {deviceFactory} from '@/iscs/utils/parser';
-import BrakeMachine from '../iscsCommonElem/brakeMachine';
+import BrakeMachine from './brakeMachine';
 import TicketMachine from './ticketMachine';
 import SemiAutomaticTicketMachine from './semiAutomaticTicketMachine';
 import IscsLine from '../iscsCommonElem/line';
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
index 09568b703..fa80954d4 100644
--- a/src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
+++ b/src/views/iscs/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
@@ -73,7 +73,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('SemiAutomaticTicketMachine', this.iscs.semiAutomaticTicketMachineList),
+                        code: this.isUpdate ? this.addModel.code : getUID('SemiAutomaticTicketMachine', this.iscs.semiAutomaticTicketMachineList),
                         _type: 'SemiAutomaticTicketMachine',
                         width: this.addModel.width
                     };
diff --git a/src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue b/src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue
index 358f6b54f..2f0d08d98 100644
--- a/src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue
+++ b/src/views/iscs/iscsDraw/iscsAfcOperate/ticketMachine.vue
@@ -73,7 +73,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('TicketMachine', this.iscs.ticketMachineList),
+                        code: this.isUpdate ? this.addModel.code : getUID('TicketMachine', this.iscs.ticketMachineList),
                         _type: 'TicketMachine',
                         width: this.addModel.width
                     };
diff --git a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
index 6edfb5519..94d015bf6 100644
--- a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
@@ -26,14 +26,6 @@
               @deleteDataModel="deleteDataModel"
             />
           </el-tab-pane>
-            <el-tab-pane label="闸机" name="BrakeMachine">
-                <brake-machine
-                    ref="brakeMachine"
-                    style="width: 90%;"
-                    @createDataModel="createDataModel"
-                    @deleteDataModel="deleteDataModel"
-                />
-            </el-tab-pane>
             <el-tab-pane label="文字" name="IscsText">
                 <iscs-text
                     ref="iscsText"
@@ -70,7 +62,6 @@ import VidiconCloud from './vidiconCloud';
 import IscsLine from '../iscsCommonElem/line';
 import IscsText from '../iscsCommonElem/text';
 import IscsRect from '../iscsCommonElem/rect';
-import BrakeMachine from '../iscsCommonElem/brakeMachine';
 
 export default {
     name: 'IscsOperate',
@@ -79,8 +70,7 @@ export default {
         VidiconCloud,
         IscsRect,
         IscsLine,
-        IscsText,
-        BrakeMachine
+        IscsText
     },
     mixins: [
     ],
diff --git a/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
index 81d62d822..fe907c7de 100644
--- a/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
+++ b/src/views/iscs/iscsDraw/iscsCctvOperate/vidicon.vue
@@ -13,9 +13,6 @@
       <el-form-item label="镜头向右">
         <el-checkbox v-model="addModel.right" />
       </el-form-item>
-        <el-form-item label="旋转角度">
-            <el-input-number v-model="addModel.rotationAngle"></el-input-number>
-        </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit()">{{ buttonText }}</el-button>
         <el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
@@ -39,8 +36,7 @@ export default {
                 width: 50,
                 x: 10,
                 y: 10,
-                right: true,
-                rotationAngle: 0
+                right: true
             },
             rules: {
                 width:[{ required: true, message:'请输入宽度', trigger: 'blur' }],
@@ -69,7 +65,6 @@ export default {
                 this.addModel.x = model.point.x;
                 this.addModel.y = model.point.y;
                 this.addModel.right = model.right;
-                this.addModel.rotationAngle = model.rotationAngle || 0;
             }
         }
     },
@@ -86,8 +81,7 @@ export default {
                         point: {
                             x: this.addModel.x,
                             y: this.addModel.y
-                        },
-                        rotationAngle: this.addModel.rotationAngle
+                        }
                     };
                     this.$emit('createDataModel', model);
                     this.initPage();
@@ -97,12 +91,26 @@ export default {
             });
         },
         deleteDevice() {
+            // const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code);
+            // if (selected && selected._type.toUpperCase() === 'Psd'.toUpperCase()) {
+            //     const _that = this;
+            //     this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
+            //         confirmButtonText: this.$t('tip.confirm'),
+            //         cancelButtonText: this.$t('tip.cancel'),
+            //         type: 'warning'
+            //     }).then(() => {
+            //         _that.$emit('updateMapModel', {...selected, _dispose: true});
+            //         _that.deviceSelect();
+            //         this.$refs.dataform.resetFields();
+            //     }).catch(() => {
+            //         _that.$message.info(this.$t('tip.cancelledDelete'));
+            //     });
+            // }
             const model = {
                 _type: 'Vidicon',
                 code: this.addModel.code,
                 width: this.addModel.width,
                 right: this.addModel.right,
-                rotationAngle: this.addModel.rotationAngle || 0,
                 point: {
                     x: this.addModel.x,
                     y: this.addModel.y
@@ -120,8 +128,7 @@ export default {
                 width: 50,
                 x: 10,
                 y: 10,
-                right: true,
-                rotationAngle: 0
+                right: true
             };
         }
     }
diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/brakeMachine.vue b/src/views/iscs/iscsDraw/iscsOperate/brakeMachine.vue
similarity index 99%
rename from src/views/iscs/iscsDraw/iscsCommonElem/brakeMachine.vue
rename to src/views/iscs/iscsDraw/iscsOperate/brakeMachine.vue
index 9bdf31178..575173e2a 100644
--- a/src/views/iscs/iscsDraw/iscsCommonElem/brakeMachine.vue
+++ b/src/views/iscs/iscsDraw/iscsOperate/brakeMachine.vue
@@ -78,6 +78,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
+                        fill:'#fff',
                         isRight: this.addModel.isRight,
                         code: this.isUpdate ? this.form.code : getUID('BrakeMachine', this.iscs.brakeMachineList),
                         _type: 'BrakeMachine',
diff --git a/src/views/iscs/iscsDraw/iscsOperate/escalator.vue b/src/views/iscs/iscsDraw/iscsOperate/escalator.vue
new file mode 100644
index 000000000..269dc49cf
--- /dev/null
+++ b/src/views/iscs/iscsDraw/iscsOperate/escalator.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
+      <el-form-item v-if="isUpdate" label="按钮编号" prop="code">
+        <el-input v-model="addModel.code" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="图形宽度" prop="width">
+        <el-input-number v-model="addModel.width" />
+      </el-form-item>
+      <el-form-item label="X轴坐标" prop="x">
+        <el-input-number v-model="addModel.x" />
+      </el-form-item>
+      <el-form-item label="Y轴坐标" prop="y">
+        <el-input-number v-model="addModel.y" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+        <el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
+        <el-button v-show="showDeleteButton" @click="initPage">{{ $t('global.cancel') }}</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
+export default {
+    name: 'Escalator',
+    data() {
+        return {
+            addModel:{
+                code: '',
+                width: 25,
+                x: 10,
+                y: 10
+            },
+            rules: {
+                width:[{ required: true, message:'请输入设备图形宽度', trigger: 'blur' }],
+                x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
+                y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
+            },
+            isUpdate:false,
+            showDeleteButton: false,
+            buttonText: '立即创建'
+        };
+    },
+    computed:{
+        ...mapGetters('iscs', [
+            'iscs'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'Escalator' ) {
+                this.buttonText = '修改';
+                this.showDeleteButton = true;
+                this.isUpdate = true;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
+            }
+        }
+    },
+    methods: {
+        onSubmit(form) {
+            this.$refs[form].validate((valid) => {
+                if (valid) {
+                    const escalatorModel = {
+                        point: {
+                            x: this.addModel.x,
+                            y: this.addModel.y
+                        },
+                        code: this.isUpdate ? this.addModel.code : getUID('Escalator', this.iscs.escalatorList),
+                        _type: 'Escalator',
+                        width: this.addModel.width,
+                        fill:'#fff'
+                    };
+                    this.$emit('createDataModel', escalatorModel);
+                    this.initPage();
+                } else {
+                    return false;
+                }
+            });
+        },
+        deleteDevice() {
+            const escalatorModel = {
+                point: {
+                    x: this.addModel.x,
+                    y: this.addModel.y
+                },
+                code: this.addModel.code,
+                _type: 'Escalator',
+                width: this.addModel.width
+            };
+            this.$emit('deleteDataModel', escalatorModel);
+            this.initPage();
+        },
+        initPage() {
+            this.isUpdate = false;
+            this.buttonText = '立即创建';
+            this.showDeleteButton = false;
+            this.addModel = {
+                code: '',
+                width: 25,
+                x: 10,
+                y: 10
+            };
+        }
+    }
+
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/iscs/iscsDraw/iscsOperate/index.vue b/src/views/iscs/iscsDraw/iscsOperate/index.vue
index 67c6ca171..eb778dcac 100644
--- a/src/views/iscs/iscsDraw/iscsOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsOperate/index.vue
@@ -34,6 +34,22 @@
               @deleteDataModel="deleteDataModel"
             />
           </el-tab-pane>
+          <el-tab-pane label="扶梯" name="Escalator">
+            <escalator
+              ref="escalator"
+              style="width: 90%;"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="闸机" name="BrakeMachine">
+            <brake-machine
+              ref="brakeMachine"
+              style="width: 90%;"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
+          </el-tab-pane>
           <el-tab-pane label="烟感探测器" name="SmokeDetector">
             <smoke-detector
               ref="smokeDetector"
@@ -81,6 +97,8 @@
 </template>
 <script>
 import {deviceFactory} from '@/iscs/utils/parser';
+import BrakeMachine from './brakeMachine';
+import Escalator from './escalator';
 import ManualAlarmButton from './manualAlarmButton';
 import FireHydranAlarmButton from './fireHydranAlarmButton';
 import GasFireControl from './gasFireControl';
@@ -98,6 +116,8 @@ export default {
         GasFireControl,
         SmokeDetector,
         TemperatureDetector,
+        BrakeMachine,
+        Escalator,
         IscsText,
         IscsRect,
         IscsLine

From 81ea1a4d3a3473d3c47e3e6d7ce97efac7ab4180 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 6 Feb 2020 16:49:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ISCS=20=E7=BB=98=E5=9B=BE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/constant/iscsData.js  | 2 +-
 src/iscs/shape/brakeMachine.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index 89071bb3f..25a0e95ef 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -6,7 +6,7 @@ const iscsData = {
     '41': {},
     '42': {"vidiconList":[{"_type":"Vidicon","code":"Vidicon_1","width":40,"right":true,"point":{"x":311,"y":248},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_2","width":40,"right":true,"point":{"x":321,"y":158},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_3","width":40,"right":true,"point":{"x":324,"y":93},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_4","width":40,"right":true,"point":{"x":559,"y":72},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_5","width":40,"right":true,"point":{"x":547,"y":163},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_6","width":40,"right":true,"point":{"x":562,"y":272},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_7","width":40,"right":true,"point":{"x":751,"y":98},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_8","width":40,"right":true,"point":{"x":750,"y":156},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_9","width":40,"right":false,"point":{"x":846,"y":71},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_10","width":40,"right":false,"point":{"x":846,"y":269},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_11","width":40,"right":false,"point":{"x":940,"y":182},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_12","width":40,"right":false,"point":{"x":1082,"y":90},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_13","width":40,"right":false,"point":{"x":1079,"y":245},"zlevel":1,"z":4}],"iscsRectList":[{"point":{"x":25,"y":176},"code":"IscsRect_1","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":96,"y":176},"code":"IscsRect_2","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":167,"y":176},"code":"IscsRect_3","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":238,"y":176},"code":"IscsRect_4","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":309,"y":149},"code":"IscsRect_5","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":90,"zlevel":1,"z":3},{"point":{"x":380,"y":124},"code":"IscsRect_6","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":45,"height":80,"zlevel":1,"z":3},{"point":{"x":425,"y":134},"code":"IscsRect_7","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":30,"zlevel":1,"z":3},{"point":{"x":425,"y":164},"code":"IscsRect_8","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":30,"zlevel":1,"z":3},{"point":{"x":739,"y":149},"code":"IscsRect_9","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":70,"height":60,"zlevel":1,"z":3},{"point":{"x":1060,"y":135},"code":"IscsRect_10","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":80,"zlevel":1,"z":3},{"point":{"x":1115,"y":150},"code":"IscsRect_11","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":65,"zlevel":1,"z":3},{"point":{"x":1170,"y":150},"code":"IscsRect_12","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":55,"height":65,"zlevel":1,"z":3},{"point":{"x":1225,"y":135},"code":"IscsRect_13","_type":"IscsRect","fillColor":"rgba(239, 231, 231, 0)","borderWidth":2,"strokeColor":"#F7F1F1","width":125,"height":80,"zlevel":1,"z":3}],"vidiconCloudList":[{"_type":"VidiconCloud","code":"VidiconCloud_1","r":18,"point":{"x":59,"y":211},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_2","r":18,"point":{"x":131,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_3","r":18,"point":{"x":203,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_4","r":18,"point":{"x":273,"y":212},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_5","r":18,"point":{"x":511,"y":131},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_6","r":18,"point":{"x":1010,"y":141},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_7","r":18,"point":{"x":1255,"y":140},"zlevel":1,"z":4}],"iscsLineList":[{"point1":{"x":370,"y":50},"point2":{"x":1075,"y":50},"code":"IscsLine_1","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":370,"y":306},"point2":{"x":1075,"y":306},"code":"IscsLine_2","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":380,"y":50},"point2":{"x":380,"y":90},"code":"IscsLine_3","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":50}},{"point1":{"x":380,"y":90},"point2":{"x":395,"y":100},"code":"IscsLine_4","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":90}},{"point1":{"x":395,"y":100},"point2":{"x":380,"y":110},"code":"IscsLine_5","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":395,"y":100}},{"point1":{"x":380,"y":110},"point2":{"x":380,"y":245},"code":"IscsLine_6","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":110}},{"point1":{"x":380,"y":245},"point2":{"x":395,"y":255},"code":"IscsLine_7","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":380,"y":245}},{"point1":{"x":395,"y":255},"point2":{"x":380,"y":265},"code":"IscsLine_8","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":395,"y":255}},{"point1":{"x":1060,"y":50},"point2":{"x":1060,"y":90},"code":"IscsLine_9","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4},{"point1":{"x":1060,"y":90},"point2":{"x":1045,"y":100},"code":"IscsLine_10","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":90}},{"point1":{"x":1045,"y":100},"point2":{"x":1060,"y":110},"code":"IscsLine_11","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1045,"y":100}},{"point1":{"x":1060,"y":110},"point2":{"x":1060,"y":245},"code":"IscsLine_12","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":110}},{"point1":{"x":1060,"y":245},"point2":{"x":1045,"y":255},"code":"IscsLine_13","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1060,"y":245}},{"point1":{"x":1045,"y":255},"point2":{"x":1060,"y":265},"code":"IscsLine_14","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":1045,"y":255}},{"point1":{"x":1060,"y":265},"point2":{"x":1060,"y":305},"code":"IscsLine_15","_type":"IscsLine","lineWidth":2,"fillColor":"#F7F1F1","zlevel":1,"z":4}],"iscsTextList":[{"point":{"x":40,"y":187},"code":"IscsText_1","_type":"IscsText","context":"控制室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":103,"y":180},"code":"IscsText_2","_type":"IscsText","context":"  35KV\n开关柜室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":173,"y":181},"code":"IscsText_3","_type":"IscsText","context":"  直流\n开关柜室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":252,"y":183},"code":"IscsText_4","_type":"IscsText","context":"0.4KV\n低压室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":388,"y":137},"code":"IscsText_5","_type":"IscsText","context":"排热\n风室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":439,"y":144},"code":"IscsText_6","_type":"IscsText","context":"男厕","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":438,"y":175},"code":"IscsText_7","_type":"IscsText","context":"女厕","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":758,"y":192},"code":"IscsText_8","_type":"IscsText","context":"电梯","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1066,"y":150},"code":"IscsText_9","_type":"IscsText","context":"屏蔽门\n控制室","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1175,"y":166},"code":"IscsText_10","_type":"IscsText","context":"配电间","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1235,"y":186},"code":"IscsText_11","_type":"IscsText","context":"商用通\n信设备","textFill":"#C1B38D","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":37,"y":238},"code":"IscsText_12","_type":"IscsText","context":"01015#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":110,"y":238},"code":"IscsText_13","_type":"IscsText","context":"01016#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":180,"y":239},"code":"IscsText_14","_type":"IscsText","context":"01017#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":251,"y":238},"code":"IscsText_15","_type":"IscsText","context":"01018#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":323,"y":182},"code":"IscsText_16","_type":"IscsText","context":"01039#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":324,"y":118},"code":"IscsText_17","_type":"IscsText","context":"01049#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":311,"y":272},"code":"IscsText_18","_type":"IscsText","context":"01050#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":488,"y":159},"code":"IscsText_19","_type":"IscsText","context":"01020#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":559,"y":95},"code":"IscsText_20","_type":"IscsText","context":"01044#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":547,"y":187},"code":"IscsText_21","_type":"IscsText","context":"01042#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":563,"y":256},"code":"IscsText_22","_type":"IscsText","context":"01043#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":752,"y":119},"code":"IscsText_23","_type":"IscsText","context":"01045#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":749,"y":177},"code":"IscsText_24","_type":"IscsText","context":"01057#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":842,"y":93},"code":"IscsText_25","_type":"IscsText","context":"01047#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":934,"y":204},"code":"IscsText_26","_type":"IscsText","context":"01046#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":839,"y":254},"code":"IscsText_27","_type":"IscsText","context":"01048#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":986,"y":166},"code":"IscsText_28","_type":"IscsText","context":"01019#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1077,"y":111},"code":"IscsText_29","_type":"IscsText","context":"01041#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1073,"y":265},"code":"IscsText_30","_type":"IscsText","context":"01040#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":1232,"y":164},"code":"IscsText_31","_type":"IscsText","context":"01021#","textFill":"#F7F1F1","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4}]},
     '51': {
-        "iscsLineList":[{"point1":{"x":89,"y":117},"point2":{"x":789,"y":117},"code":"IscsLine_1","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4},{"point1":{"x":89,"y":117},"point2":{"x":89,"y":617},"code":"IscsLine_2","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4}]
+        "iscsLineList":[{"point1":{"x":89,"y":117},"point2":{"x":789,"y":117},"code":"IscsLine_1","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4,"point":{"x":89,"y":117}},{"point1":{"x":89,"y":117},"point2":{"x":89,"y":547},"code":"IscsLine_2","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4,"point":{"x":89,"y":117}},{"point1":{"x":89,"y":547},"point2":{"x":219,"y":547},"code":"IscsLine_3","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4,"point":{"x":89,"y":547}},{"point1":{"x":269,"y":117},"point2":{"x":269,"y":127},"code":"IscsLine_4","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","zlevel":1,"z":4,"point":{"x":269,"y":117}}],"ticketMachineList":[{"point":{"x":119,"y":177},"code":"TicketMachine_1","_type":"TicketMachine","width":30,"zlevel":1,"z":4},{"point":{"x":119,"y":227},"code":"TicketMachine_2","_type":"TicketMachine","width":30,"zlevel":1,"z":4},{"point":{"x":119,"y":337},"code":"TicketMachine_3","_type":"TicketMachine","width":30,"zlevel":1,"z":4},{"point":{"x":119,"y":387},"code":"TicketMachine_4","_type":"TicketMachine","width":30,"zlevel":1,"z":4},{"point":{"x":119,"y":437},"code":"TicketMachine_5","_type":"TicketMachine","width":30,"zlevel":1,"z":4},{"point":{"x":119,"y":487},"code":"TicketMachine_6","_type":"TicketMachine","width":30,"zlevel":1,"z":4}],"brakeMachineList":[{"point":{"x":252,"y":127},"isRight":true,"code":"BrakeMachine_1","_type":"BrakeMachine","width":35,"zlevel":1,"z":4},{"point":{"x":252,"y":148},"isRight":true,"code":"BrakeMachine_2","_type":"BrakeMachine","width":35,"zlevel":1,"z":4},{"point":{"x":252,"y":169},"isRight":true,"code":"BrakeMachine_3","_type":"BrakeMachine","width":35,"zlevel":1,"z":4},{"point":{"x":252,"y":190},"isRight":true,"code":"BrakeMachine_4","_type":"BrakeMachine","width":35,"zlevel":1,"z":4},{"point":{"x":252,"y":211},"isRight":true,"code":"BrakeMachine_5","_type":"BrakeMachine","width":35,"zlevel":1,"z":4}],"iscsTextList":[{"point":{"x":211,"y":131},"code":"IscsText_1","_type":"IscsText","context":"G005","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":211,"y":155},"code":"IscsText_2","_type":"IscsText","context":"G006","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":211,"y":177},"code":"IscsText_3","_type":"IscsText","context":"G007","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":211,"y":197},"code":"IscsText_4","_type":"IscsText","context":"G008","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":211,"y":218},"code":"IscsText_5","_type":"IscsText","context":"GT02","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":191},"code":"IscsText_6","_type":"IscsText","context":"V09","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":244},"code":"IscsText_7","_type":"IscsText","context":"V10","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":352},"code":"IscsText_8","_type":"IscsText","context":"V11","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":402},"code":"IscsText_9","_type":"IscsText","context":"V12","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":451},"code":"IscsText_10","_type":"IscsText","context":"V13","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":156,"y":503},"code":"IscsText_11","_type":"IscsText","context":"V14","textFill":"#5EBBBD","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4}]
     },
     '61': {},
     '62': {}
diff --git a/src/iscs/shape/brakeMachine.js b/src/iscs/shape/brakeMachine.js
index c968b4329..d23783f19 100644
--- a/src/iscs/shape/brakeMachine.js
+++ b/src/iscs/shape/brakeMachine.js
@@ -18,7 +18,7 @@ export default class BrakeMachine extends Group {
         });
         this.path = createPathSvg(this.model);
         if (this.model.isRight) {
-            this.grouper.origin = [this.model.width / 2, this.model.width / 2 ];
+            this.grouper.origin = [this.model.width / 2, this.model.width * 0.61 / 2 ];
             this.grouper.rotation = Math.PI;
         }
         this.add(this.grouper);