From f675d887ca1adf990b81deed264524e936df39ac Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 11 Jan 2023 14:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/community/buildDetail copy.vue       | 271 ------------------
 .../modules/base/community/community.vue      |  14 +-
 2 files changed, 9 insertions(+), 276 deletions(-)
 delete mode 100644 src/views/modules/base/community/buildDetail copy.vue

diff --git a/src/views/modules/base/community/buildDetail copy.vue b/src/views/modules/base/community/buildDetail copy.vue
deleted file mode 100644
index 9610f29ab..000000000
--- a/src/views/modules/base/community/buildDetail copy.vue	
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-
-      <div v-if="initLoading"
-           class="m-detail-main">
-        <div class="m-info">
-          <div class="m-info-prop">
-            <span class="u-info-title-2">所属小区：</span>
-            <span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
-          </div>
-
-          <div class="m-info-prop">
-            <span class="u-info-title-2">楼栋名称：</span>
-            <span>{{ dataForm.buildingName?dataForm.buildingName:'--' }}</span>
-          </div>
-
-          <div class="m-info-prop">
-            <span class="u-info-title-2">楼栋编码：</span>
-            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
-          </div>
-
-          <div class="m-info-prop">
-            <span class="u-info-title-2">楼栋类型：</span>
-            <span>{{ dataForm.typeName?dataForm.typeName:'--'}}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">单元数：</span>
-            <span>{{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">层数：</span>
-            <span>{{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">总户数：</span>
-            <span>{{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">人口数：</span>
-            <span>{{dataForm.realPerson?dataForm.realPerson:0 }}</span>
-          </div>
-
-          <div class="m-info-prop">
-            <span class="u-info-title-2">楼长姓名：</span>
-            <span>{{ dataForm.buildingLeaderName?dataForm.buildingLeaderName:'--' }}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">楼长电话：</span>
-            <span>{{ dataForm.buildingLeaderMobile?dataForm.buildingLeaderMobile:'--' }}</span>
-          </div>
-          <div class="m-info-prop">
-            <span class="u-info-title-2">详细地址：</span>
-            <span>{{ dataForm.coordinatePosition?dataForm.coordinatePosition:'--' }}</span>
-          </div>
-
-          <div v-show="dataForm.coordinatePosition"
-               class="m-info-prop">
-            <span class="u-info-title-2">地图位置：</span>
-            <div class="div_map">
-
-              <div id="app_detail_build"></div>
-
-            </div>
-          </div>
-
-        </div>
-      </div>
-
-    </div>
-    <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
-
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import daiMap from "@/utils/dai-map";
-var map
-var search
-var markers
-var infoWindowList
-let loading // 加载动画
-export default {
-  data () {
-    return {
-
-      btnDisable: false,
-      initLoading: false,
-
-      dataForm: {
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        neighborHoodId: '',//所属小区id
-        buildingName: '',//房屋名称
-        // sort: 0,//排序
-        totalUnitNum: 1,//单元数	
-        totalFloorNum: 0,//层数	
-        totalHouseNum: 0,//总户数	
-        realPerson: 0,
-        buildingLeaderName: '',//楼长姓名
-        buildingLeaderMobile: '',//楼长电话
-        type: '',//房屋类型
-        coordinatePosition: '',
-        sysCoding: '',
-        coding: '',
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '' //纬度
-      },
-
-      agencyObj: {},
-
-    }
-  },
-  components: {},
-  mounted () {
-
-  },
-
-  methods: {
-    handleCancle () {
-      this.diaDestroy()
-      this.$emit('diaDetailClose')
-
-    },
-    diaDestroy () {
-      if (map) {
-        // map.destroy()
-      }
-    },
-    async initForm (row, agencyObj) {
-
-      this.dataForm = JSON.parse(JSON.stringify(row))
-      this.agencyObj = agencyObj
-
-      this.initLoading = true
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (this.dataForm.latitude && this.dataForm.longitude) {
-        latitude = this.dataForm.latitude
-        longitude = this.dataForm.longitude
-      }
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      if (this.dataForm.coordinatePosition) {
-        this.$nextTick(() => {
-          if (!map) {
-            this.initMap(latitude, longitude)
-          } else {
-            map.setCenter(latitude, longitude);
-            map.setMarker(latitude, longitude);
-          }
-
-        })
-      }
-    },
-
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap (latitude, longitude) {
-
-      map = new daiMap(
-        document.getElementById("app_detail_build"),
-        { latitude, longitude },
-        {
-          zoom: 16.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-
-      // // 监听地图平移结束
-      // map.on("dragend", (e) => {
-      //   this.handleMoveCenter(e);
-      // });
-
-      map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-
-    },
-
-    resetData () {
-
-      this.buildType = '1'
-      this.dataForm = {
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        neighborHoodId: '',//所属小区id
-        buildingName: '',//房屋名称
-        // sort: 0,//排序
-        totalUnitNum: 1,//单元数	
-        totalFloorNum: 0,//层数	
-        totalHouseNum: 0,//总户数	
-        realPerson: 0,
-        buildingLeaderName: '',//楼长姓名
-        buildingLeaderMobile: '',//楼长电话
-        type: '',//房屋类型
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '', //纬度
-        coding: '',
-        sysCoding: '',
-        coordinatePosition: ''
-      }
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        buildingName: [
-          { required: true, message: '楼栋名称不能为空', trigger: 'blur' },
-          {
-            min: 1,
-            max: 10,
-            message: '小区名称长度在 1 到 10个字符',
-            trigger: 'blur'
-          }
-        ],
-        type: [
-          { required: true, message: '楼栋类型不能为空', trigger: 'blur' }
-        ],
-        totalUnitNum: [
-          { required: true, message: '单元数不能为空', trigger: 'blur' }
-        ],
-        coding: [
-          { required: true, message: '楼栋编码不能为空', trigger: 'blur' }
-        ]
-        // totalFloorNum: [
-        //   { required: true, message: '层数不能为空', trigger: 'blur' }
-        // ],
-        // totalHouseNum: [
-        //   { required: true, message: '户数不能为空', trigger: 'blur' }
-        // ],
-        // longitude: [
-        //   { required: true, message: '坐标不能为空', trigger: 'blur' }
-        // ],
-      }
-    },
-
-  },
-  props: {}
-}
-</script>
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/management/detail-main.scss";
-</style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index a3723a25c..32fa0400b 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -471,10 +471,10 @@ export default {
     },
 
     async getBuildList () {
-      const url = "/gov/org/icbuilding/buildingoption";
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+      const url = "/actual/base/communityBuilding/buildingoption";
+
       let params = {
-        neighborHoodId: this.neighborHoodId,
+        quartersId: this.neighborHoodId,
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -492,7 +492,7 @@ export default {
     },
     async getUniList () {
 
-      const url = "/gov/org/icbuildingunit/unitoption";
+      const url = "/actual/base/communityBuildingUnit/unitoption";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         buildingId: this.buildingId,
@@ -511,8 +511,12 @@ export default {
 
     },
     getHouseList () {
+      let params = {
+        buildingId: this.buildingId,
+        unitId: this.buildingUnitId
+      }
       this.$http
-        .post("/gov/org/ichouse/houseoption", { unitId: this.buildingUnitId })
+        .post("/actual/base/communityHouse/houseoption", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);