From e5249cf4b30e1f32c834e0c853a729023d602204 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 8 Apr 2021 17:56:45 +0800
Subject: [PATCH] =?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/views/iscs_new/components/dataForm.vue |  1 +
 src/views/iscs_new/iscsDesign/index.vue    | 83 ++++++++++----------
 src/views/iscs_new/iscsDraw/index.vue      | 89 +++++++++++-----------
 3 files changed, 90 insertions(+), 83 deletions(-)

diff --git a/src/views/iscs_new/components/dataForm.vue b/src/views/iscs_new/components/dataForm.vue
index 76895c765..ece35bf5c 100644
--- a/src/views/iscs_new/components/dataForm.vue
+++ b/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'"
diff --git a/src/views/iscs_new/iscsDesign/index.vue b/src/views/iscs_new/iscsDesign/index.vue
index c823dd798..44d3197a1 100644
--- a/src/views/iscs_new/iscsDesign/index.vue
+++ b/src/views/iscs_new/iscsDesign/index.vue
@@ -82,46 +82,46 @@ export default {
             // this.$refs.iscsPlate.drawIscsInit();
         },
         onSave() {
-			const id = this.$route.query.id;
-			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 => {
-					return this.$iscs.getShapeByCode(el.code);
-				});
-				const rect = shapeList.reduce(
-					(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)
-			}
+            const id = this.$route.query.id;
+            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 => {
+                    return this.$iscs.getShapeByCode(el.code);
+                });
+                const rect = shapeList.reduce(
+                    (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);
+            }
         },
         onSelectTab() {
-			this.selected = null;
+            this.selected = null;
         },
