From df39d836dcf3f38a2f40cb747c99ab791c176552 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Sun, 19 Jan 2020 14:03:32 +0800
Subject: [PATCH] =?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

---
 .../iscsDraw/iscsAcsOperate/entranceGuard.vue |  8 ++--
 .../iscsDraw/iscsAfcOperate/brakeMachine.vue  |  8 ++--
 .../semiAutomaticTicketMachine.vue            |  8 ++--
 .../iscsDraw/iscsAfcOperate/ticketMachine.vue |  8 ++--
 .../iscsBasOperate/airConditioner.vue         |  4 +-
 .../iscsDraw/iscsBasOperate/chiller.vue       |  4 +-
 .../iscsDraw/iscsBasOperate/coolTower.vue     |  4 +-
 .../iscsDraw/iscsBasOperate/fireDamper.vue    |  4 +-
 .../iscsDraw/iscsBasOperate/frozenPump.vue    |  4 +-
 .../system/iscsDraw/iscsBasOperate/jetFan.vue |  4 +-
 .../iscsBasOperate/orbitalVentilator.vue      |  4 +-
 .../iscsDraw/iscsBasOperate/smookProofFd.vue  |  4 +-
 .../iscsDraw/iscsBasOperate/tunnelFan.vue     |  4 +-
 .../iscsDraw/iscsBasOperate/ventilator.vue    |  4 +-
 .../iscsOperate/fireHydranAlarmButton.vue     |  8 ++--
 .../iscsDraw/iscsOperate/gasFireControl.vue   | 39 +++++++++++------
 .../iscsOperate/manualAlarmButton.vue         | 39 +++++++++++------
 .../iscsDraw/iscsOperate/smokeDetector.vue    | 41 ++++++++++++------
 .../iscsOperate/temperatureDetector.vue       | 36 ++++++++++++----
 .../iscsDraw/iscsPsdOperate/borderRadius.vue  | 42 +++++++++++++------
 .../iscsDraw/iscsPsdOperate/endDoor.vue       | 41 ++++++++++++------
 .../iscsPsdOperate/platformScreenDoor.vue     | 39 +++++++++++------
 22 files changed, 233 insertions(+), 124 deletions(-)

diff --git a/src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue b/src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue
index 58ce6f23e..985e87750 100644
--- a/src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue
+++ b/src/views/system/iscsDraw/iscsAcsOperate/entranceGuard.vue
@@ -57,10 +57,10 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form.code = model.code;
-                this.form.width = model.width;
-                this.form.x = model.point.x;
-                this.form.y = model.point.y;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
             }
         }
     },
diff --git a/src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue b/src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue
index fa6672e01..eb26a423c 100644
--- a/src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue
+++ b/src/views/system/iscsDraw/iscsAfcOperate/brakeMachine.vue
@@ -57,10 +57,10 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form.code = model.code;
-                this.form.width = model.width;
-                this.form.x = model.point.x;
-                this.form.y = model.point.y;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
             }
         }
     },
diff --git a/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue b/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
index af52e4d32..362643a0d 100644
--- a/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
+++ b/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
@@ -57,10 +57,10 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form.code = model.code;
-                this.form.width = model.width;
-                this.form.x = model.point.x;
-                this.form.y = model.point.y;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
             }
         }
     },
diff --git a/src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue b/src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue
index 2d860b5b9..fb471d677 100644
--- a/src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue
+++ b/src/views/system/iscsDraw/iscsAfcOperate/ticketMachine.vue
@@ -57,10 +57,10 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form.code = model.code;
-                this.form.width = model.width;
-                this.form.x = model.point.x;
-                this.form.y = model.point.y;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
             }
         }
     },
