小区管理

epmet-oper-web/src/views/modules/base/community/buildTable.vue

@@ -49,20 +49,26 @@
       <el-table :data="tableData"
                 border
                 style="width: 100%">
-        <el-table-column prop="neighborHoodName"
+        <el-table-column prop="buildingName"
-                         label="小区名称"
+                         label="楼宇名称"
                          width="180">
         </el-table-column>
-        <el-table-column prop="orgName"
+        <el-table-column prop="neighbourHoodName"
-                         label="所属组织"
+                         label="所属楼宇"
                          width="160">
         </el-table-column>
-        <el-table-column prop="gridName"
+        <el-table-column prop="buildingType"
-                         label="所属网格"
+                         label="楼栋类型"
                          width="140">
         </el-table-column>
-        <el-table-column prop="address"
+        <el-table-column prop="totalUnitNum"
-                         label="详细地址">
+                         label="单元数">
+        </el-table-column>
+        <el-table-column prop="totalFloorNum"
+                         label="层数">
+        </el-table-column>
+        <el-table-column prop="totalHouseNum"
+                         label="户数">
         </el-table-column>
         <el-table-column prop="remark"
                          label="备注">
@@ -145,7 +151,7 @@ export default {
 
       //form相关
       formShow: false,
-      formTitle: '新增小区'
+      formTitle: '新增楼宇'
 
     }
   },
@@ -190,7 +196,7 @@ export default {
     },
 
     handleDetail (row) {
-      this.formTitle = '小区详情'
+      this.formTitle = '楼宇详情'
       this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('detail', row)
@@ -198,7 +204,7 @@ export default {
     },
 
     handleAdd () {
-      this.formTitle = '新增小区'
+      this.formTitle = '新增楼宇'
       this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add')
@@ -206,7 +212,7 @@ export default {
     },
 
     handleEdit (row) {
-      this.formTitle = '修改小区'
+      this.formTitle = '修改楼宇'
       this.formShow = true
       this.$refs.ref_form.initForm('edit', row)
     },

epmet-oper-web/src/views/modules/base/community/community.vue

@@ -33,9 +33,9 @@
           <div :style="{height:rowHeight}">
 
             <build-table v-if="selTreeLevel==='neighbourHood'"
-                         ref="ref_communityTable"></build-table>
+                         ref="ref_neighTable"></build-table>
             <room-table v-else-if="selTreeLevel==='building'"
-                        ref="ref_communityTable"></room-table>
+                        ref="ref_buildingTable"></room-table>
             <community-table v-else
                              ref="ref_communityTable"></community-table>
 
@@ -69,7 +69,9 @@ export default {
       },
 
       selTreeId: '',
-      selTreeLevel: ''
+      selTreeLevel: '',
+
+      centerPoint: []
 
     }
   },
@@ -77,8 +79,10 @@ export default {
     CDialog
   },
   async mounted () {
-    await this.loadTree()
+    await this.loadOrgData()
+    await this.$refs['ref_communityTable'].initData(this.centerPoint)
 
+    await this.loadTree()
     await this.$refs['ref_communityTable'].loadTable(this.selTreeId, this.selTreeLevel)
   },
   computed: {
@@ -108,8 +112,35 @@ export default {
       }
     },
 
