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

# Conflicts:
#	src/iscs/constant/iscsData.js

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]

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);
         },

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' }
-                ]
             }
         };
     },
@@ -81,15 +69,13 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form = {
+                this.form.code = model.code;
-                    code: model.code,
+                this.form.lineWidth = model.lineWidth;
-                    lineWidth: model.lineWidth,
+                this.form.fillColor = model.fillColor;
-                    fillColor: model.fillColor,
+                this.form.x1 = model.point1.x;
-                    x1: model.point1.x,
+                this.form.y1 = model.point1.y;
-                    y1: model.point1.y,
+                this.form.x1 = model.point2.x;
-                    x2: model.point2.x,
+                this.form.y2 = model.point2.y;
-                    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 {

src/views/iscs/iscsDraw/iscsCommonElem/rect.vue

@@ -75,16 +75,14 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form = {
+                this.form.code = model.code;
-                    code: model.code,
+                this.form.fillColor = model.fillColor;
-                    fillColor: model.fillColor,
+                this.form.borderWidth = model.borderWidth;
-                    borderWidth: model.borderWidth,
+                this.form.strokeColor = model.strokeColor;
-                    strokeColor: model.strokeColor,
+                this.form.width = model.width;
-                    width: model.width,
+                this.form.height = model.height;
-                    height: model.height,
+                this.form.x = model.point.x;
-                    x: model.point.x,
+                this.form.y = model.point.y;
-                    y: model.point.y
-                };
             }
         }
     },
@@ -106,9 +104,6 @@ export default {
                         width: this.form.width,
                         height: this.form.height
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', rectModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsCommonElem/text.vue

@@ -80,15 +80,13 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-                this.form = {
+                this.form.code = model.code;
-                    code: model.code,
+                this.form.context = model.context;
-                    context: model.context,
+                this.form.fontSize = model.fontSize;
-                    textFill: model.textFill,
+                this.form.fontWeight = model.fontWeight;
-                    fontSize: model.fontSize,
+                this.form.textFill = model.textFill;
-                    fontWeight: model.fontWeight,
+                this.form.x = model.point.x;
-                    x: model.point.x,
+                this.form.y = model.point.y;
-                    y: model.point.y
-                };
             }
         }
     },
@@ -110,9 +108,6 @@ export default {
                         fontWeight: this.form.fontWeight,
                         fontFamily: 'consolas'
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', textModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue

@@ -76,9 +76,6 @@ export default {
                         _type: 'FireHydranAlarmButton',
                         width: this.addModel.width
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', maButtonModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue

@@ -77,9 +77,6 @@ export default {
                         _type: 'GasFireControl',
                         width: this.addModel.width
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', maButtonModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsOperate/index.vue

@@ -53,6 +53,7 @@
             <el-tab-pane label="文字" name="IscsText">
                 <iscs-text
                     ref="iscsText"
+                    style="width: 90%;"
                     @createDataModel="createDataModel"
                     @deleteDataModel="deleteDataModel">
                 </iscs-text>
@@ -60,6 +61,7 @@
             <el-tab-pane label="线段" name="IscsLine">
                 <iscs-line
                     ref="iscsLine"
+                    style="width: 90%;"
                     @createDataModel="createDataModel"
                     @deleteDataModel="deleteDataModel">
                 </iscs-line>
@@ -67,6 +69,7 @@
             <el-tab-pane label="矩形" name="IscsRect">
                 <iscs-rect
                     ref="iscsRect"
+                    style="width: 90%;"
                     @createDataModel="createDataModel"
                     @deleteDataModel="deleteDataModel">
                 </iscs-rect>

src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue

@@ -77,9 +77,6 @@ export default {
                         _type: 'ManualAlarmButton',
                         width: this.addModel.width
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', maButtonModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue

@@ -77,9 +77,6 @@ export default {
                         _type: 'SmokeDetector',
                         width: this.addModel.width
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', maButtonModel);
                     this.initPage();
                 } else {

src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue

@@ -77,9 +77,6 @@ export default {
                         _type: 'TemperatureDetector',
                         width: this.addModel.width
                     };
-                    if (this.isUpdate) {
-                        this.deleteDevice();
-                    }
                     this.$emit('createDataModel', maButtonModel);
                     this.initPage();
                 } else {