From 0d3a095a81de704f5cc09ade11bfa6b7ef44a139 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Sun, 19 Jan 2020 14:56:22 +0800
Subject: [PATCH] =?UTF-8?q?iscs=20=E7=BB=98=E5=9B=BE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/shape/bas/chiller.js                             | 8 ++++----
 src/iscs/shape/bas/frozenPump.js                          | 2 +-
 .../iscsAfcOperate/semiAutomaticTicketMachine.vue         | 2 +-
 .../iscsDraw/iscsBasOperate/volumeControlDamper.vue       | 2 +-
 .../system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue | 2 +-
 .../system/iscsDraw/iscsOperate/manualAlarmButton.vue     | 2 +-
 .../system/iscsDraw/iscsOperate/temperatureDetector.vue   | 3 ---
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/iscs/shape/bas/chiller.js b/src/iscs/shape/bas/chiller.js
index 009ff7d84..163357065 100644
--- a/src/iscs/shape/bas/chiller.js
+++ b/src/iscs/shape/bas/chiller.js
@@ -31,7 +31,7 @@ export default class chiller extends Group {
             },
             style: {
                 stroke:this.model.color,
-                lineWidth:2
+                lineWidth:1
             }
         });
         this.circle1 = new Circle({
@@ -81,7 +81,7 @@ export default class chiller extends Group {
             },
             style: {
                 stroke:this.model.color,
-                lineWidth:2
+                lineWidth:1
             }
         });
 
@@ -104,7 +104,7 @@ export default class chiller extends Group {
             },
             style: {
                 stroke:this.model.color,
-                lineWidth:2
+                lineWidth:1
             }
         });
 
@@ -127,7 +127,7 @@ export default class chiller extends Group {
             },
             style: {
                 stroke:this.model.color,
-                lineWidth:2
+                lineWidth:1
             }
         });
 
diff --git a/src/iscs/shape/bas/frozenPump.js b/src/iscs/shape/bas/frozenPump.js
index fdffe2fd0..8782850f0 100644
--- a/src/iscs/shape/bas/frozenPump.js
+++ b/src/iscs/shape/bas/frozenPump.js
@@ -26,7 +26,7 @@ export default class frozenPump extends Group {
             },
             style: {
                 stroke: this.model.color,
-                lineWidth:2
+                lineWidth:1
             }
         });
         this.triangle = new Polygon({
diff --git a/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue b/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
index ea98b3369..09568b703 100644
--- a/src/views/system/iscsDraw/iscsAfcOperate/semiAutomaticTicketMachine.vue
+++ b/src/views/system/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('VolumeControlDamper', this.iscs.semiAutomaticTicketMachineList),
+                        code: this.isUpdate ? this.form.code : getUID('SemiAutomaticTicketMachine', this.iscs.semiAutomaticTicketMachineList),
                         _type: 'SemiAutomaticTicketMachine',
                         width: this.addModel.width
                     };
diff --git a/src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue b/src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue
index ecf552c4f..c43bdce38 100644
--- a/src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue
+++ b/src/views/system/iscsDraw/iscsBasOperate/volumeControlDamper.vue
@@ -84,7 +84,7 @@ export default {
                             x: this.form.x,
                             y: this.form.y
                         },
-                        _type: 'AirConditioner',
+                        _type: 'VolumeControlDamper',
                         code: this.isUpdate ? this.form.code : getUID('VolumeControlDamper', this.iscs.volumeControlDamperList),
                         width: this.form.width,
                         color:'#00ff00'
diff --git a/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue b/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
index 4476cac06..2fb599a1d 100644
--- a/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
+++ b/src/views/system/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
@@ -72,7 +72,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('VolumeControlDamper', this.iscs.fireHydranAlarmButtonList),
+                        code: this.isUpdate ? this.form.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList),
                         _type: 'FireHydranAlarmButton',
                         width: this.addModel.width
                     };
diff --git a/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue b/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
index a1f5eabe2..8eec1f1b6 100644
--- a/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
+++ b/src/views/system/iscsDraw/iscsOperate/manualAlarmButton.vue
@@ -73,7 +73,7 @@ export default {
                             x: this.addModel.x,
                             y: this.addModel.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('VolumeControlDamper', this.iscs.manualAlarmButtonList),
+                        code: this.isUpdate ? this.form.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList),
                         _type: 'ManualAlarmButton',
                         width: this.addModel.width
                     };
diff --git a/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue b/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
index 34f4f2d1b..15a2deb4d 100644
--- a/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
+++ b/src/views/system/iscsDraw/iscsOperate/temperatureDetector.vue
@@ -66,9 +66,6 @@ export default {
     },
     methods: {
         onSubmit(form) {
-            if (!this.addModel.code) {
-                this.generateCode();
-            }
             this.$refs[form].validate((valid) => {
                 if (valid) {
                     const maButtonModel = {