From 16b9d8e3c77bb58e99702b3bee7a3e8ee6d12981 Mon Sep 17 00:00:00 2001
From: duanliang <duanliang>
Date: Wed, 2 Apr 2025 23:45:00 +0800
Subject: [PATCH] 4.2

---
 src/stores/scenic.js                    |  2 +-
 src/views/scenic/components/age.vue     | 20 ++++++++
 src/views/scenic/components/big-map.vue |  2 +-
 src/views/scenic/components/box-2.vue   | 68 ++++++++++++++++++++-----
 src/views/scenic/index.vue              |  4 +-
 5 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/src/stores/scenic.js b/src/stores/scenic.js
index c2a75ab..570c9ba 100644
--- a/src/stores/scenic.js
+++ b/src/stores/scenic.js
@@ -102,7 +102,7 @@ export const useScenicStore = defineStore('scenic', () => {
     secureData.value = val
   }
   const setStopCarData = (val) => {
-    stopCarData.value = val
+	  stopCarData.value = val
   }
   const setScenicBearData = (val) => {
     scenicBearData.value = val
diff --git a/src/views/scenic/components/age.vue b/src/views/scenic/components/age.vue
index f5be94f..28e1202 100644
--- a/src/views/scenic/components/age.vue
+++ b/src/views/scenic/components/age.vue
@@ -58,6 +58,26 @@
             }
           }
         },
+		polar: {
+		  center: ['50%', '40%']
+		},
+		angleAxis: {
+		  max: 100,
+		  show: false
+		},
+		radiusAxis: {
+		  type: 'category',
+		  show: true,
+		  axisLabel: {
+		    show: false
+		  },
+		  axisLine: {
+		    show: false
+		  },
+		  axisTick: {
+		    show: false
+		  }
+		},
         series: [
           {
             type: 'pie',
diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue
index 4a42d80..80b1409 100644
--- a/src/views/scenic/components/big-map.vue
+++ b/src/views/scenic/components/big-map.vue
@@ -366,7 +366,7 @@
 
   onMounted(() => {
     scenicChange = PubSub.subscribe('scenicChange', (msg, data) => {
-		console.log(data,'99999999999999999999999999999999999999')
+		// console.log(data,'99999999999999999999999999999999999999')
       scenicSpotId.value = data.scenicSpotId
       lat.value = data.lat
       lng.value = data.lng
diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue
index 40db316..13e8632 100644
--- a/src/views/scenic/components/box-2.vue
+++ b/src/views/scenic/components/box-2.vue
@@ -101,13 +101,19 @@
             <div class="pt-10">
               <Title3 title="车辆归属地占比" />
             </div>
-            <PieRow
-              label="停车总数"
-              :dataList="scenicStore.stopCarData.dataLists"
-              :total="carTotal"
-              :width="360"
-              :height="300"
-            />
+			<div v-if="dataLists.length">
+				<PieRow
+				  label="停车总数"
+				  :dataList="dataLists"
+				  :total="carTotal"
+				  :width="360"
+				  :height="300"
+				/>
+			</div>
+			<div class="null-box" v-else>
+				暂无数据
+			</div>
+           
           </div>
         </div>
       </div>
@@ -115,7 +121,7 @@
         <Title1 title="异常信息 " />
         <div @click="handleToWorkOrder" class="count-box flex">
           <count-item
-            v-for="item in scenicStore.secureData.headList"
+            v-for="item in headList"
             :label="item.name"
             :count="item.count"
             :type="item.type"
@@ -339,11 +345,11 @@
   let latitude = ref('')
   let longitude = ref('')
   const hanldeLookMap = ()=>{
-	  router.replace('/traffic')
+	  router.push('/traffic')
 	  // traMapShow.value = true
   }
   const handleToWorkOrder = ()=>{
-	  router.replace('/workOrder')
+	  router.push('/workOrder')
   }
   const garageList = computed(() => {
     return scenicStore.stopCarData.headList
@@ -354,9 +360,11 @@
       return pre + cur.count
     }, 0)
   })
-
+  const stopCarDataLists = computed(()=>{
+	  return scenicStore.stopCarData.dataLists
+  })
   const carTotal = computed(() => {
-    return scenicStore.stopCarData.dataLists.reduce((pre, cur) => {
+    return dataLists.value.reduce((pre, cur) => {
       return pre + parseInt(cur.count)
     }, 0)
   })
@@ -381,7 +389,31 @@
   const scenicQueueXAxisData = computed(() => {
     return scenicStore.scenicQueueData.dataList.map((item) => item.name)
   })
-
+  let dataLists = ref([])
+  watch(
+	()=>scenicStore.stopCarData.dataLists,
+	(val) =>{
+		console.log(val.length,'watch 监听')
+		if(val.length){
+			dataLists.value = val
+		}else{
+			dataLists.value = []
+		}
+	},
+	{ immediate: true }
+  )
+  let headList = ref([])
+  watch(
+  	()=>scenicStore.secureData.headList,
+  	(val) =>{
+  		if(val.length){
+  			headList.value = scenicStore.secureData.headList
+  		}else{
+  			headList.value = []
+  		}
+  	},
+  	{ immediate: true }
+  )
   watch(
     () => scenicStore.carShipData,
     (val) => {
@@ -465,6 +497,16 @@
 </script>
 
 <style scoped lang="scss">
+	.null-box{
+		width:vw(360);
+		height:vh(300);
+		display:flex;
+		align-items:center;
+		color:#fff;
+		text-align:center;
+		font-size:vw(20);
+		justify-content: center;
+	}
 	.look-box{
 		position:relative;
 		.look-btn{
diff --git a/src/views/scenic/index.vue b/src/views/scenic/index.vue
index d0c55f4..f274b7b 100644
--- a/src/views/scenic/index.vue
+++ b/src/views/scenic/index.vue
@@ -38,7 +38,7 @@
     () => dataRes.value,
     (val) => {
       if (val) {
-        console.log(val, '=====')
+        // console.log(val.type, '=====')
         switch (val.type) {
           case 'wordkOrderlist':
             scenicStore.setWordkOrderList(val.data)
@@ -56,7 +56,7 @@
             scenicStore.setScenicBearData(val)
             break
           case 'stopCarData':
-		  console.log(val,'valvalvalvalvalvalval')
+			console.log(val,'valvalvalvalvalvalval')
             scenicStore.setStopCarData(val)
             break
           case 'secureData':