Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/conv/AppReportAiWill/components/List.vue

@@ -9,24 +9,24 @@
       <ai-search-bar>
         <template #left>
           <ai-select
-            v-model="search.eventStatus"
+              v-model="search.eventStatus"
-            clearable
+              clearable
-            placeholder="处理状态"
+              placeholder="处理状态"
-            :selectList="dict.getDict('clapEventStatus')"
+              :selectList="dict.getDict('clapEventStatus')"
-            @change="search.current = 1, getList()">
+              @change="search.current = 1, getList()">
           </ai-select>
         </template>
         <template #right>
           <el-input
-            v-model="search.content"
+              v-model="search.content"
-            class="search-input"
+              class="search-input"
-            size="small"
+              size="small"
-            v-throttle="() => {search.current = 1, getList()}"
+              v-throttle="() => {search.current = 1, getList()}"
-            placeholder="请输入内容描述/上报居民/联系方式"
+              placeholder="请输入内容描述/上报居民/联系方式"
-            clearable
+              clearable
-            @change="getList"
+              @change="getList"
-            @clear="search.current = 1, search.content = '', getList()"
+              @clear="search.current = 1, search.content = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
       </ai-search-bar>
@@ -34,6 +34,7 @@
         <el-table-column slot="options" label="操作" fixed="right" width="120" align="center">
           <div class="table-options" slot-scope="{row}">
             <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
+            <el-button type="text" title="删除" @click="handleDelete(row.id)">删除</el-button>
           </div>
         </el-table-column>
       </ai-table>
