From e560ee0e02c8329ee665da8781dfdf174dac5a2f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 5 Feb 2020 17:05:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?iscs=20=20=E7=9F=A9=E5=BD=A2=E5=92=8C?= =?UTF-8?q?=E6=96=87=E5=AD=97=20=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C?= =?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 | 10 ++--- src/iscs/shape/line.js | 1 + .../iscs/iscsDraw/iscsAcsOperate/index.vue | 1 + .../iscs/iscsDraw/iscsCommonElem/line.vue | 35 ++++----------- .../iscs/iscsDraw/iscsCommonElem/rect.vue | 21 --------- .../iscs/iscsDraw/iscsCommonElem/text.vue | 20 --------- .../iscsOperate/fireHydranAlarmButton.vue | 5 +-- .../iscsDraw/iscsOperate/gasFireControl.vue | 5 +-- src/views/iscs/iscsDraw/iscsOperate/index.vue | 45 ++++++++++--------- .../iscsOperate/manualAlarmButton.vue | 5 +-- .../iscsDraw/iscsOperate/smokeDetector.vue | 5 +-- .../iscsOperate/temperatureDetector.vue | 5 +-- 12 files changed, 45 insertions(+), 113 deletions(-) diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js index 3a9917cbf..2002c1a76 100644 --- a/src/iscs/constant/iscsData.js +++ b/src/iscs/constant/iscsData.js @@ -1,9 +1,9 @@ const iscsData = { - '11': { "iscsLineList": [{ "point1": { "x": 22, "y": 238 }, "point2": { "x": 22, "y": 506 }, "code": "IscsLine_2", "_type": "IscsLine", "lineWidth": 2, "fillColor": "#fff", "zlevel": 1, "z": 4, "point": { "x": 22, "y": 238 } }, { "point1": { "x": 21, "y": 505 }, "point2": { "x": 283, "y": 505 }, "code": "IscsLine_3", "_type": "IscsLine", "lineWidth": 2, "fillColor": "#fff", "zlevel": 1, "z": 4, "point": { "x": 21, "y": 505 } }, { "point1": { "x": 23, "y": 239 }, "point2": { "x": 285, "y": 239 }, "code": "IscsLine_1", "_type": "IscsLine", "lineWidth": 2, "fillColor": "#fff", "zlevel": 1, "z": 4, "point": { "x": 23, "y": 239 } }], "iscsRectList": [{ "point": { "x": 41, "y": 240 }, "code": "IscsRect_1", "_type": "IscsRect", "fillColor": "rgba(181, 181, 181, 0)", "borderWidth": 2, "strokeColor": "#B5B5B5", "width": 86, "height": 89, "zlevel": 1, "z": 3 }] }, - '12': {}, - '21': {}, - '31': {}, - '41': { "vidiconList": [{ "_type": "Vidicon", "code": "Vidicon_1", "width": 40, "right": true, "point": { "x": 178, "y": 73 }, "zlevel": 1, "z": 4 }, { "_type": "Vidicon", "code": "Vidicon_2", "width": 40, "right": true, "point": { "x": 309, "y": 147 }, "zlevel": 1, "z": 4 }, { "_type": "Vidicon", "code": "Vidicon_3", "width": 40, "right": true, "point": { "x": 308, "y": 72 }, "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 }], "vidiconCloudList": [{ "_type": "VidiconCloud", "code": "VidiconCloud_1", "r": 18, "point": { "x": 50, "y": 61 }, "zlevel": 1, "z": 4 }, { "_type": "VidiconCloud", "code": "VidiconCloud_2", "r": 18, "point": { "x": 121, "y": 206 }, "zlevel": 1, "z": 4 }, { "_type": "VidiconCloud", "code": "VidiconCloud_3", "r": 18, "point": { "x": 192, "y": 206 }, "zlevel": 1, "z": 4 }, { "_type": "VidiconCloud", "code": "VidiconCloud_4", "r": 18, "point": { "x": 262, "y": 207 }, "zlevel": 1, "z": 4 }], "iscsLineList": [{ "point1": { "x": 375, "y": 50 }, "point2": { "x": 1075, "y": 50 }, "code": "IscsLine_1", "_type": "IscsLine", "lineWidth": 10, "fillColor": "#F7F1F1", "zlevel": 1, "z": 4, "point": { "x": 375, "y": 50 } }, { "point1": { "x": 376, "y": 306 }, "point2": { "x": 1076, "y": 306 }, "code": "IscsLine_2", "_type": "IscsLine", "lineWidth": 10, "fillColor": "#F7F1F1", "zlevel": 1, "z": 4, "point": { "x": 376, "y": 306 } }] }, + '11': { 'manualAlarmButtonList': [{ 'point': { 'x': 560, 'y': 100 }, 'code': 'ManualAlarmButton_1', '_type': 'ManualAlarmButton', 'width': 25, 'zlevel': 1, 'z': 4 }], 'fireHydranAlarmButtonList': [{ 'point': { 'x': 562, 'y': 234 }, 'code': 'FireHydranAlarmButton_1', '_type': 'FireHydranAlarmButton', 'width': 25, 'zlevel': 1, 'z': 4 }, { 'point': { 'x': 201, 'y': 242 }, 'code': 'FireHydranAlarmButton_2', '_type': 'FireHydranAlarmButton', 'width': 25, 'zlevel': 1, 'z': 4 }, { 'point': { 'x': 391, 'y': 127 }, 'code': 'FireHydranAlarmButton_3', '_type': 'FireHydranAlarmButton', 'width': 25, 'zlevel': 1, 'z': 4 }] }, + '12':{}, + '21':{}, + '31':{}, + '41': {"vidiconList":[{"_type":"Vidicon","code":"Vidicon_1","width":40,"right":true,"point":{"x":178,"y":73},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_2","width":40,"right":true,"point":{"x":309,"y":147},"zlevel":1,"z":4},{"_type":"Vidicon","code":"Vidicon_3","width":40,"right":true,"point":{"x":308,"y":72},"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}],"vidiconCloudList":[{"_type":"VidiconCloud","code":"VidiconCloud_1","r":18,"point":{"x":50,"y":61},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_2","r":18,"point":{"x":121,"y":206},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_3","r":18,"point":{"x":192,"y":206},"zlevel":1,"z":4},{"_type":"VidiconCloud","code":"VidiconCloud_4","r":18,"point":{"x":262,"y":207},"zlevel":1,"z":4}],"iscsLineList":[{"point1":{"x":375,"y":50},"point2":{"x":1075,"y":50},"code":"IscsLine_1","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":375,"y":50}},{"point1":{"x":376,"y":306},"point2":{"x":1076,"y":306},"code":"IscsLine_2","_type":"IscsLine","lineWidth":10,"fillColor":"#F7F1F1","zlevel":1,"z":4,"point":{"x":376,"y":306}}]}, '42': {}, '51': {}, '61': {}, diff --git a/src/iscs/shape/line.js b/src/iscs/shape/line.js index 294d1489c..fe5928730 100644 --- a/src/iscs/shape/line.js +++ b/src/iscs/shape/line.js @@ -14,6 +14,7 @@ export default class line extends Group { } create() { const model = this.model; + console.log(model); this.grouper = new Group({ id: model.code, position: [model.point1.x, model.point1.y] diff --git a/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue b/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue index 21fbce27e..d8a635f74 100644 --- a/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue +++ b/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue @@ -88,6 +88,7 @@ export default { }, methods: { createDataModel(model) { + console.log(model); const newModel = deviceFactory(model._type, model); this.$store.dispatch('iscs/updateIscsDevices', newModel.model); }, diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/line.vue b/src/views/iscs/iscsDraw/iscsCommonElem/line.vue index 0623243e0..7c6fc9f5e 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/line.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/line.vue @@ -41,7 +41,7 @@ export default { form: { code: '', lineWidth: '', - fillColor: '#fff', + fillColor: '#000000', x1: 10, y1: 10, x2: 20, @@ -54,18 +54,6 @@ export default { fillColor: [ { required: true, message: '请输入线段颜色', trigger: 'blur' } ], - x1: [ - { required: true, message: '请输入数值', trigger: 'blur' } - ], - y1: [ - { required: true, message: '请输入数值', trigger: 'blur' } - ], - x2: [ - { required: true, message: '请输入数值', trigger: 'blur' } - ], - y2: [ - { required: true, message: '请输入数值', trigger: 'blur' } - ] } }; }, @@ -74,22 +62,20 @@ export default { 'iscs' ]) }, - watch: { + watch:{ '$store.state.iscs.rightClickCount': function (val) { const model = this.$store.getters['iscs/updateDeviceData']; if (model._type === 'IscsLine' ) { this.buttonText = '修改'; this.showDeleteButton = true; this.isUpdate = true; - this.form = { - code: model.code, - lineWidth: model.lineWidth, - fillColor: model.fillColor, - x1: model.point1.x, - y1: model.point1.y, - x2: model.point2.x, - y2: model.point2.y - }; + this.form.code = model.code; + this.form.lineWidth = model.lineWidth; + this.form.fillColor = model.fillColor; + this.form.x1 = model.point1.x; + this.form.y1 = model.point1.y; + this.form.x1 = model.point2.x; + this.form.y2 = model.point2.y; } } }, @@ -112,9 +98,6 @@ export default { lineWidth: this.form.lineWidth, fillColor: this.form.fillColor }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', lineModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue b/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue index 17772dac4..bf6ad2ca2 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue @@ -69,24 +69,6 @@ export default { ]) }, watch: { - '$store.state.iscs.rightClickCount': function (val) { - const model = this.$store.getters['iscs/updateDeviceData']; - if (model._type === 'IscsRect' ) { - this.buttonText = '修改'; - this.showDeleteButton = true; - this.isUpdate = true; - this.form = { - code: model.code, - fillColor: model.fillColor, - borderWidth: model.borderWidth, - strokeColor: model.strokeColor, - width: model.width, - height: model.height, - x: model.point.x, - y: model.point.y - }; - } - } }, mounted() {}, methods: { @@ -106,9 +88,6 @@ export default { width: this.form.width, height: this.form.height }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', rectModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/text.vue b/src/views/iscs/iscsDraw/iscsCommonElem/text.vue index 6c257bba2..063334852 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/text.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/text.vue @@ -74,23 +74,6 @@ export default { ]) }, watch: { - '$store.state.iscs.rightClickCount': function (val) { - const model = this.$store.getters['iscs/updateDeviceData']; - if (model._type === 'IscsText' ) { - this.buttonText = '修改'; - this.showDeleteButton = true; - this.isUpdate = true; - this.form = { - code: model.code, - context: model.context, - textFill: model.textFill, - fontSize: model.fontSize, - fontWeight: model.fontWeight, - x: model.point.x, - y: model.point.y - }; - } - } }, mounted() {}, methods: { @@ -110,9 +93,6 @@ export default { fontWeight: this.form.fontWeight, fontFamily: 'consolas' }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', textModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue index 83f1184f4..2fb599a1d 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue @@ -72,13 +72,10 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.addModel.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList), + code: this.isUpdate ? this.form.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList), _type: 'FireHydranAlarmButton', width: this.addModel.width }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', maButtonModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue b/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue index a63ea753b..865cb1282 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue @@ -73,13 +73,10 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.addModel.code : getUID('GasFireControl', this.iscs.gasFireControlList), + code: this.isUpdate ? this.form.code : getUID('GasFireControl', this.iscs.gasFireControlList), _type: 'GasFireControl', width: this.addModel.width }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', maButtonModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsOperate/index.vue b/src/views/iscs/iscsDraw/iscsOperate/index.vue index 3aed1c695..67c6ca171 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/index.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/index.vue @@ -50,27 +50,30 @@ @deleteDataModel="deleteDataModel" /> - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue index 05f76b837..8eec1f1b6 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue @@ -73,13 +73,10 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.addModel.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList), + code: this.isUpdate ? this.form.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList), _type: 'ManualAlarmButton', width: this.addModel.width }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', maButtonModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue index 539cb6a06..6b21380db 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue @@ -73,13 +73,10 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.addModel.code : getUID('SmokeDetector', this.iscs.smokeDetectorList), + code: this.isUpdate ? this.form.code : getUID('SmokeDetector', this.iscs.smokeDetectorList), _type: 'SmokeDetector', width: this.addModel.width }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', maButtonModel); this.initPage(); } else { diff --git a/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue index 84c441301..15a2deb4d 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue @@ -73,13 +73,10 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.addModel.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList), + code: this.isUpdate ? this.form.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList), _type: 'TemperatureDetector', width: this.addModel.width }; - if (this.isUpdate) { - this.deleteDevice(); - } this.$emit('createDataModel', maButtonModel); this.initPage(); } else { From 544b930e48c1ac49a71e5aab74e4769b9337a9eb Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 5 Feb 2020 17:06:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?iscs=20=20=E7=9F=A9=E5=BD=A2=E5=8F=B3?= =?UTF-8?q?=E9=94=AE=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 --- .../iscs/iscsDraw/iscsCommonElem/rect.vue | 18 +++++++++++++++++- .../iscs/iscsDraw/iscsCommonElem/text.vue | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue b/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue index bf6ad2ca2..565084ffb 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/rect.vue @@ -68,7 +68,23 @@ export default { 'iscs' ]) }, - watch: { + watch:{ + '$store.state.iscs.rightClickCount': function (val) { + const model = this.$store.getters['iscs/updateDeviceData']; + if (model._type === 'IscsRect' ) { + this.buttonText = '修改'; + this.showDeleteButton = true; + this.isUpdate = true; + this.form.code = model.code; + this.form.fillColor = model.fillColor; + this.form.borderWidth = model.borderWidth; + this.form.strokeColor = model.strokeColor; + this.form.width = model.width; + this.form.height = model.height; + this.form.x = model.point.x; + this.form.y = model.point.y; + } + } }, mounted() {}, methods: { diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/text.vue b/src/views/iscs/iscsDraw/iscsCommonElem/text.vue index 063334852..dbe1e1819 100644 --- a/src/views/iscs/iscsDraw/iscsCommonElem/text.vue +++ b/src/views/iscs/iscsDraw/iscsCommonElem/text.vue @@ -73,7 +73,22 @@ export default { 'iscs' ]) }, - watch: { + watch:{ + '$store.state.iscs.rightClickCount': function (val) { + const model = this.$store.getters['iscs/updateDeviceData']; + if (model._type === 'IscsText' ) { + this.buttonText = '修改'; + this.showDeleteButton = true; + this.isUpdate = true; + this.form.code = model.code; + this.form.context = model.context; + this.form.fontSize = model.fontSize; + this.form.fontWeight = model.fontWeight; + this.form.textFill = model.textFill; + this.form.x = model.point.x; + this.form.y = model.point.y; + } + } }, mounted() {}, methods: { From 3133025fc9e5d0523136404d5b9361d1b8f166ab Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 5 Feb 2020 17:16:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?iscs=20fas=20=E5=85=83=E7=B4=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=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/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue | 2 +- src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue | 2 +- src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue | 2 +- src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue | 2 +- src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue index 2fb599a1d..6ee153ca2 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue +++ b/src/views/iscs/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('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList), + code: this.isUpdate ? this.addModel.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList), _type: 'FireHydranAlarmButton', width: this.addModel.width }; diff --git a/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue b/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue index 865cb1282..4550f022f 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue @@ -73,7 +73,7 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.form.code : getUID('GasFireControl', this.iscs.gasFireControlList), + code: this.isUpdate ? this.addModel.code : getUID('GasFireControl', this.iscs.gasFireControlList), _type: 'GasFireControl', width: this.addModel.width }; diff --git a/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue b/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue index 8eec1f1b6..531191ade 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue +++ b/src/views/iscs/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('ManualAlarmButton', this.iscs.manualAlarmButtonList), + code: this.isUpdate ? this.addModel.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList), _type: 'ManualAlarmButton', width: this.addModel.width }; diff --git a/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue index 6b21380db..e9a2f2e0a 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue @@ -73,7 +73,7 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.form.code : getUID('SmokeDetector', this.iscs.smokeDetectorList), + code: this.isUpdate ? this.addModel.code : getUID('SmokeDetector', this.iscs.smokeDetectorList), _type: 'SmokeDetector', width: this.addModel.width }; diff --git a/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue b/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue index 15a2deb4d..cf1984e3e 100644 --- a/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue +++ b/src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue @@ -73,7 +73,7 @@ export default { x: this.addModel.x, y: this.addModel.y }, - code: this.isUpdate ? this.form.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList), + code: this.isUpdate ? this.addModel.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList), _type: 'TemperatureDetector', width: this.addModel.width };