540baeaa by 杨威

合并代码

2 parents 1979a71a e43c21ed
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 type: Array 113 type: Array
114 }, 114 },
115 measureType: { 115 measureType: {
116 type: Number 116 type: String
117 } 117 }
118 }, 118 },
119 data() { 119 data() {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button> 33 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button>
34 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> 34 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
35 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button> 35 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
36 <el-button class="radioBtn" label="6" border @click="plZlVisible=true">批量坐落</el-button> 36 <el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
37 <el-button class="radioBtn" label="7" border>批量单元号</el-button> 37 <el-button class="radioBtn" label="7" border>批量单元号</el-button>
38 </div> 38 </div>
39 </el-col> 39 </el-col>
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
159 plcVisible:false, 159 plcVisible:false,
160 plhVisible:false, 160 plhVisible:false,
161 plShVisible:false, 161 plShVisible:false,
162 plzlVisible:false, 162 plzlVisible:false,
163 hbjVisible:false, 163 hbjVisible:false,
164 tabPosition:"1", //1是实测 0是预测 164 tabPosition:"1", //1是实测 0是预测
165 radio1: "", 165 radio1: "",
...@@ -358,7 +358,7 @@ export default { ...@@ -358,7 +358,7 @@ export default {
358 }, 358 },
359 //户编辑表单重置 359 //户编辑表单重置
360 hbjResetInfo(){ 360 hbjResetInfo(){
361 this.$refs.hbj.onReset(); 361 this.$refs.hbj.onReset();
362 } 362 }
363 }, 363 },
364 computed: { 364 computed: {
......