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

# Conflicts:
#	src/views/iscs_new/iscsDraw/index.vue

src/views/iscs_new/components/dataForm.vue

@@ -30,6 +30,7 @@
             <template v-else-if="checkFieldType(item, 'Boolean')">
               <el-switch
                 v-model="formModel[styleGroup.code][item.prop]"
+                style="vertical-align: top;"
                 size="small"
                 :active-color="item.activeColor || '#409eff'"
                 :inactive-color="item.inactiveColor || '#dcdfe6'"

src/views/iscs_new/iscsDesign/index.vue

@@ -83,8 +83,8 @@ export default {
         },
         onSave() {
             const id = this.$route.query.id;
-			const name = this.$route.query.name||"<模型名称>";
-			const type = this.$route.query.type||"<模型类型>";
+            const name = this.$route.query.name || '<模型名称>';
+            const type = this.$route.query.type || '<模型类型>';
             const source = this.$iscs.getSource();
             if (id && source) {
                 const shapeList = source.elementList.map(el => {
@@ -94,7 +94,7 @@ export default {
                     (temp, el) => el && temp ? temp.union(el.getBoundingRect().clone()) : el.getBoundingRect(), null);
                 const position = [(rect.x + rect.width) / 2, (rect.y + rect.height) / 2];
                 const model = { id, name, type, shapeList, position };
-				console.log(model)
+                console.log(model);
             }
         },
         onSelectTab() {
@@ -179,6 +179,9 @@ export default {
     .mapPaint{
         height: 100%;
         overflow: hidden;
+        width:100%;
+        position:absolute;
+        left:0;top:0;
     }
 
     .right-card{

src/views/iscs_new/iscsDraw/index.vue

@@ -183,6 +183,9 @@ export default {
     .mapPaint{
         height: 100%;
         overflow: hidden;
+        width:100%;
+        position:absolute;
+        left:0;top:0;
     }
 
     .right-card{