-		onSelected(em) {
-			if (em.model) {
-				this.selected = JSON.parse(JSON.stringify(em.model));
-				const elem = this.elementList.find(el => el.code == this.selected.type);
-				if (elem) {
-					elem.model = this.selected;
-				}
-			} else {
-				this.selected = null;
-			}
-		},
-        onSubmit(){
-          this.$refs['dataform'+this.enabledTab][0].$refs['form'].validate((valid) => {
+        onSelected(em) {
+            if (em.model) {
+                this.selected = JSON.parse(JSON.stringify(em.model));
+                const elem = this.elementList.find(el => el.code == this.selected.type);
+                if (elem) {
+                    elem.model = this.selected;
+                }
+            } else {
+                this.selected = null;
+            }
+        },
+        onSubmit() {
+            this.$refs['dataform' + this.enabledTab][0].$refs['form'].validate((valid) => {
                 if (valid) {
                     const formModel = this.$refs['dataform' + this.enabledTab][0].formModel;
                     const newModel = JSON.parse(JSON.stringify(formModel));
-					newModel.code = utils.getUID(this.enabledTab);
+                    newModel.code = utils.getUID(this.enabledTab);
                     newModel.type = this.enabledTab;
-					newModel.name = '<名称>';
-					newModel.stateList = [];
+                    newModel.name = '<名称>';
+                    newModel.stateList = [];
                     this.$refs.iscsCanvas.doAction([{model: newModel, action: {shapeType: shapeType.Element, order: orders.ADD}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
@@ -131,9 +131,9 @@ export default {
                     const model = this.$refs['dataform' + this.enabledTab][0].formModel;
                     model.code = this.selected.code;
                     model.type = this.selected.type;
-					model.name = this.selected.name;
+                    model.name = this.selected.name;
                     this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.UPDATE}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
@@ -143,16 +143,16 @@ export default {
                     const model = this.$refs['dataform' + this.enabledTab][0].formModel;
                     model.code = this.selected.code;
                     model.type = this.selected.type;
-					model.name = this.selected.name;
+                    model.name = this.selected.name;
                     this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.DELETE}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
-		clear(enabledTab) {
-			this.$refs['dataform' + enabledTab][0].init();
-			this.selected = null;
-		}
+        clear(enabledTab) {
+            this.$refs['dataform' + enabledTab][0].init();
+            this.selected = null;
+        }
     }
 };
 </script>
@@ -179,6 +179,9 @@ export default {
     .mapPaint{
         height: 100%;
         overflow: hidden;
+        width:100%;
+        position:absolute;
+        left:0;top:0;
     }
 
     .right-card{
diff --git a/src/views/iscs_new/iscsDraw/index.vue b/src/views/iscs_new/iscsDraw/index.vue
index 450dcb3c3..9ddc69f6b 100644
--- a/src/views/iscs_new/iscsDraw/index.vue
+++ b/src/views/iscs_new/iscsDraw/index.vue
@@ -70,8 +70,8 @@ export default {
         }
     },
     mounted() {
-		this.db = new IndexedDb(['composeList']);
-		console.log(this.db, 11111111111);
+        this.db = new IndexedDb(['composeList']);
+        console.log(this.db, 11111111111);
         this.composeName = this.$route.query.composeName;
         this.elementList = new BuilderFactory().getFormList();
         this.enabledTab = this.elementList[0].code;
@@ -85,47 +85,47 @@ export default {
             // this.$refs.iscsPlate.drawIscsInit();
         },
         onSave() {
-			const id = this.$route.query.id;
-			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 => {
-					return this.$iscs.getShapeByCode(el.code);
-				});
-				const rect = shapeList.reduce(
-					(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)
-			}
+            const id = this.$route.query.id;
+            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 => {
+                    return this.$iscs.getShapeByCode(el.code);
+                });
+                const rect = shapeList.reduce(
+                    (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);
+            }
         },
         onSelectTab() {
-			this.selected = null;
+            this.selected = null;
         },
-		onSelected(em) {
-			if (em.model) {
-				this.selected = JSON.parse(JSON.stringify(em.model));
-				const elem = this.elementList.find(el => el.code == this.selected.type);
-				if (elem) {
-					elem.model = this.selected;
-          this.enabledTab=this.selected.type;
-				}
-			} else {
-				this.selected = null;
-			}
-		},
-        onSubmit(){
-          this.$refs['dataform'+this.enabledTab][0].$refs['form'].validate((valid) => {
+        onSelected(em) {
+            if (em.model) {
+                this.selected = JSON.parse(JSON.stringify(em.model));
+                const elem = this.elementList.find(el => el.code == this.selected.type);
+                if (elem) {
+                    elem.model = this.selected;
+                    this.enabledTab = this.selected.type;
+                }
+            } else {
+                this.selected = null;
+            }
+        },
+        onSubmit() {
+            this.$refs['dataform' + this.enabledTab][0].$refs['form'].validate((valid) => {
                 if (valid) {
                     const formModel = this.$refs['dataform' + this.enabledTab][0].formModel;
                     const newModel = JSON.parse(JSON.stringify(formModel));
-					newModel.code = utils.getUID(this.enabledTab);
+                    newModel.code = utils.getUID(this.enabledTab);
                     newModel.type = this.enabledTab;
-					newModel.name = '<名称>';
-					newModel.stateList = [];
+                    newModel.name = '<名称>';
+                    newModel.stateList = [];
                     this.$refs.iscsCanvas.doAction([{model: newModel, action: {shapeType: shapeType.Element, order: orders.ADD}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
@@ -135,9 +135,9 @@ export default {
                     const model = this.$refs['dataform' + this.enabledTab][0].formModel;
                     model.code = this.selected.code;
                     model.type = this.selected.type;
-					model.name = this.selected.name;
+                    model.name = this.selected.name;
                     this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.UPDATE}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
@@ -147,16 +147,16 @@ export default {
                     const model = this.$refs['dataform' + this.enabledTab][0].formModel;
                     model.code = this.selected.code;
                     model.type = this.selected.type;
-					model.name = this.selected.name;
+                    model.name = this.selected.name;
                     this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.DELETE}}]);
-					this.clear(this.enabledTab);
+                    this.clear(this.enabledTab);
                 }
             });
         },
-		clear(enabledTab) {
-			this.$refs['dataform' + enabledTab][0].init();
-			this.selected = null;
-		}
+        clear(enabledTab) {
+            this.$refs['dataform' + enabledTab][0].init();
+            this.selected = null;
+        }
     }
 };
 </script>
@@ -183,6 +183,9 @@ export default {
     .mapPaint{
         height: 100%;
         overflow: hidden;
+        width:100%;
+        position:absolute;
+        left:0;top:0;
     }
 
     .right-card{