电梯加装信息弹窗和安全排查信息弹窗,暂存

src/view/components/community-info.vue

@@ -9,7 +9,7 @@
         'stCspEast:小区四至范围东|getStCspWest:小区四至范围西|stCspSouth:小区四至范围南',
         'stCspNorth:小区四至范围北|stNotcsparea:四至不包括|stKindName:小区性质',
         'sectTypeName:小区类型|cspServiceTypeName:物业服务类型|totOngParks:地面停车位数量',
-        'totUngParks:地下停车位数量|landArea:占地面积|totUnits:总门牌数',
+        'totUngParks:地下停车位数量|landArea:占地面积(㎡)|totUnits:总门牌数',
         'totHous:总户数||',
       ]"
       :data="info"

src/view/components/elevator-info.vue

+<template>
+  <div class="elevator-info">
+    <m-form
+      :template="[
+        'stNameFrst:小区名称|elevatorAddr:项目地址',
+        'streetName:所属街道|unitTypeDesc:户型',
+        'cmtName:居委会|unitTotFloor:楼层',
+        'totUnit:户数|unitBuildTime:建造年份',
+        'hocName:业委会|cspName:物业公司',
+        'evaluateType:评估类型>whichType|evaluateResultDesc:评估描述',
+      ]"
+      :data="info"
+      :formatter="formatter"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType } from 'vue'
+
+defineProps({
+  info: {
+    type: Object as PropType<{ [key: string]: unknown }>,
+    default: () => ({}),
+  },
+})
+const formatter = {
+  /**
+   * 评估类型
+   * 0-可加装 1-较难加装 2-不可加装
+   */
+  whichType: (val) => {
+    if (val == 0) {
+      return '可加装'
+    } else if (val == 1) {
+      return '较难加装'
+    } else if (val == 2) {
+      return '不可加装'
+    } else {
+      return null
+    }
+  },
+}
+</script>

src/view/components/map.vue

@@ -3,18 +3,13 @@
 </template>
 
 <script lang="ts" setup>
-import icon1 from '@/assets/images/search.png'
 import { MyMap } from '@/components/my-map'
 import { Location, FocusOptions } from '@/components/my-map/types'
 import { nextTick, onMounted } from 'vue'
 import jinganPath from '@/utils/jingan-path.js'
-import { ajax, api } from '@/ajax'
 
 let map: MyMap
-let pointsLayer: any
-let linesLayer: any
 let polygonLayer: any
-let boundary: any
 
 defineExpose({ zoomIn, zoomOut, zoomTo, focus, addPoints, remove })
 const emit = defineEmits(['event', 'complete'])
@@ -94,42 +89,10 @@ function addPoints(options) {
   //   },
   // })
 }
-function addLines() {
-  linesLayer = map.add('line', {
-    data: {
-      path: [
-        [0, 0],
-        [121.59751247938203, 29.835174764721145],
-      ],
-      text: 'test message',
-    },
-    labelKey: 'text',
-  })
-}
-function addPolygon() {
-  polygonLayer = map.add('polygon', {
-    data: {
-      path: [
-        [0, 0],
-        [121.59751247938203, 29.835174764721145],
-        [21.59751247938203, 0.835174764721145],
-        [0, 0],
-      ],
-      text: 'test message',
-    },
-  })
-}
 
 function remove(layer) {
   layer && map.remove(layer)
 }
-
-function removeLayers() {
-  map.remove(pointsLayer)
-  map.remove(linesLayer)
-  map.remove(polygonLayer)
-  boundary.remove()
-}
 </script>
 
 <style lang="stylus" scoped>

src/view/components/safety-info.vue

