haojianlong 4 anni fa
parent
commit
7a31ab8995
2 ha cambiato i file con 8 aggiunte e 5 eliminazioni
  1. 5 3
      src/components/baseEditer.vue
  2. 3 2
      src/components/edit/top_toolbar.vue

+ 5 - 3
src/components/baseEditer.vue

@@ -179,9 +179,6 @@ export default {
             this.loading = false;
             this.isQuerying = false;
             console.log("success");
-            // 设置初始化缩放比例
-            this.initScale = this.view.scale;
-            bus.$emit("initScale", this.view.scale);
           });
         } else {
           console.log("楼层不正确");
@@ -264,6 +261,11 @@ export default {
             }
           });
           this.view.fitSceneToView();
+            // 设置初始化缩放比例
+          this.initScale = this.view.scale;
+          this.view.maxScale = this.initScale * 10;
+          this.view.minScale = this.initScale / 10;
+          bus.$emit("initScale", this.view.scale);
           bus.$emit("elementDataChange", this.scene);
         }
       });

+ 3 - 2
src/components/edit/top_toolbar.vue

@@ -144,7 +144,7 @@ export default {
   computed: {
     // 缩放比例显示文本
     scalePercent() {
-      const scalePercent = (this.scale * 100).toFixed(0) > 9999? 9999 : (this.scale * 100).toFixed(0);
+      const scalePercent = (this.scale * 100).toFixed(0) > 500? 500 : (this.scale * 100).toFixed(0);
       return scalePercent + '%'
     }
   },
@@ -165,7 +165,8 @@ export default {
     getMouseScale() {
       //  zoom 为缩放后改变的比例
       bus.$on('mouseScale', zoom => {
-        this.scale = Number((zoom * this.initScale).toFixed(2))
+        const s = Number((zoom * this.initScale).toFixed(2))
+        this.scale = s > 0.05 ? s: 0.05
       })
     },
     /**