feat:完善功能

src/views/scenic/components/box-1.vue

@@ -23,6 +23,7 @@
       <img v-if="scenicSpotId == 'root000000'" src="@/assets/images/bdc.png" alt="" />
       <img v-if="scenicSpotId == '三峡之巅'" src="@/assets/images/sxzd.png" alt="" />
       <img v-if="scenicSpotId == '龙桥河'" src="@/assets/images/lqh.jpg" alt="" />
+      <!-- <div class="scenic-box" id="scenic-map"></div> -->
     </div>
     <div class="footer">
       <div class="flex">
@@ -101,11 +102,18 @@
 <script setup>
   import countup from 'vue-countup-v3'
   import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
-  import { useScenicStore } from '@/stores/scenic'
+
   import { useRouter } from 'vue-router'
 
+  import { useScenicStore } from '@/stores/scenic'
+
+  import { useMap } from '@/hooks/map'
+
+  import sxzd from '@/assets/images/sxzd.png'
+
   const router = useRouter()
   const scenicStore = useScenicStore()
+  const { initMap, addMarker, map, marker } = useMap()
 
   let props = defineProps({
     scenicSpotId: {
@@ -114,9 +122,34 @@
     }
   })
 
+  let scenicChange = null
   const handleMore = () => {
     router.push('/workOrder')
   }
+
+  // onMounted(() => {
+  //   scenicChange = PubSub.subscribe('scenicChange', (msg, data) => {
+  //     initMap('scenic-map', data.lng, data.lat, 15)
+  //     map.value.setDisplayOptions({
+  //       poiText: false, // 隐藏poi标注
+  //       poiIcon: false, // 隐藏poi图标
+  //       building: false // 隐藏楼块
+  //     })
+  //     var bounds = new BMapGL.Bounds(
+  //       new BMapGL.Point(109.604998,31.030391),
+  //       new BMapGL.Point(109.624833,31.044965)
+  //     )
+  //     var imgOverlay = new BMapGL.GroundOverlay(bounds, {
+  //       type: 'image',
+  //       url: sxzd,
+  //       opacity: 1
+  //     })
+  //     map.value.addOverlay(imgOverlay)
+  //   })
+  // })
+  // onUnmounted(() => {
+  //   PubSub.unsubscribe(scenicChange)
+  // })
 </script>
 
 <style scoped lang="scss">
@@ -189,6 +222,10 @@
       height: vh(600);
       overflow-x: auto;
       overflow-y: hidden;
+      .scenic-box {
+        width: 100%;
+        height: 100%;
+      }
       /* 滚动条整体样式 */
       &::-webkit-scrollbar {
         height: vh(10); /* 滚动条的宽度 */

src/views/sentiment/components/area.vue

@@ -17,41 +17,43 @@
   let options = ref([])
   const initChart = async () => {
     let res = await getAreaApi(params)
-    if (option) {
+    if (res.data.length > 0) {
-      option.series[0].data = res.data
+      if (option) {
-    } else {
+        option.series[0].data = res.data
-      option = {
+      } else {
-        legend: {
+        option = {
-          top: '10%',
+          legend: {
-          itemWidth: fitChartSize(20),
+            top: '10%',
-          itemHeight: fitChartSize(20),
+            itemWidth: fitChartSize(20),
-          textStyle: {
+            itemHeight: fitChartSize(20),
-            color: '#fff',
+            textStyle: {
-            fontSize: fitChartSize(20)
+              color: '#fff',
-          }
+              fontSize: fitChartSize(20)
-        },
+            }
-        series: [
+          },
-          {
+          series: [
-            name: '',
+            {
-            type: 'pie',
+              name: '',
-            radius: ['30%', '60%'],
+              type: 'pie',
-            center: ['50%', '56%'],
+              radius: ['30%', '60%'],
-            roseType: 'area',
+              center: ['50%', '56%'],
-            labelLine: {
+              roseType: 'area',
-              normal: {
+              labelLine: {
-                show: true,
+                normal: {
-                length: 1
+                  show: true,
-              }
+                  length: 1
-            },
+                }
-            itemStyle: {
+              },
-              borderRadius: fitChartSize(10)
+              itemStyle: {
-            },
+                borderRadius: fitChartSize(10)
-            data: res.data
+              },
-          }
+              data: res.data
-        ]
+            }
+          ]
+        }
       }
+      setOption(option)
     }
-    setOption(option)
   }
   const getStop = async () => {
     let res = await getSpotApi()