+<template>
+  <div class="safety-info">
+    <m-sub>安全排查信息</m-sub>
+    <m-form
+      :template="[
+        'stNameFrst:小区名称|sectAddr:项目地址',
+        'streetName:所属街道|wholeBuildingAddr:自然幢地址',
+        'houseType:房屋类型|judgeType:排查判断',
+        'floor:楼层|isThinPlate:小梁薄板>trueOrFalse',
+        'isEmergencyRisk:立即应急排险>trueOrFalse|acquisitionPerson:采集人',
+        'acquisitionTime:采集时间|otherRiskTypeDesc:其他隐患',
+        'riskTypeDesc:隐患类型',
+      ]"
+      :data="info"
+      :formatter="formatter"
+    />
+    <m-sub>配对项目信息</m-sub>
+    <m-form
+      :template="['stNameFrst:小区名称|sectAddr:项目地址', 'cspName:物业企业|']"
+      :data="info"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType } from 'vue'
+
+defineProps({
+  info: {
+    type: Object as PropType<{ [key: string]: unknown }>,
+    default: () => ({}),
+  },
+})
+const formatter = {
+  trueOrFalse: (val) => (val === true ? '是' : '否'),
+}
+</script>
+
+<style lang="stylus" scoped>
+.safety-info
+  >.my-sub
+    margin-top .1rem
+    font-size .12rem
+    padding-left .1rem
+    background-clip text
+    -webkit-background-clip text
+    -webkit-text-fill-color transparent
+    background-image linear-gradient(to bottom, #FFD1B2, #FF8635)
+</style>

src/view/edit-page.vue

@@ -34,14 +34,14 @@
         >
           <TrashBin />
         </n-icon>
-        <n-icon
+        <!-- <n-icon
           v-show="!!components[index]"
           class="btn config"
           size=".16rem"
           @click="onSetComponent(componentList[components[index]])"
         >
           <Settings />
-        </n-icon>
+        </n-icon> -->
       </div>
     </m-grid>
   </div>
@@ -181,11 +181,6 @@ bus.on('map', (e: any) => {
 
 const showSettingDrawer = ref(false)
 const model = ref<any>({})
-const mock = [
-  { icon: TrashBin, name: '小区', value: 904 },
-  { icon: TrashBin, name: '业委会', value: 400 },
-  { icon: TrashBin, name: '物业服务企业', value: 130 },
-]
 const curComponentName = ref('')
 const apiList = ref<{ key: string; value: string }[]>([])
 function onSetComponent({ name, title, baseUrl, apis }) {

src/view/view-page.vue

@@ -49,6 +49,12 @@
   <m-modal v-model="showCommunityDrawer" title="小区档案" width="70%">
     <CommunityInfo :info="communityDetail" />
   </m-modal>
+  <m-modal v-model="showElevatorDrawer" title="多层住宅电梯加装" width="70%">
+    <ElevatorInfo :info="elevatorDetail" />
+  </m-modal>
+  <m-modal v-model="showSafetyDrawer" title="房屋安全排查结果" width="70%">
+    <SafetyInfo :info="safetyDetail" />
+  </m-modal>
   <m-modal v-model="showSearchModal" title="搜索">
     <SearchView @select="onSelectCommunity" />
   </m-modal>
@@ -62,10 +68,11 @@ import { ajax, api } from '@/ajax'
 import { NSpace, NButton } from 'naive-ui'
 import SearchView from './components/search-view.vue'
 import CommunityInfo from './components/community-info.vue'
+import ElevatorInfo from './components/elevator-info.vue'
+import SafetyInfo from './components/safety-info.vue'
 import MapBtns from './components/map-btns.vue'
 import Map from './components/map.vue'
 import { bus } from '@/utils/component-list'
-import CommunityIcon from '@/assets/images/p2.png'
 import store from '@/store'
 import c1 from '@/assets/images/c1.png'
 import c2 from '@/assets/images/c2.png'
@@ -165,6 +172,7 @@ function handleMapBtnsEvents(key: string) {
       break
   }
 }
+
 let pointsLayer: any
 bus.on('addPoints', (data) => {
   addPoints(data)
@@ -183,6 +191,11 @@ function addPoints(data) {
 }
 
 const showCommunityDrawer = ref(false)
+const communityDetail = ref<{ [key: string]: any }>({})
+const showElevatorDrawer = ref(false)
+const elevatorDetail = ref<{ [key: string]: any }>({})
+const showSafetyDrawer = ref(false)
+const safetyDetail = ref<{ [key: string]: any }>({})
 
 const onMapClick = (data) => {
   if (!data.id) return
@@ -190,8 +203,6 @@ const onMapClick = (data) => {
   communityDetail.value = data
   showCommunityDrawer.value = true
 }
-
-const communityDetail = ref<{ [key: string]: any }>({})
 const onSelectCommunity = async (data: any) => {
   const { stKind } = data
   let icon = c6