小区档案-门牌幢

2c4d3b2a · 郭铭瑶 · 13963b37 · 2c4d3b2a · 13963b37 · 13963b37
Commit 2c4d3b2a authored Nov 08, 2021 by 郭铭瑶 🤘
15 changed files
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@

 <body>
  <div id="app"></div>
-  <script src="/shanghaiwuye_gis_map_api_3.2.210914/SMap.min.js"></script>
+  <script src="/shanghaiwuye_gis_map_api_3.2.211102/SMap.min.js"></script>
  <script src="/Plugins.min.js"></script>
  <script type="module" src="/src/main.ts"></script>
 </body>

--- a/public/shanghaiwuye_gis_map_api_3.2.210914/SMap.min.js
+++ b/public/shanghaiwuye_gis_map_api_3.2.210914/SMap.min.js
--- a/public/shanghaiwuye_gis_map_api_3.2.210914/SMap.min.js.map
+++ b/public/shanghaiwuye_gis_map_api_3.2.210914/SMap.min.js.map
--- a/public/shanghaiwuye_gis_map_api_3.2.210914/README.md
+++ b/public/shanghaiwuye_gis_map_api_3.2.210914/README.md
--- a/public/shanghaiwuye_gis_map_api_3.2.211102/SMap.min.js
+++ b/public/shanghaiwuye_gis_map_api_3.2.211102/SMap.min.js
--- a/public/shanghaiwuye_gis_map_api_3.2.211102/SMap.min.js.map
+++ b/public/shanghaiwuye_gis_map_api_3.2.211102/SMap.min.js.map
--- a/src/ajax/api.ts
+++ b/src/ajax/api.ts
@@ -11,4 +11,8 @@ export default {
  BASE_URL,
  CONFIGS: '/service-bigscreen/public/bigscreenConfigs', // 配置
  COMMUNITY: '/service-customkey-ddd/public/communities/v2', // 小区
+  BUILDINGS: '/service-basicdatasync-ddd/public/community/buildings', // 门牌幢
+  BUILDING: '/service-basicdatasync-ddd/public/building/{id}', // 根据id查楼栋信息
+  ORDERS: '/service-documents-ddd/public/dr/check/orders', // 月查
+  ORDER: '/service-documents-ddd/public/dr/check/order/{id}', // 根据id查月查详情
 }