diff --git a/src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue b/src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue
index dff906551..4d94a7a7f 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/airConditioner.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'AirConditioner' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/chiller.vue b/src/views/system/iscsDraw/iscsBasOperate/chiller.vue
index c894ffcd8..5f42c51df 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/chiller.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/chiller.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'Chiller' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/coolTower.vue b/src/views/system/iscsDraw/iscsBasOperate/coolTower.vue
index daa7bc14a..ef1eb8f00 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/coolTower.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/coolTower.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'CoolTower' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue b/src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue
index acabe4cf3..d01089f77 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/fireDamper.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'FireDamper' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue b/src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue
index fc4ca4814..309c8eac3 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/frozenPump.vue
@@ -69,8 +69,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'FrozenPump' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/jetFan.vue b/src/views/system/iscsDraw/iscsBasOperate/jetFan.vue
index a180c5c2a..50a21a9e1 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/jetFan.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/jetFan.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'JetFan' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue b/src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue
index fc093211a..ba241bb88 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/orbitalVentilator.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'OrbitalVentilator' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue b/src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue
index 61cd6f112..5533b60f7 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/smookProofFd.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'SmookProofFd' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue b/src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue
index 994161a7e..5dffd7b2a 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/tunnelFan.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'TunnelFan' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsBasOperate/ventilator.vue b/src/views/system/iscsDraw/iscsBasOperate/ventilator.vue
index d221c4088..2ef00ff9e 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/ventilator.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/ventilator.vue
@@ -59,8 +59,8 @@ export default {
         ])
     },
     watch:{
-        '$store.state.ibp.rightClickCount': function (val) {
-            const model = this.$store.getters['ibp/updateDeviceData'];
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
             if (model._type === 'Ventilator' ) {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
diff --git a/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue b/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
index 49fa27d13..180e3ea0a 100644
--- a/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
+++ b/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
@@ -56,10 +56,10 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form.code = model.code;
-                this.form.width = model.width;
-                this.form.x = model.point.x;
-                this.form.y = model.point.y;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
             }
         }
     },