@@ -42,94 +43,108 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
-  export default {
+export default {
-    name: 'List',
+  name: 'List',
-    label: "随手拍",
+  label: "随手拍",
 
-    props: {
+  props: {
-      instance: Function,
+    instance: Function,
-      dict: Object
+    dict: Object
-    },
+  },
 
-    data() {
+  data() {
-      return {
+    return {
-        userList: [],
+      userList: [],
-        search: {
+      search: {
-          current: 1,
+        current: 1,
-          size: 10,
+        size: 10,
-          eventStatus: '',
+        eventStatus: '',
-          content: ''
+        content: ''
-        },
-        total: 0,
-        tableData: [],
-        content: '',
-        id: ''
-      }
-    },
-
-    computed: {
-      ...mapState(['user']),
-
-      colConfigs() {
-        return [
-          { prop: 'content', label: '内容描述', width: '300px' },
-          { prop: 'groupName', label: '事件类型', align: 'center' },
-          { prop: 'girdName', label: '所属网格', align: 'center' },
-          { prop: 'createTime', label: '上报时间', align: 'center' },
-          { prop: 'name', label: '上报居民', align: 'center' },
-          { prop: 'phone', label: '联系方式', align: 'center' },
-          { prop: 'eventStatus', label: '处理状态', align: 'center', formart: v => this.dict.getLabel('clapEventStatus', v) },
-          { prop: 'processTime', label: '处理时长', align: 'center' },
-          { slot: 'options' }
-        ]
       },
+      total: 0,
+      tableData: [],
+      content: '',
+      id: ''
+    }
+  },
 
-      handleStatusOps() {
+  computed: {
-        return this.dict.getDict("reportAtWillHandleStatus").map(e => ({label: e.dictName, value: e.dictValue}))
+    ...mapState(['user']),
-      }
+
+    colConfigs() {
+      return [
+        {prop: 'content', label: '内容描述', width: '300px'},
+        {prop: 'groupName', label: '事件类型', align: 'center'},
+        {prop: 'girdName', label: '所属网格', align: 'center'},
+        {prop: 'createTime', label: '上报时间', align: 'center'},
+        {prop: 'name', label: '上报居民', align: 'center'},
+        {prop: 'phone', label: '联系方式', align: 'center'},
+        {prop: 'eventStatus', label: '处理状态', align: 'center', formart: v => this.dict.getLabel('clapEventStatus', v)},
+        {prop: 'processTime', label: '处理时长', align: 'center'},
+        {slot: 'options'}
+      ]
     },
 
-    created () {
+    handleStatusOps() {
-      this.dict.load('clapEventStatus').then(() => {
+      return this.dict.getDict("reportAtWillHandleStatus").map(e => ({label: e.dictName, value: e.dictValue}))
-        this.getList()
+    }
+  },
+
+  created() {
+    this.dict.load('clapEventStatus').then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appclapeventinfo/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
       })
     },
 
-    methods: {
+    toDetail(id) {
-      getList () {
+      this.$emit('change', {
-        this.instance.post(`/app/appclapeventinfo/list`, null, {
+        type: 'Detail',
-          params: {
+        params: {
-            ...this.search
+          id: id || ''
-          }
+        }
+      })
+    },
+
+    toSetting() {
+      this.$emit('change', {
+        type: 'Setting',
+        params: {
+          id: ''
+        }
+      })
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要进行删除?").then(() => {
+        this.$instance.post("/app/appclapeventinfo/delete", null, {
+          params: {ids}
         }).then(res => {
-          if (res.code == 0) {
+          if (res?.code == 0) {
-            this.tableData = res.data.records
+            this.$u.toast("删除成功!")
-            this.total = res.data.total
+            this.current = 1
+            this.isMore = false
+            this.getList()
           }
         })
-      },
+      }).catch(() => 0)
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      },
-
-      toSetting () {
-        this.$emit('change', {
-          type: 'Setting',
-          params: {
-            id: ''
-          }
-        })
-      }
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>

packages/grid/AppBuildMap/buildingStatistics.vue

@@ -1,74 +1,75 @@
 <template>
   <section class="buildingStatistics">
-    <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId=''"/>
+    <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder
+              @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId=''"/>
     <div class="buildingPane">
       <div class="bgItem tree"/>
-        <div class="building">
+      <div class="building">
-          <template v-if="floorRooms.length>0">
+        <template v-if="floorRooms.length>0">
-            <div class="buildingSignboard">{{ `${currentBuilding.buildingNumber}栋 ${unitNumber}单元` }}
+          <div class="buildingSignboard" v-text="`${currentBuilding.buildingNumber}栋 ${unitNumber}单元`"/>
-            </div>
+          <el-scrollbar class="floors">
-            <el-scrollbar class="floors">
+            <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
-              <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
+              <div class="room" v-for="op in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)"
-                <div class="room" v-for="(op,i) in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)" :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
+                   :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
-                  {{ op.houseCode }}
+                {{ op.houseCode }}
-                  <div v-if="op.livingNumber==0">无人</div>
+                <div v-if="op.livingNumber==0">无人</div>
-                  <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
+                <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
-                    <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
+                  <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
-                      <span>{{selected.houseCode}}详情</span>
+                    <span>{{ selected.houseCode }}详情</span>
-                      <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
+                    <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
-                    </el-row>
+                  </el-row>
-                    <div class="family-member">
+                  <div class="family-member">
-                      <h2>房主信息</h2>
+                    <h2>房主信息</h2>
-                      <div v-for="(item,index) in selected.owner" :key="item.id">
+                    <div v-for="(item,index) in selected.owner" :key="item.id">
-                        <div class="family-member__item">
+                      <div class="family-member__item">
-                          <div class="member-left">
+                        <div class="member-left">
-                            <label>{{item.name}}</label>
+                          <label>{{ item.name }}</label>
-                          </div>
-                          <span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span>
-                        </div>
-                        <div class="family-member__item">
-                          <div class="member-left">
-                            <label>联系方式</label>
-                          </div>
-                          <span style="color: #2266FF;">{{item.phone}}</span>
                         </div>
+                        <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
                       </div>
-
+                      <div class="family-member__item">
-                      <h2>承租人信息</h2>
+                        <div class="member-left">
-                      <div v-for="(item,index) in selected.renter" :key="item.id">
+                          <label>联系方式</label>
-                        <div class="family-member__item" >
-                          <div class="member-left">
-                            <label>{{item.name}}</label>
-                          </div>
-                          <span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span>
-                        </div>
-                        <div class="family-member__item">
-                          <div class="member-left">
-                            <label>联系方式</label>
-                          </div>
-                          <span>{{item.phone}}</span>
                         </div>
+                        <span style="color: #2266FF;">{{ item.phone }}</span>
                       </div>
+                    </div>
 
-                      <h2>实际居住人员</h2>
+                    <h2>承租人信息</h2>
-                      <div v-for="(item,index) in selected.live" :key="item.id">
+                    <div v-for="(item,index) in selected.renter" :key="item.id">
-                        <div class="family-member__item">
+                      <div class="family-member__item">
-                          <div class="member-left">
+                        <div class="member-left">
-                            <label>{{item.name}}</label>
+                          <label>{{ item.name }}</label>
-                          </div>
-                          <span>{{root.dict.getLabel("householdRelation",item.relation)}}</span>
                         </div>
+                        <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
+                      </div>
+                      <div class="family-member__item">
+                        <div class="member-left">
+                          <label>联系方式</label>
+                        </div>
+                        <span>{{ item.phone }}</span>
+                      </div>
+                    </div>
+
+                    <h2>实际居住人员</h2>
+                    <div v-for="(item,index) in selected.live" :key="item.id">
+                      <div class="family-member__item">
+                        <div class="member-left">
+                          <label>{{ item.name }}</label>
+                        </div>
+                        <span>{{ root.dict.getLabel("householdRelation", item.relation) }}</span>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </el-scrollbar>
+            </div>
-          </template>
+          </el-scrollbar>
-          <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
+        </template>
-          <div class="bottom"/>
+        <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
-        </div>
+        <div class="bottom"/>
-      <building-tool-bar></building-tool-bar>
+      </div>
+      <building-tool-bar/>
     </div>
   </section>
 </template>
@@ -96,11 +97,11 @@ export default {
       rooms: [],
       selected: {},
       currentBuilding: {},
-      unitNumber:1,
+      unitNumber: 1,
       tips: [],
-      position:{
+      position: {
-        x:"",
+        x: "",
-        y:""
+        y: ""
       },
     }
   },
@@ -115,23 +116,23 @@ export default {
     }
   },
   created() {
-    this.dict.load('householdRelation', 'residentTipType',"houseLivingType")
+    this.dict.load('householdRelation', 'residentTipType', "houseLivingType")
     if (this.isFormDv && this.query.buildingId) {
       this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum)
-      this.currentBuilding = { buildingNumber: this.query.buildingNumber}
+      this.currentBuilding = {buildingNumber: this.query.buildingNumber}
       this.unitNumber = this.query.unitNum
 
       return false
     }
-    this.getRoomsByBuilding(this.$route.query?.buildingId,this.$route.query?.unitNum)
+    this.getRoomsByBuilding(this.$route.query?.buildingId, this.$route.query?.unitNum)
     this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber};
     this.unitNumber = this.$route.query?.unitNum;
   },
   methods: {
     handleSelectRoom(room, e) {
       console.log(e)
-      if (room.livingNumber>0) {
+      if (room.livingNumber > 0) {
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.position.x = e.pageX + 40 + "px"
           this.position.y = e.pageY + "px"
           this.selected = room;
@@ -140,15 +141,17 @@ export default {
         // this.getRoomDetail(room.id)
       }
     },
-    selectedBuilding(building,unitNumber) {
+    selectedBuilding(building, unitNumber) {
       this.selected = {}
       this.tips = []
-      this.$router.push({query: {...this.$route.query, buildingId: building.id,unitNum:unitNumber}}).catch(e=>{e})
+      this.$router.push({query: {...this.$route.query, buildingId: building.id, unitNum: unitNumber}}).catch(e => {
+        e
+      })
       this.currentBuilding = building
       this.unitNumber = unitNumber
-      this.getRoomsByBuilding(building.id,unitNumber)
+      this.getRoomsByBuilding(building.id, unitNumber)
     },
-    getRoomsByBuilding(buildingId,unitNumber) {
+    getRoomsByBuilding(buildingId, unitNumber) {
       this.root.instance.post("/app/appcommunityhouseinfo/list", null, {
         params: {
           unitNumber,
@@ -170,11 +173,11 @@ export default {
           this.selected = {
             ...this.selected, ...res.data,
             residents: residents.map(e => {
-              let {tips} = e
+                  let {tips} = e
-              //显示为户主
+                  //显示为户主
-              let relationLabel = e.householdName == 1 ? "户主" : this.root.dict.getLabel("householdRelation", e.householdRelation)
+                  let relationLabel = e.householdName == 1 ? "户主" : this.root.dict.getLabel("householdRelation", e.householdRelation)
-              return {...e, tips: tips ? tips.split("|") : [], relationLabel}
+                  return {...e, tips: tips ? tips.split("|") : [], relationLabel}
-            }
+                }
             )
           }
         }
@@ -197,7 +200,7 @@ export default {
   display: flex;
   flex-direction: column;
 
-  ::v-deep .ailist-title{
+  ::v-deep .ailist-title {
     margin: 0 20px;
   }
 
@@ -337,29 +340,37 @@ export default {
 
     ::v-deep .floors {
       max-height: 520px;
+      max-width: 60vw;
+      margin: 0 20px;
+      padding: 0 50px;
+      position: relative;
 
-      .el-scrollbar__wrap {
+      &:before {
-        overflow-x: hidden;
+        display: block;
-        margin-bottom: 0 !important;
+        content: " ";
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
+        background-size: 100% 105px;
       }
     }
 
     .floor {
-      margin: 0 20px;
+      position: relative;
       height: 105px;
-      flex-shrink: 0;
-      max-width: calc(100% - 40px);
       display: flex;
+      flex-shrink: 0;
       align-items: center;
-      background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
-      background-size: 100% 105px;
-      padding: 0 30px;
       box-sizing: border-box;
       gap: 20px;
 
       .room {
         width: 60px;
         height: 72px;
+        flex-shrink: 0;
         background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png");
         text-align: center;
         padding-top: 20px;

project/sass/apps/AppHouseMap/buildingStatistics.vue

@@ -1,74 +1,75 @@
 <template>
   <section class="buildingStatistics">
-    <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId='',$parent.showStatistics=false, $parent.type='0'"/>
+    <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder
+              @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId='',$parent.showStatistics=false, $parent.type='0'"/>
     <div class="buildingPane">
       <div class="bgItem tree"/>
-        <div class="building">
+      <div class="building">
-          <template v-if="floorRooms.length>0">
+        <template v-if="floorRooms.length>0">
-            <div class="buildingSignboard">{{ `${currentBuilding.buildingNumber}栋 ${unitNumber}单元` }}
+          <div class="buildingSignboard" v-text="`${currentBuilding.buildingNumber}栋 ${unitNumber}单元`"/>
-            </div>
+          <el-scrollbar class="floors">
-            <el-scrollbar class="floors">
+            <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
-              <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
+              <div class="room" v-for="op in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)"
-                <div class="room" v-for="(op,i) in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)" :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
+                   :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
-                  {{ op.houseCode }}
+                {{ op.houseCode }}
-                  <div v-if="op.livingNumber==0">无人</div>
+                <div v-if="op.livingNumber==0">无人</div>
-                  <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
+                <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
-                    <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
+                  <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
-                      <span>{{selected.houseCode}}详情</span>
+                    <span>{{ selected.houseCode }}详情</span>
-                      <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
+                    <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
-                    </el-row>
+                  </el-row>
-                    <div class="family-member">
+                  <div class="family-member">
-                      <h2>房主信息</h2>
+                    <h2>房主信息</h2>
-                      <div v-for="(item,index) in selected.owner" :key="item.id">
+                    <div v-for="(item,index) in selected.owner" :key="item.id">
-                        <div class="family-member__item">
+                      <div class="family-member__item">
-                          <div class="member-left">
+                        <div class="member-left">
-                            <label>{{item.name}}</label>
+                          <label>{{ item.name }}</label>
-                          </div>
-                          <span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span>
-                        </div>
-                        <div class="family-member__item">
-                          <div class="member-left">
-                            <label>联系方式</label>
-                          </div>
-                          <span style="color: #2266FF;">{{item.phone}}</span>
                         </div>
+                        <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
                       </div>
-
+                      <div class="family-member__item">
-                      <h2>承租人信息</h2>
+                        <div class="member-left">
-                      <div v-for="(item,index) in selected.renter" :key="item.id">
+                          <label>联系方式</label>
-                        <div class="family-member__item" >
-                          <div class="member-left">
-                            <label>{{item.name}}</label>
-                          </div>
-                          <span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span>
-                        </div>
-                        <div class="family-member__item">
-                          <div class="member-left">
-                            <label>联系方式</label>
-                          </div>
-                          <span>{{item.phone}}</span>
                         </div>
+                        <span style="color: #2266FF;">{{ item.phone }}</span>
                       </div>
+                    </div>
 
-                      <h2>实际居住人员</h2>
+                    <h2>承租人信息</h2>
-                      <div v-for="(item,index) in selected.live" :key="item.id">
+                    <div v-for="(item,index) in selected.renter" :key="item.id">
-                        <div class="family-member__item">
+                      <div class="family-member__item">
-                          <div class="member-left">
+                        <div class="member-left">
-                            <label>{{item.name}}</label>
+                          <label>{{ item.name }}</label>
-                          </div>
-                          <span>{{root.dict.getLabel("householdRelation",item.relation)}}</span>
                         </div>
+                        <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
+                      </div>
+                      <div class="family-member__item">
+                        <div class="member-left">
+                          <label>联系方式</label>
+                        </div>
+                        <span>{{ item.phone }}</span>
+                      </div>
+                    </div>
+
+                    <h2>实际居住人员</h2>
+                    <div v-for="(item,index) in selected.live" :key="item.id">
+                      <div class="family-member__item">
+                        <div class="member-left">
+                          <label>{{ item.name }}</label>
+                        </div>
+                        <span>{{ root.dict.getLabel("householdRelation", item.relation) }}</span>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </el-scrollbar>
+            </div>
-          </template>
+          </el-scrollbar>
-          <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
+        </template>
-          <div class="bottom"/>
+        <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
-        </div>
+        <div class="bottom"/>
-      <building-tool-bar></building-tool-bar>
+      </div>
+      <building-tool-bar/>
     </div>
   </section>
 </template>
@@ -96,11 +97,11 @@ export default {
       rooms: [],
       selected: {},
       currentBuilding: {},
-      unitNumber:1,
+      unitNumber: 1,
       tips: [],
-      position:{
+      position: {
-        x:"",
+        x: "",
-        y:""
+        y: ""
       },
     }
   },
@@ -115,23 +116,23 @@ export default {
     }
   },
   created() {
-    this.dict.load('householdRelation', 'residentTipType',"houseLivingType")
+    this.dict.load('householdRelation', 'residentTipType', "houseLivingType")
     if (this.isFormDv && this.query.buildingId) {
       this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum)
-      this.currentBuilding = { buildingNumber: this.query.buildingNumber}
+      this.currentBuilding = {buildingNumber: this.query.buildingNumber}
       this.unitNumber = this.query.unitNum
 
       return false
     }
-    this.getRoomsByBuilding(this.$route.query?.buildingId,this.$route.query?.unitNum)
+    this.getRoomsByBuilding(this.$route.query?.buildingId, this.$route.query?.unitNum)
     this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber};
     this.unitNumber = this.$route.query?.unitNum;
   },
   methods: {
     handleSelectRoom(room, e) {
       console.log(e)
-      if (room.livingNumber>0) {
+      if (room.livingNumber > 0) {
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.position.x = e.pageX + 40 + "px"
           this.position.y = e.pageY + "px"
           this.selected = room;
@@ -140,15 +141,17 @@ export default {
         // this.getRoomDetail(room.id)
       }
     },
-    selectedBuilding(building,unitNumber) {
+    selectedBuilding(building, unitNumber) {
       this.selected = {}
       this.tips = []
-      this.$router.push({query: {...this.$route.query, buildingId: building.id,unitNum:unitNumber}}).catch(e=>{e})
+      this.$router.push({query: {...this.$route.query, buildingId: building.id, unitNum: unitNumber}}).catch(e => {
+        e
+      })
       this.currentBuilding = building
       this.unitNumber = unitNumber
-      this.getRoomsByBuilding(building.id,unitNumber)
+      this.getRoomsByBuilding(building.id, unitNumber)
     },
-    getRoomsByBuilding(buildingId,unitNumber) {
+    getRoomsByBuilding(buildingId, unitNumber) {
       this.root.instance.post("/app/appcommunityhouseinfo/list", null, {
         params: {
           unitNumber,
@@ -170,11 +173,11 @@ export default {
           this.selected = {
             ...this.selected, ...res.data,
             residents: residents.map(e => {
-              let {tips} = e
+                  let {tips} = e
-              //显示为户主
+                  //显示为户主
-              let relationLabel = e.householdName == 1 ? "户主" : this.root.dict.getLabel("householdRelation", e.householdRelation)
+                  let relationLabel = e.householdName == 1 ? "户主" : this.root.dict.getLabel("householdRelation", e.householdRelation)
-              return {...e, tips: tips ? tips.split("|") : [], relationLabel}
+                  return {...e, tips: tips ? tips.split("|") : [], relationLabel}
-            }
+                }
             )
           }
         }
@@ -197,7 +200,7 @@ export default {
   display: flex;
   flex-direction: column;
 
-  ::v-deep .ailist-title{
+  ::v-deep .ailist-title {
     margin: 0 20px;
   }
 
@@ -337,29 +340,37 @@ export default {
 
     ::v-deep .floors {
       max-height: 520px;
+      max-width: 60vw;
+      margin: 0 20px;
+      padding: 0 50px;
+      position: relative;
 
-      .el-scrollbar__wrap {
+      &:before {
-        overflow-x: hidden;
+        display: block;
-        margin-bottom: 0 !important;
+        content: " ";
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
+        background-size: 100% 105px;
       }
     }
 
     .floor {
-      margin: 0 20px;
+      position: relative;
       height: 105px;
-      flex-shrink: 0;
-      max-width: calc(100% - 40px);
       display: flex;
+      flex-shrink: 0;
       align-items: center;
-      background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
-      background-size: 100% 105px;
-      padding: 0 30px;
       box-sizing: border-box;
       gap: 20px;
 
       .room {
         width: 60px;
         height: 72px;
+        flex-shrink: 0;
         background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png");
         text-align: center;
         padding-top: 20px;