添加撒点图片

src/components/MyComponent/MyModal/my-modal.vue

@@ -177,7 +177,7 @@ export default defineComponent({
             transform translate(50%, 50%)
         .content
           // min-height 30vh
-          max-height 80vh
+          max-height 86vh
           overflow-y auto
           overflow-x hidden
           font-size 0.1rem

src/components/MyComponent/MySub/my-sub2.vue

@@ -126,6 +126,9 @@ export default defineComponent({
       display flex
       align-items center
       position relative
+      &:hover
+        .close-btn
+          display inline-block
       .search-bar
         display block
         width 0
@@ -153,6 +156,7 @@ export default defineComponent({
         &:hover
           transform scale(1.3) rotate(360deg)
       .close-btn
+        display none
         width .08rem
         height @width
         cursor pointer

src/view/right/beauty-home.vue

@@ -42,6 +42,20 @@
       />
     </div>
   </m-card>
+  <m-modal
+    v-model="showElevModal"
+    title="电梯加装"
+    width="8vw"
+    translate-y="4%"
+    offset="-44%"
+  >
+    <div class="elev-modal">
+      <div v-for="item in elevData" :key="item.id">
+        <p>{{ item.sectAddr }}</p>
+        <p>{{ item.cmtName }} | {{ item.sectName }}</p>
+      </div>
+    </div>
+  </m-modal>
 </template>
 
 <script lang="ts">
@@ -74,6 +88,8 @@ export default defineComponent({
     ])
     const elevList = computed(() => store.state.elevCount)
     const curCmtName = ref<string | null>(null)
+    const elevData = ref<any>([])
+    const showElevModal = ref(false)
     const handleSelect = async (name: string) => {
       curCmtName.value === name
         ? (curCmtName.value = null)
@@ -86,8 +102,11 @@ export default defineComponent({
           params: { cmtName: name, pageSize: 1000 },
         })
       ).data
+
       // TODO 可能要出列表或者地图撒点之类的
       console.log(`美丽街区-加装电梯-${name}区域电梯列表`, content)
+      elevData.value = content || []
+      showElevModal.value = true
     }
     const toiletSituation = ref<BriefProp[]>([
       { name: '已完成改造', value: 0, icon: icon35 },
@@ -111,6 +130,8 @@ export default defineComponent({
       situation,
       elevList,
       curCmtName,
+      elevData,
+      showElevModal,
       handleSelect,
       toiletSituation,
       workStationProjects,
@@ -162,4 +183,15 @@ export default defineComponent({
     .count
       font-size .12rem
       font-weight bold
+.elev-modal
+  height 84vh
+  overflow-y auto
+  >div
+    border-bottom .01rem solid rgba(176,216,255,.1)
+    padding .05rem 0
+    p
+      font-size .09rem
+      &:first-child
+        font-size .11rem
+        font-weight bold
 </style>

src/view/right/ecology.vue

@@ -86,7 +86,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed } from 'vue'
+import { defineComponent, ref, computed, nextTick } from 'vue'
 import img1 from '@/assets/images/img1.png'
 import img2 from '@/assets/images/img2.png'
 import img3 from '@/assets/images/img3.png'
@@ -138,9 +138,10 @@ export default defineComponent({
     const photos2 = computed(() =>
       photosList.value.filter((e) => e.buildingType.includes('文保'))
     )
-    const getPoints = (name: string) => {
+    const getPoints = async (name: string) => {
       store.dispatch('getEcologyPoints', name)
       // TODO 撒点
+      await nextTick()
       console.log(`生态—${name}点位信息：`, store.state.ecologyPoints)
     }
     return {
@@ -192,7 +193,7 @@ export default defineComponent({
       color #ccc
 .photos
   height .76rem
-  margin-bottom .02rem
+  margin-bottom .04rem
   overflow hidden
   .wrapper
     width 100%

src/view/right/police.vue

@@ -27,7 +27,7 @@
           <p
             v-for="(item, index) in safeMap"
             :key="item.cmtName"
-            :class="`${item.light ? 'show' : ''}`"
+            :class="{ show: index === curIndex }"
             @click="clickStreetName(item, index)"
           >
             <span>{{ item.cmtName }}</span>
@@ -48,6 +48,7 @@
       translate-y="100%"
       :mask-closable="false"
       :title="`${streetData.cmtName}2021年1季度得分`"
+      @close="curIndex = null"
     >
       <div>
         <m-form
@@ -90,7 +91,7 @@ export default defineComponent({
       () => store.state.pubulicSafeGateSenteryShehuiwuye
     ) // 门岗值守数据 - 社会物业
     const safeMap = computed(() => store.state.pubulicSafeMap) // 门岗值守数据 - 社会物业
-    const streetData = ref('')
+    const streetData = ref({})
 
     const sumList = computed(() => {
       return [
@@ -144,44 +145,12 @@ export default defineComponent({
       ],
     })
 
+    const curIndex = ref<number | null>(null)
     const clickStreetName = (item: any, index: number): void => {
-      console.log(item, index)
-      console.log(safeMap.value)
-      console.log(safeMap.value[index])
-      safeMap.value.forEach((item, index) => {
-        safeMap.value[index].light = false
-      })
-      safeMap.value[index].light = true
-      searchModal.value = !searchModal.value
+      curIndex.value = index
+      searchModal.value = true
       streetData.value = item
     }
-    // const houseSum = ref<SummaryProp[]>([
-    //   { name: '出入口', value: 165 },
-    //   { name: '已封闭', value: 165 },
-    //   { name: '有门岗处', value: 165 },
-    //   { name: '值守处', value: 165 },
-    // ])
-
-    // const mapList = ref([
-    //   { name: '龙泉', value: 92 },
-    //   { name: '厦门', value: 90 },
-    //   { name: '牛庄', value: 90 },
-    //   { name: '贵州', value: 92 },
-    //   { name: '长江', value: 92 },
-    //   { name: '云中', value: 92 },
-    //   { name: '小花园', value: 92 },
-    //   { name: '平望', value: 92 },
-    //   { name: '振兴', value: 90 },
-    //   { name: '新昌', value: 90 },
-    //   { name: '江阴', value: 90 },
-    //   { name: '顺天村', value: 92 },
-    //   { name: '新桥', value: 92 },
-    //   { name: '三德', value: 90 },
-    //   { name: '福海', value: 92 },
-    //   { name: '福瑞', value: 90 },
-    //   { name: '承兴', value: 92 },
-    //   { name: '定兴', value: 92 },
-    // ])
     return {
       avatar7,
       sumList,
@@ -194,6 +163,7 @@ export default defineComponent({
       searchModal,
       zggfList,
       shwyList,
+      curIndex,
       clickStreetName,
       newFind,
     }
@@ -229,11 +199,12 @@ export default defineComponent({
           margin-left 0.08rem
           font-size 0.12rem
           font-family $font-barlow
-      .show
-        span
-          color #FFD400
-        .count
-          color #FFD400
+        &.show,
+        &:hover
+          span
+            color #FFD400
+          .count
+            color #FFD400
     &:last-child
       $center()
       flex 1