修复楼栋添加单元问题

energyManagement/src/views/instrumentManagement/electricityMeter.vue

@@ -34,7 +34,7 @@
                         <el-dropdown-item command="add">单个添加</el-dropdown-item>
                         <el-dropdown-item command="batchAdd">
                             <div class="upload_div">
-                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'DEVICE' }">
+                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'ELECTRICITY' }">
                                     <span class="upload_text" slot="content">批量添加</span>
                                 </xk-upload>
                             </div>

energyManagement/src/views/instrumentManagement/waterMeter.vue

@@ -34,7 +34,7 @@
                         <el-dropdown-item command="add">单个添加</el-dropdown-item>
                         <el-dropdown-item command="batchAdd">
                             <div class="upload_div">
-                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'DEVICE' }">
+                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'WATER' }">
                                     <span class="upload_text" slot="content">批量添加</span>
                                 </xk-upload>
                             </div>

energyManagement/src/views/valveControlRecords/index.vue

@@ -104,15 +104,19 @@ export default {
                     label: '操作结果',
                     prop: 'operationResult',
                     format(val, data) {
+                        let name = '';
+                        if (_this.mixins_query.categoryId === 1) {
+                            name = '阀';
+                        } else {
+                            name = '闸';
+                        }
                         switch (val) {
                             case 0:
-                                return '发送';
+                                return name + '关';
                             case 1:
-                                return '超时';
+                                return name + '开';
                             case 2:
-                                return '成功';
-                            case 3:
-                                return '失败';
+                                return '执行中';
                             default:
                                 return '-';
                         }

operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -499,7 +499,7 @@ export default {
                 remarks: '',
                 houseType: 1,
                 floorsNumber: '1', //每栋层数
-                unitNumber: '2', //单元数
+                unitNumber: 1, //单元数
                 householdsPerFloor: '1' //每层户数
             },
             initialUnitList: {
@@ -639,9 +639,8 @@ export default {
                         return;
                     }
                 }
-                debugger;
+
                 this.doorData = initDoor(this.formdata, this.initialUnitList).generateUnit;
-                console.log(initDoor(this.formdata, this.initialUnitList));
             });
         },
         handleInputConfirm(e, arr) {
@@ -684,13 +683,20 @@ export default {
             new Promise((resolve) => {
                 this.$refs.detailform.validate(resolve);
             }).then((v) => {
+                debugger;
                 const { buildNumber, unitNumber, floorNumber, doorNumber } = calcDoor(this.doorData, this.initialUnitList.checkedUnit);
                 const txt = `请检查信息是否填写完整（包含重复名称，名称为空现象）<br>确认提交单元户信息：<br>总楼栋数：${buildNumber}${
                     this.initialUnitList.enableUnit ? `<br>总单元数：${unitNumber}` : ''
                 }<br>总楼层数：${floorNumber}<br>总单元户数：${doorNumber}`;
+
                 this.__confirm(txt, '提交')
                     .then((v) => {
+                        if (!this.initialUnitList.checkedUnit) {
+                            this.doorData[0].unitName = '';
+                            this.formdata.unitNumber = 0;
+                        }
                         this.formdata.buildingUnitList = this.doorData;
+
                         let url = '/sc-community/assets/building/add';
                         if (!!this.params.id) {
                             url = '/sc-community/assets/building/update';

operationSupport/src/views/buildingManagement/pageJump/basedata.js

@@ -30,7 +30,7 @@ export const initDoor = (data, initialUnitList) => {
 		const arr = [];
 		for (let j = 0; j < unitNumber; j++) {
 			arr.push({
-				unitName: (unit.type == 'Number' ? j + (Number(start) || 1) : letter[start && letter.indexOf(start) + j || j] || `未命名${j + 1}`) +'单元',
+				unitName: (unit.type == 'Number' ? j + (Number(start) || 1) : letter[start && letter.indexOf(start) + j || j] || `未命名${j + 1}`) + '单元',
 				unitFloorList: getFoolr()
 			})
 		}
@@ -64,7 +64,9 @@ export const calcDoor = (data, checkedUnit) => {
 		number3 = 0,
 		number4 = 0;
 	_.each(data, (v1) => {
-		number2++;
+		if (checkedUnit) {
+			number2++;
+		}
 		_.each(v1.unitFloorList, (v2) => {
 			number3++;
 			_.each(v2.roomList, (v3) => {