Sfoglia il codice sorgente

比例尺文本改为数字类型

haojianlong 4 anni fa
parent
commit
5d1cbe4771

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

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

+ 5 - 5
src/views/ledger/facility/batchPoint.vue

@@ -99,7 +99,7 @@ export default {
     return {
         visible: false,
         equipZ: 0,
-        maxHeight: 999,
+        maxHeight: 99,
         popoverPosition: {
             top: 0,
             left: 0,
@@ -213,7 +213,7 @@ export default {
         const e = events[0];
         this.selectedIcon = item;
         if (item.data.Z) {
-            this.equipZ = (item.data.Z / 100);
+            this.equipZ = (item.data.Z / 1000);
         } else {
             this.equipZ = 0;
         }
@@ -226,8 +226,8 @@ export default {
     },
     // 修改设备Z坐标
     handleUpdateZ() {
-        if (this.selectedIcon.data.Z !== this.equipZ * 100) {
-            this.selectedIcon.data.Z = this.equipZ * 100;
+        if (this.selectedIcon.data.Z !== this.equipZ * 1000) {
+            this.selectedIcon.data.Z = this.equipZ * 1000;
             this.isChange = true;
             this.visible = false;
         }
@@ -346,7 +346,7 @@ export default {
         if (data.StructureInfo && data.StructureInfo.Height) {
             this.maxHeight = data.StructureInfo.Height;
         } else {
-            this.maxHeight = 999;
+            this.maxHeight = 99;
         }
 		if (data.Outline && data.Outline.length) {
 			this.floorOutline = data.Outline;

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

@@ -7,7 +7,7 @@
                 <el-upload class='upload-demo' action='string' :http-request='uploadAndSubmit' :show-file-list='false' v-if="step==-1">
                     <el-button size="mini">{{hasGraph?'替换平面图图片':'上传平面图图片'}}</el-button>
                 </el-upload>
-                <el-button style='float:right;' size='mini' type='primary' v-if="step==0" @click="nextStep">下一步</el-button>
+                <el-button style='float:right;' size='mini' type='primary' v-if="step==0" @click="nextStep" :disabled="nextStepBtnDisable">下一步</el-button>
                 <el-button style='float:right;' size='mini' type='primary' v-if="step==1" @click="nextStep">保存</el-button>
                 <el-button style='float:right;' size='mini' v-if="step==1" @click="lastStep">上一步</el-button>
             </template>
@@ -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>
@@ -90,6 +90,7 @@ export default {
             curImgItem: null, // 对齐的楼层图片
             scaleItem: null, // 比例尺item
             baseImgItem: null, // 当前楼层图的图片
+            nextStepBtnDisable: true, // 比例尺item创建标识
         }
     },
     created() {
@@ -332,6 +333,10 @@ export default {
         changeText(t, e) {
             this.$refs.setScaleDialog.showDialog(t)
         },
+        // 比例尺文本修改成功
+        scaleTextChange(v) {
+            this.nextStepBtnDisable = false
+        },
         // 第二部楼层修改
         changeFloor(v) {
             this.removeLast();