Hwt hace 2 años
padre
commit
9787105448

+ 1 - 1
operationSupport/src/views/assetManagement/housingManagement/index.vue

@@ -263,7 +263,7 @@ export default {
         this.$store.dispatch('addPopup', {
           url: '/assetManagement/housingManagement/add.vue',
           width: '780px',
-          height: '500px',
+          height: '700px',
           props: {
             row,
             command,

+ 1 - 1
operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -311,7 +311,7 @@ export default {
         this.$store.dispatch('addPopup', {
           url: '/assetManagement/shopManagement/saveEdits.vue',
           width: '850px',
-          height: '500px',
+          height: '600px',
           props: {
             data,
             todo,

+ 95 - 14
operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -3,7 +3,7 @@
     <div class="device_content">
       <div class="left_content">
         <div class="form_head">
-          <p>基本信息</p>
+          <p>基本信息2222</p>
         </div>
         <div class="form_content">
           <el-scrollbar
@@ -105,8 +105,8 @@
           >
             <div class="head_content head_add">
               <div class="checkbox_style">
+                <!--  disabled -->
                 <el-checkbox
-                  disabled
                   @change="checkedUnit"
                   v-model="initialUnitList.checkedUnit"
                 ></el-checkbox>
@@ -324,7 +324,7 @@
                           class="el-icon-plus button-new-tag"
                           size="small"
                           @click="showInput"
-                          style="position: relative; top: -17px;"
+                          style="position: relative; top:12px;"
                         ></el-button>
                         <el-input
                           class="input-new-tag"
@@ -386,13 +386,11 @@
                                             "
                     >
                       <!-- <h2>单元户<span>鼠标双击修改名称; 修改楼层名称后,请自行修改单元户的名称</span></h2> -->
-
                       <div
                         class="box clearfix"
                         :key="index3"
-                        v-for="(floor, index3) in doorData"
+                        v-for="(floor, index3) in doorData[buildingIndex].unitFloorList"
                       >
-                        <!-- <span class="el-fl-left label">楼层:</span> -->
                         <div class="unit_left">
                           <el-tag
                             closable
@@ -400,7 +398,7 @@
                             data-code="floor"
                             @close="handleClose('floor', index3, doorData[buildingIndex].unitFloorList)"
                           >
-                            <span @dblclick="showInput">{{ floor.unitFloorList[0].floorNumber }}</span>
+                            <span @dblclick="showInput">{{ floor.floorNumber }}</span>
                             <el-input
                               style="display: none"
                               v-model="floor.floorNumber"
@@ -419,7 +417,69 @@
                             class="door"
                             v-if="floor"
                           >
-                            <!-- {{floor.unitFloorList[0].roomList[0].roomNumber}} -->
+                            <el-tag
+                              :key="index4"
+                              v-for="(door, index4) in floor.roomList"
+                              closable
+                              :disable-transitions="false"
+                              data-code="door"
+                              @close="handleClose('door', index4, floor.roomList)"
+                            >
+                              <span @dblclick="showInput">{{ door.roomNumber }}</span>
+                              <el-input
+                                style="display: none"
+                                v-model="door.roomNumber"
+                                @keyup.enter.native="inputConfirm($event, floor.roomList)"
+                                @blur="inputConfirm($event, floor.roomList)"
+                                data-code="door"
+                                maxlength="20"
+                              ></el-input>
+                            </el-tag>
+                            <el-button
+                              class="el-icon-plus button-new-tag"
+                              size="small"
+                              @click="showInput"
+                            ></el-button>
+                            <el-input
+                              class="input-new-tag"
+                              style="display: none"
+                              size="small"
+                              placeholder="请输入户号"
+                              v-model="inputValue.door"
+                              @keyup.enter.native="handleInputConfirm($event, floor.roomList)"
+                              @blur="handleInputConfirm($event, floor.roomList)"
+                              data-code="door"
+                              maxlength="20"
+                            >
+                            </el-input>
+                          </div>
+                        </span>
+                        <!-- <div class="unit_left">
+                          <el-tag
+                            closable
+                            :disable-transitions="false"
+                            data-code="floor"
+                            @close="handleClose('floor', index3, doorData[buildingIndex].unitFloorList)"
+                          >
+                            <span @dblclick="showInput">{{ floor.unitFloorList[0].floorNumber }}</span>
+                            <el-input
+                              style="display: none"
+                              v-model="floor.floorNumber"
+                              @keyup.enter.native="
+                                                                inputConfirm($event, doorData[buildingIndex].unitFloorList)
+                                                            "
+                              @blur="inputConfirm($event, doorData[buildingIndex].unitFloorList)"
+                              data-code="floor"
+                              maxlength="20"
+                            ></el-input>
+                          </el-tag>
+                          <span class="unit_text">层</span>
+                        </div> -->
+                        <!-- <span class="el-fl-left tags">
+                          <div
+                            class="door"
+                            v-if="floor"
+                          >
                             <el-tag
                               :key="index4"
                               v-for="(door, index4) in floor.unitFloorList[0].roomList"
@@ -456,7 +516,7 @@
                             >
                             </el-input>
                           </div>
-                        </span>
+                        </span> -->
                       </div>
                       <div class="add-floor">
                         <el-button
@@ -700,6 +760,8 @@ export default {
     }
   },
   methods: {
+
+
     radioChange (type, val) {
       let length = val == 'Number' ? '20' : '26';
       if (val == 'Letter') {
@@ -771,6 +833,7 @@ export default {
           door: initDoor(this.formdata, this.initialUnitList).generateDoor(value)
         };
         if (querySame()) {
+          debugger
           if (code == 'unit') {
             arr.push({
               unitName: value,
@@ -852,13 +915,31 @@ export default {
               }
             };
 
-            // let resDate = [];
-            // data.buildingUnitList.map((item, index) => {
-            //   resDate.push(item.unitFloorList)
-            // })
+            let resDate = [];
+            let resDateList = []; //楼层
+            let resDateBuilding = [];
+            data.buildingUnitList.map((item, index) => {
+              resDate.push(item.unitFloorList[0])
+              resDateList.push(item.unitFloorList[0].floorNumber)
+
+            })
+            resDateList = Array.from(new Set(resDateList));
+            debugger
+
+            console.log('777', resDateList)
+
+
+
+
+            data.buildingUnitList.forEach((item) => {
+              item.unitFloorList = resDate;
+            })
+
+            debugger
             this.doorData = data.buildingUnitList;
 
-            this.doorData = resDate;
+            // debugger
+            // this.doorData = resDate;
           } else {
             this.formdata = data;
           }

+ 2 - 2
operationSupport/src/views/patrolManagement/patrolPointStatistics.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: 韩玮涛
  * @Date: 2022-08-10 09:21:59
- * @LastEditTime: 2022-08-10 18:25:23
+ * @LastEditTime: 2022-08-11 14:33:23
  * @LastEditors: D4THYL3
  * @Description: In User Settings Edit
  * @FilePath: \operationSupport\src\views\patrolManagement\patrolPointStatistics.vue
@@ -180,7 +180,7 @@ export default {
   },
   methods: {
     exportExcel () {
-      this.__exportExcel('/czc-community/patrol/point/getPointHistoryExcel');
+      this.__exportExcel('/czc-community/patrol/point/getPointHistoryExcel', this.mixins_query);
     },
     effectiveDateToggle (va) {
       let arr = va;