Browse Source

update canvas version

haojianlong 5 years ago
parent
commit
3e1d012141

+ 1 - 1
package.json

@@ -24,7 +24,7 @@
         "vue-axios": "^2.1.4",
         "vue-router": "^3.0.1",
         "vuex": "^3.1.0",
-        "cad-engine": "2.0.233"
+        "cad-engine": "2.0.250"
     },
     "devDependencies": {
         "ajv": "^6.9.1",

+ 7 - 5
src/components/business_space/newGraphy/canvasFun.vue

@@ -31,7 +31,7 @@
       <i class="iconfont icon-narrow" @click="reduce"></i>
     </div>
     <div class="line">
-      <el-slider tooltip-class="tooltip-class" :min="min" :max="maxScale" v-model="sliderVal" :show-tooltip="false" @input="scale"></el-slider>
+      <el-slider tooltip-class="tooltip-class" :min="min" v-model="sliderVal" :show-tooltip="false" @input="scale"></el-slider>
     </div>
     <div>
       <i class="iconfont icon-zoom" @click="plus"></i>
@@ -42,10 +42,10 @@
 export default {
   data() {
     return {
-      sliderVal: 0.004, // 滑块值
+      sliderVal: 1, // 滑块值
       active: '',
-      min: 0.004,
-      maxScale: 1,
+      min: 1,
+      everyScale: 1, // 每份的放大倍数
     }
   },
   props: {
@@ -95,7 +95,9 @@ export default {
     },
     // 缩放
     scale(val) {
-      this.$emit('scale', val);
+      // 换算
+      let scale = val * this.everyScale / 10;
+      this.$emit('scale', scale);
     },
     // 加
     plus() {

+ 9 - 5
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -72,8 +72,10 @@ export default {
           that.view.scene = that.drawMainScene
           that.view.fitSceneToView();
           that.canvasLoading = false;
-          that.view.maxScale = that.view.scale * 1000;
-          that.$refs.canvasFun.maxScale = that.view.maxScale;
+          that.view.maxScale = that.view.scale * 10;
+          that.view.minScale = that.view.scale;
+          that.$refs.canvasFun.everyScale = that.view.scale;
+          that.drawMainScene.isSpaceSelectable = false;
           if (that.OutlineFlag) {
             this.getFloorData()
           }
@@ -132,7 +134,6 @@ export default {
     },
     // 清除切割划分
     clearDivide() {
-      console.log(this.drawMainScene)
       this.drawMainScene.clearSceneMark()
     },
     // 撤销
@@ -143,7 +144,7 @@ export default {
     redo() { },
     // 缩放
     scale(val) {
-      let scale = this.view.scale
+      let scale = this.view.scale;
       this.view.scaleByPoint(val / scale, this.cadWidth / 2, this.cadHeight / 2)
     },
   },
@@ -151,7 +152,10 @@ export default {
     "view.scale": {
       handler(n) {
         if (this.$refs.canvasFun) {
-          this.$refs.canvasFun.sliderVal = n;
+          // this.view.minScale
+          // console.log(n / this.view.minScale)
+          // console.log(n /this.view.minScale)
+          // this.$refs.canvasFun.sliderVal = n / this.view.minScale;
         }
       }
     }