diff --git a/src/views/system/iscsDraw/iscsOperate/gasFireControl.vue b/src/views/system/iscsDraw/iscsOperate/gasFireControl.vue
index eb632d39c..0fb96f0ad 100644
--- a/src/views/system/iscsDraw/iscsOperate/gasFireControl.vue
+++ b/src/views/system/iscsDraw/iscsOperate/gasFireControl.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" />
@@ -23,6 +23,8 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
     name: 'GasFireControl',
     data() {
@@ -38,15 +40,32 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate:false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'gasFireControlList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'GasFireControl' ) {
+                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) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -54,8 +73,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'gasFireControl',
+                        code: this.isUpdate ? this.form.code : getUID('GasFireControl', this.gasFireControlList),
+                        _type: 'GasFireControl',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +91,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'gasFireControl',
+                _type: 'GasFireControl',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +107,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'gasFireControl_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue b/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
index c2423b046..2870c0ddc 100644
--- a/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
+++ b/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" />
@@ -23,6 +23,8 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
     name: 'ManualAlarmButton',
     data() {
@@ -38,15 +40,32 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate:false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'manualAlarmButtonList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'ManualAlarmButton' ) {
+                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) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -54,8 +73,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'manualAlarmButton',
+                        code: this.isUpdate ? this.form.code : getUID('VolumeControlDamper', this.manualAlarmButtonList),
+                        _type: 'ManualAlarmButton',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +91,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'manualAlarmButton',
+                _type: 'ManualAlarmButton',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +107,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'manualAlarmButton_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsOperate/smokeDetector.vue b/src/views/system/iscsDraw/iscsOperate/smokeDetector.vue
index a1319599a..dc0d9ef2f 100644
--- a/src/views/system/iscsDraw/iscsOperate/smokeDetector.vue
+++ b/src/views/system/iscsDraw/iscsOperate/smokeDetector.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" />
@@ -23,8 +23,10 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
-    name: 'GasFireControl',
+    name: 'SmokeDetector',
     data() {
         return {
             addModel:{
@@ -38,15 +40,32 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate:false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'smokeDetectorList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'SmokeDetector' ) {
+                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) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -54,8 +73,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'smokeDetector',
+                        code: this.isUpdate ? this.form.code : getUID('SmokeDetector', this.smokeDetectorList),
+                        _type: 'SmokeDetector',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +91,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'smokeDetector',
+                _type: 'SmokeDetector',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +107,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'smokeDetector_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue b/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
index 680cc4a41..9f2f2e369 100644
--- a/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
+++ b/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <el-form-item v-if="isUpdate" label="按钮编号" prop="code">
+        <el-input v-model="addModel.code" :disabeled="true" />
       </el-form-item>
       <el-form-item label="图形宽度" prop="width">
         <el-input-number v-model="addModel.width" />
@@ -23,6 +23,8 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
     name: 'TemperatureDetector',
     data() {
@@ -38,10 +40,30 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate: false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'temperatureDetectorList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'TemperatureDetector' ) {
+                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) {
             if (!this.addModel.code) {
@@ -54,8 +76,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'temperatureDetector',
+                        code: this.isUpdate ? this.form.code : getUID('TemperatureDetector', this.temperatureDetectorList),
+                        _type: 'TemperatureDetector',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +94,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'temperatureDetector',
+                _type: 'TemperatureDetector',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +110,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'temperatureDetector_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue b/src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue
index 4b6f55c2d..88a51db45 100644
--- a/src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue
+++ b/src/views/system/iscsDraw/iscsPsdOperate/borderRadius.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" controls-position="right" />
@@ -26,8 +26,10 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
-    name: 'PlatformScreenDoor',
+    name: 'BorderRadius',
     data() {
         return {
             addModel:{
@@ -43,15 +45,33 @@ export default {
                 x: [{ required: true, message: '请输入图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate: false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'borderRadiusList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'BorderRadius' ) {
+                this.buttonText = '修改';
+                this.showDeleteButton = true;
+                this.isUpdate = true;
+                this.addModel.code = model.code;
+                this.addModel.width = model.width;
+                this.addModel.height = model.height;
+                this.addModel.x = model.point.x;
+                this.addModel.y = model.point.y;
+            }
+        }
+    },
     methods: {
         onSubmit(form) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -59,8 +79,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'borderRadius',
+                        code: this.isUpdate ? this.form.code : getUID('BorderRadius', this.borderRadiusList),
+                        _type: 'BorderRadius',
                         width: this.addModel.width,
                         height: this.addModel.height
                     };
@@ -78,7 +98,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'borderRadius',
+                _type: 'BorderRadius',
                 width: this.addModel.width,
                 height: this.addModel.height
             };
@@ -96,10 +116,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'borderRadius_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue b/src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue
index 34a012a6f..76eb6983f 100644
--- a/src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue
+++ b/src/views/system/iscsDraw/iscsPsdOperate/endDoor.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" />
@@ -23,8 +23,10 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
-    name: 'PlatformScreenDoor',
+    name: 'EndDoor',
     data() {
         return {
             addModel:{
@@ -38,15 +40,32 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate: false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'endDoorList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'EndDoor' ) {
+                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) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -54,8 +73,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'endDoor',
+                        code: this.isUpdate ? this.form.code : getUID('EndDoor', this.endDoorList),
+                        _type: 'EndDoor',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +91,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'endDoor',
+                _type: 'EndDoor',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +107,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'endDoor_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }
 
diff --git a/src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue b/src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue
index 9861878d9..2e6c02438 100644
--- a/src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue
+++ b/src/views/system/iscsDraw/iscsPsdOperate/platformScreenDoor.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-form ref="form" :rule="rules" :model="addModel" label-width="100px">
-      <el-form-item v-if="addModel.code" label="按钮编号" prop="code">
-        <el-input v-model="addModel.code" />
+      <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" />
@@ -23,6 +23,8 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+import {getUID} from '@/iscs/utils/Uid';
 export default {
     name: 'PlatformScreenDoor',
     data() {
@@ -38,15 +40,32 @@ export default {
                 x: [{ required: true, message: '请输入设备图形的X轴坐标', trigger: 'blur' }],
                 y: [{ required: true, message: '请输入设备图形的Y轴坐标', trigger: 'blur' }]
             },
+            isUpdate: false,
             showDeleteButton: false,
             buttonText: '立即创建'
         };
     },
+    computed:{
+        ...mapGetters('iscs', [
+            'platformScreenDoorList'
+        ])
+    },
+    watch:{
+        '$store.state.iscs.rightClickCount': function (val) {
+            const model = this.$store.getters['iscs/updateDeviceData'];
+            if (model._type === 'PlatformScreenDoor' ) {
+                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) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {
@@ -54,8 +73,8 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.addModel.code,
-                        _type: 'platformScreenDoor',
+                        code: this.isUpdate ? this.form.code : getUID('PlatformScreenDoor', this.platformScreenDoorList),
+                        _type: 'PlatformScreenDoor',
                         width: this.addModel.width
                     };
                     this.$emit('createDataModel', maButtonModel);
@@ -72,7 +91,7 @@ export default {
                     y: this.addModel.y
                 },
                 code: this.addModel.code,
-                _type: 'platformScreenDoor',
+                _type: 'PlatformScreenDoor',
                 width: this.addModel.width
             };
             this.$emit('deleteDataModel', maButtonModel);
@@ -88,10 +107,6 @@ export default {
                 x: 10,
                 y: 10
             };
-        },
-        generateCode() {
-            const mydate = new Date();
-            this.addModel.code = 'platformScreenDoor_' + mydate.getDay() + mydate.getHours() + mydate.getMinutes() + mydate.getSeconds() + mydate.getMilliseconds() + Math.round(Math.random() * 10000);
         }
     }