+    //加载组织数据
+    async loadOrgData () {
+      const url = "/gov/org/agency/maporg"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.centerPoint = []
+
+        this.centerPoint.push(data.latitude)
+        this.centerPoint.push(data.longitude)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
     handleNodeClick (obj) {
+      if (obj.level === 'building') {
+        this.$refs['ref_buildingTable'].loadTable(obj.id, obj.level)
+      } else if (obj.level === 'neighbourHood') {
+        this.$refs['ref_neighTable'].loadTable(obj.id, obj.level)
+      } else {
         this.$refs['ref_communityTable'].loadTable(obj.id, obj.level)
+      }
+
     },
 
     handleSizeChange (val) {

epmet-oper-web/src/views/modules/base/community/communityForm.vue

@@ -2,153 +2,112 @@
   <div>
     <div>
       <div v-show="!propertyFormShow">
-        <el-form
+        <el-form :inline="false"
-          :inline="false"
                  :model="dataForm"
                  :rules="dataRule"
                  :disabled="formType === 'detail'"
-          class="form"
+                 class="form">
-        >
+          <el-form-item label="小区名称"
-          <el-form-item
-            label="小区名称"
                         prop="neighborHoodName"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-input class="item_width_1"
-            <el-input
-              class="item_width_1"
                       maxlength="50"
                       show-word-limit
                       placeholder="请输入小区名称"
-              v-model="dataForm.neighborHoodName"
+                      v-model="dataForm.neighborHoodName">
-            >
             </el-input>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="所属组织"
-            label="所属组织"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
             <span>{{ dataForm.agencyName }}</span>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="所属网格"
-            label="所属网格"
                         prop="gridId"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-select class="item_width_1"
-            <el-select
-              class="item_width_1"
                        v-model="dataForm.gridId"
                        placeholder="请选择"
-              clearable
+                       clearable>
-            >
+              <el-option v-for="item in gridList"
-              <el-option
-                v-for="item in gridList"
                          :key="item.gridId"
                          :label="item.gridName"
-                :value="item.gridId"
+                         :value="item.gridId">
-              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="关联物业"
-            label="关联物业"
                         prop="propertyId"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-select class="item_width_2"
-            <el-select
-              class="item_width_2"
                        v-model="dataForm.propertyId"
                        placeholder="请选择"
-              clearable
+                       clearable>
-            >
+              <el-option v-for="item in propertyList"
-              <el-option
-                v-for="item in propertyList"
                          :key="item.propertyId"
                          :label="item.propertyName"
-                :value="item.propertyId"
+                         :value="item.propertyId">
-              >
               </el-option>
             </el-select>
 
-            <el-button
+            <el-button style="margin-left: 10px"
-              style="margin-left: 10px"
                        type="primary"
                        size="small"
-              @click="handleAddProperty"
+                       @click="handleAddProperty">添加物业</el-button>
-              >添加物业</el-button
-            >
           </el-form-item>
-          <el-form-item
+          <el-form-item label="详细地址"
-            label="详细地址"
                         prop="address"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-input class="item_width_1"
-            <el-input
-              class="item_width_1"
                       maxlength="50"
                       show-word-limit
                       placeholder="请输入详细地址"
-              v-model="dataForm.address"
+                      v-model="dataForm.address">
-            >
             </el-input>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="备注"
-            label="备注"
                         prop="remark"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-input class="item_width_1"
-            <el-input
-              class="item_width_1"
                       type="textarea"
                       maxlength="500"
                       show-word-limit
                       :rows="3"
                       placeholder="请输入备注，不超过500字"
-              v-model="dataForm.remark"
+                      v-model="dataForm.remark"></el-input>
-            ></el-input>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="位置坐标"
-            label="位置坐标"
                         prop="longitude"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-input class="item_width_3"
-            <el-input
-              class="item_width_3"
                       maxlength="50"
                       placeholder="请输入关键字"
-              v-model="keyWords"
+                      v-model="keyWords">
-            >
             </el-input>
-            <el-button
+            <el-button style="margin-left: 10px"
-              style="margin-left: 10px"
                        type="primary"
                        size="small"
-              @click="handleSearchMap"
+                       @click="handleSearchMap">查询</el-button>
-              >查询</el-button
+            <div id="app"
-            >
+                 class="div_map"></div>
-            <div id="app" class="div_map"></div>
             <div style="margin-top: 10px">
               <span>经度</span>
-              <el-input
+              <el-input class="item_width_3"
-                class="item_width_3"
                         maxlength="50"
                         placeholder="请输入经度"
-                v-model="dataForm.longitude"
+                        v-model="dataForm.longitude">
-              >
               </el-input>
               <span style="margin-left: 20px">纬度</span>
-              <el-input
+              <el-input class="item_width_3"
-                class="item_width_3"
                         maxlength="50"
                         placeholder="请输入纬度"
-                v-model="dataForm.latitude"
+                        v-model="dataForm.latitude">
-              >
               </el-input>
             </div>
           </el-form-item>
@@ -156,25 +115,19 @@
       </div>
 
       <div v-show="propertyFormShow">
-        <el-form
+        <el-form :inline="false"
-          :inline="false"
                  :model="propertyForm"
                  :rules="propertyRule"
-          class="form"
+                 class="form">
-        >
+          <el-form-item label="物业名称"
-          <el-form-item
-            label="物业名称"
                         prop="name"
                         label-width="150px"
-            style="display: block"
+                        style="display: block">
-          >
+            <el-input class="item_width_1"
-            <el-input
-              class="item_width_1"
                       maxlength="50"
                       show-word-limit
                       placeholder="请输入小区名称"
-              v-model="propertyForm.name"
+                      v-model="propertyForm.name">
-            >
             </el-input>
           </el-form-item>
         </el-form>
@@ -182,12 +135,9 @@
     </div>
     <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button
+      <el-button v-if="formType != 'detail'"
-        v-if="formType != 'detail'"
                  type="primary"
-        @click="handleComfirm"
+                 @click="handleComfirm">确 定</el-button>
-        >确 定</el-button
-      >
     </div>
   </div>
 </template>
@@ -228,7 +178,8 @@ export default {
         name: ''
       },
 
-      keyWords: ''
+      keyWords: '',
+      centerPoint: []
     }
   },
   components: {},
