Browse Source

比例尺默认值 0

haojianlong 4 years ago
parent
commit
f35385ef4f

+ 2 - 1
src/components/ready/buildfloor/setScaleDialog.vue

@@ -3,7 +3,7 @@
     <el-row>
       <div style="line-height:32px;">设定比例尺长度 : </div>
       <div style="width:70%">
-        <el-input-number v-model="scaleInput" controls-position="right" :min="1"></el-input-number> mm
+        <el-input-number v-model="scaleInput" controls-position="right" :min="0"></el-input-number> mm
       </div>
     </el-row>
     <span slot="footer" class="dialog-footer">
@@ -31,6 +31,7 @@ export default {
     confirm() {
       this.item.text = this.scaleInput + ' mm';
       this.item.update()
+      this.$emit('textChange', this.scaleInput)
       this.dialogVis = false
     }
   }

+ 7 - 6
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -45,7 +45,7 @@
         <!-- 查看图片弹窗 -->
         <checkGraphy ref='checkGraphy' @refresh='refresh' :alreadyRelatedModel='alreadyRelatedModel'></checkGraphy>
         <!-- 设定比例尺弹窗 -->
-        <setScaleDialog ref="setScaleDialog"></setScaleDialog>
+        <setScaleDialog ref="setScaleDialog" @textChange="scaleTextChange"></setScaleDialog>
         <!-- 退出时弹窗提示 -->
         <backTips ref='backTips' @back="runBack"></backTips>
     </div>
@@ -324,7 +324,6 @@ export default {
                 scaleItem.status = SItemStatus.Create;
                 this.$refs.drawFloor.drawMainScene.grabItem = scaleItem;
                 scaleItem.connect('changText', this, this.changeText)
-                scaleItem.connect('finishCreated', this, this.finishCreate)
                 scaleItem.moveable = true;
                 this.clearScaleData(scaleItem);
             } else if (this.step == -1) {
@@ -335,9 +334,11 @@ export default {
         changeText(t, e) {
             this.$refs.setScaleDialog.showDialog(t)
         },
-        // 创建成功
-        finishCreate(v) {
-            this.nextStepBtnDisable = false
+        // 文本修改
+        scaleTextChange(v) {
+            if (v > 0) {
+                this.nextStepBtnDisable = false
+            }
         },
         // 第二部楼层修改
         changeFloor(v) {
@@ -380,7 +381,7 @@ export default {
         clearScaleData(scaleItem) {
             scaleItem.line = [];
             scaleItem.pointChange();
-            scaleItem.text = '1000 mm';
+            scaleItem.text = '0 mm';
         },
         // 计算两个比例尺差距
         calScaleGap(pro, item) {