--- a/src/assets/images/green-point.png
+++ b/src/assets/images/green-point.png
--- a/src/components/MyComponent/MyForm/my-form.vue
+++ b/src/components/MyComponent/MyForm/my-form.vue
@@ -137,7 +137,8 @@ export default defineComponent({
 <style lang="stylus" scoped>
 @import '../main.styl'
 .my-form
-  $full()
+  width 100%
+  box-sizing border-box
  .row
    display flex
    background $table-content-bg

--- a/src/utils/component-lib.esm.js
+++ b/src/utils/component-lib.esm.js
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
+export const switchUnitKind = (unitKind: unknown) => {
+  if (unitKind == '1') {
+    return '高层'
+  } else if (unitKind == '2') {
+    return '多层'
+  } else if (unitKind == '3') {
+    return '小高层'
+  } else if (unitKind == '4') {
+    return '联体别墅'
+  } else if (unitKind == '5') {
+    return '单体别墅'
+  } else {
+    return '暂无'
+  }
+}
+
+export const switchOrderState = (orderState: unknown) => {
+  if (orderState == '0') {
+    return '未整改'
+  } else if (orderState == '2') {
+    return '退回重新整改'
+  } else if (orderState == '5') {
+    return '待审核'
+  } else if (orderState == '7') {
+    return '整改中'
+  } else if (orderState == '9') {
+    return '已结案'
+  } else {
+    return '暂无'
+  }
+}
--- a/src/view/components/community-info.vue
+++ b/src/view/components/community-info.vue
--- a/src/view/components/map.vue
+++ b/src/view/components/map.vue
@@ -11,7 +11,7 @@ import jinganPath from '@/utils/jingan-path.js'
 let map: MyMap
 let polygonLayer: any

-defineExpose({ zoomIn, zoomOut, zoomTo, focus, addPoints, remove })
+defineExpose({ zoomIn, zoomOut, zoomTo, focus, addPoints, remove, setCommunityPoints })
 const emit = defineEmits(['event', 'complete'])

 onMounted(async () => {
@@ -21,6 +21,7 @@ onMounted(async () => {
    mode: '2D',
    center: [-1931.2637583608503, 4334.0159596985895],
    zoom: 4,
+    zooms: [3, 10],
    style: 'smap://styles/dark',
    appKey: 'DTZ49ACE32PBN73GXPF085',
    netType: 'internet',
@@ -46,14 +47,17 @@ function onComplete() {
    color: '#ED6F30',
    lineWidth: 2,
  })
-  map.instance.getLayer('wg_gis_xq_point').visible = false
-  // eslint-disable-next-line
-  map.instance.setFilter('wg_gis_mpz', "HPB_NAME = '静安区'")
-  // eslint-disable-next-line
-  map.instance.setFilter('wg_gis_xq_poly', "HPB_NAME = '静安区'")
+  setCommunityPoints()
  emit('complete')
 }

+function setCommunityPoints(query = "HPB_NAME = '静安区'") {
+  console.log(query)
+  map.instance.getLayer('wg_gis_xq_point').visible = false
+  map.instance.setFilter('wg_gis_mpz', query)
+  map.instance.setFilter('wg_gis_xq_poly', query)
+}
+
 function zoomIn() {
  map.zoomIn()
 }

--- a/src/view/components/search-view.vue
+++ b/src/view/components/search-view.vue
@@ -7,7 +7,12 @@
        :options="selectOptions"
        size="small"
      />
-      <n-input v-model:value="searchKey" size="small" clearable />
+      <n-input
+        v-model:value="searchKey"
+        size="small"
+        clearable
+        @keypress.enter="onSearch"
+      />
      <n-button type="primary" ghost size="small" @click="onSearch">
        搜索
      </n-button>

--- a/src/view/view-page.vue
+++ b/src/view/view-page.vue
@@ -46,7 +46,7 @@
    :only-one-view="onlyOneView"
    @touch="handleMapBtnsEvents"
  />
-  <m-modal v-model="showCommunityDrawer" title="小区档案" width="70%">
+  <m-modal v-model="showCommunityDrawer" title="小区档案" width="80%">
    <CommunityInfo :info="communityDetail" />
  </m-modal>
  <m-modal v-model="showElevatorDrawer" title="多层住宅电梯加装" width="70%">
@@ -55,7 +55,7 @@
  <m-modal v-model="showSafetyDrawer" title="房屋安全排查结果" width="70%">
    <SafetyInfo :info="safetyDetail" />
  </m-modal>
-  <m-modal v-model="showSearchModal" title="搜索">
+  <m-modal v-model="showSearchModal" title="搜索小区">
    <SearchView @select="onSelectCommunity" />
  </m-modal>
 </template>
@@ -80,6 +80,8 @@ import c3 from '@/assets/images/c3.png'
 import c4 from '@/assets/images/c4.png'
 import c5 from '@/assets/images/c5.png'
 import c6 from '@/assets/images/c6.png'
+import CommunityIcon from '@/assets/images/green-point.png'
+import BlueOn from '@/assets/images/blue-on.gif'

 const mapRef = shallowRef<any>(null)
 const { layout } = useLayout()
@@ -181,7 +183,7 @@ bus.on('communityList', (data) => {
  store.commit('SET_COMMUNITY_LIST', data)
 })
 function onMapComplete() {
-  addPoints(store.state.communityList)
+  addPoints({ data: store.state.communityList, icon: CommunityIcon, size: 6 })
 }

 function addPoints(data) {
@@ -219,8 +221,12 @@ const onSelectCommunity = async (data: any) => {
  } else if (stKind == '04') {
    icon = c6
  }
-  addPoints({ icon, data: [data] })
+  addPoints({ icon, data: [data], size: 40 })
  showSearchModal.value = false
+  mapRef.value?.setCommunityPoints(`SECT_NAME_ = '${data.stNameFrst}'`)
+  mapRef.value?.focus([data.minx || data.maxx, data.miny || data.maxy], {
+    zoom: 9,
+  })
 }
 // document.addEventListener('dblclick', (e) => {
 //   console.log(e.target.attributes[0])