@@ -240,7 +191,7 @@ export default {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(39.98412, 116.307484)
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
@@ -248,8 +199,7 @@ export default {
         pitch: 43.5, // 设置俯仰角
         rotation: 45 // 设置地图旋转角度
       })
-      console.log(map)
+
-      console.log(window)
       search = new window.TMap.service.Search({ pageSize: 10 })
       // 新建一个地点搜索类
       markers = new TMap.MultiMarker({
@@ -317,7 +267,12 @@ export default {
       this.setMarker(lat, lng)
     },
 
-    async initForm(type, row) {
+    async initForm (centerPoint, type, row) {
+
+      this.centerPoint = centerPoint
+      // debugger
+      map.setCenter(new TMap.LatLng(this.centerPoint[0], this.centerPoint[1]))
+
       this.formType = type
       if (row) {
         this.neighborHoodId = row.neighborHoodId
@@ -345,7 +300,7 @@ export default {
     },
     //加载网格
     async loadGrid () {
-      const url = '/gov/org/grid/allgrids'
+      const url = '/gov/org/grid/allgridsnopermission '
       // const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
       let params = {
         agencyId: this.dataForm.agencyId
@@ -375,6 +330,7 @@ export default {
     },
 
     handleAddProperty () {
+
       this.propertyForm.name = ''
       this.propertyFormShow = true
     },

epmet-oper-web/src/views/modules/base/community/communityTable.vue

@@ -109,7 +109,7 @@
                :close-on-press-escape="false"
                :title="formTitle"
                width="800px"
-               top='5'
+               top='15'
                @closed="diaClose">
       <community-form ref="ref_form"
                       @dialogCancle="addFormCancle"
@@ -148,7 +148,8 @@ export default {
 
       //form相关
       formShow: false,
-      formTitle: '新增小区'
+      formTitle: '新增小区',
+      centerPoint: []
 
     }
   },
@@ -165,6 +166,9 @@ export default {
     ...mapGetters(['clientHeight'])
   },
   methods: {
+    initData (centerPoint) {
+      this.centerPoint = centerPoint
+    },
     handleSearch () {
       this.loadTable()
     },
@@ -202,7 +206,7 @@ export default {
       this.formTitle = '小区详情'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row)
+        this.$refs.ref_form.initForm(this.centerPoint, 'detail', row)
       })
     },
 
@@ -210,14 +214,14 @@ export default {
       this.formTitle = '新增小区'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add')
+        this.$refs.ref_form.initForm(this.centerPoint, 'add')
       })
     },
 
     handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true
-      this.$refs.ref_form.initForm('edit', row)
+      this.$refs.ref_form.initForm(this.centerPoint, 'edit', row)
     },
 
     addFormCancle () {