From cc43098ca717e1197d57cc2d8a5e55f28f76a450 Mon Sep 17 00:00:00 2001
From: duanliang <duanliang>
Date: Wed, 23 Apr 2025 02:00:16 +0800
Subject: [PATCH] 422

---
 src/components/Line/index.vue                |  7 +--
 src/components/PieRow/index.vue              | 13 +++--
 src/components/RegionTop/index.vue           | 51 +++++++++++++++-----
 src/components/TicketSource/index.vue        |  6 ++-
 src/hooks/echart.js                          | 10 +++-
 src/views/home/components/box-3.vue          |  2 +-
 src/views/home/components/jam-count.vue      |  7 ++-
 src/views/home/components/jam-duration.vue   |  4 +-
 src/views/scenic/components/big-map.vue      |  4 +-
 src/views/scenic/components/jam.vue          |  3 +-
 src/views/scenic/components/traffic-flow.vue | 36 ++++++++++++--
 src/views/vehicles/components/big-map.vue    |  4 +-
 12 files changed, 114 insertions(+), 33 deletions(-)

diff --git a/src/components/Line/index.vue b/src/components/Line/index.vue
index d592bcf..11f3cc1 100644
--- a/src/components/Line/index.vue
+++ b/src/components/Line/index.vue
@@ -4,7 +4,8 @@
 		  :id="id"
 		  :style="{
 		    width: styleUtil.px2vw(width),
-		    height: styleUtil.px2vh(height)
+		    height: styleUtil.px2vh(height),
+			opacity:data.length?1:0,
 		  }"
 		/>
 		<div v-if="condShow==0" class="nYong-du">加载中...</div>
@@ -172,7 +173,7 @@
     [() => props.data, () => props.xAxisData],
     (val) => {
 	  aIndex+=1
-	  if(aIndex>=3&&!val[0].length){
+	  if(aIndex>=3&&!val[0][0].data.length){
 		  condShow.value = 1
 	  }
       if (val[0].length > 0 && val[1].length > 0) {
@@ -181,7 +182,7 @@
           init()
         }, 1000)
       }else{
-		  
+		  // condShow.value = 1
 	  }
     },
     { immediate: true }
diff --git a/src/components/PieRow/index.vue b/src/components/PieRow/index.vue
index f24e456..7487e30 100644
--- a/src/components/PieRow/index.vue
+++ b/src/components/PieRow/index.vue
@@ -4,7 +4,8 @@
 		  :id="id"
 		  :style="{
 		    width: styleUtil.px2vw(width),
-		    height: styleUtil.px2vh(height)
+		    height: styleUtil.px2vh(height),
+			opacity:dataList.length?1:0,
 		  }"
 		/>
 		<div v-if="condShow==0" class="nYong-du">加载中...</div>
@@ -47,7 +48,7 @@
     }
   })
 
-  const { id, setOption } = useEchart()
+  const { id, setOption,chartVal,dispose ,clearOption} = useEchart()
 
   var colorList = ['#FDC40A', '#FF5232', '#50F0A6', '#5FDFFA']
 
@@ -106,6 +107,7 @@
   watch(
     () => props.dataList,
     (newVal) => {
+		console.log(chartVal.value,newVal,'newValnewValnewValnewValnewVal')
 		aIndex+=1
 		if(aIndex>=3&&!newVal.length){
 			  condShow.value = 1
@@ -125,8 +127,12 @@
             ...defaultCofig,
             ...props.config
           })
+		  
         })
-      }
+      }else{
+		
+		 
+	  }
     },
     { immediate: true }
   )
@@ -146,5 +152,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
+	
 	}
 </style>
diff --git a/src/components/RegionTop/index.vue b/src/components/RegionTop/index.vue
index c9cf03b..93aee20 100644
--- a/src/components/RegionTop/index.vue
+++ b/src/components/RegionTop/index.vue
@@ -1,12 +1,18 @@
 <!-- 客源地分析TOP5 -->
 <template>
-  <div
-    :id="id"
-    :style="{
-      width: styleUtil.px2vw(width),
-      height: styleUtil.px2vh(height)
-    }"
-  />
+
+  <div style="position:relative;">
+  	<div
+  	  :id="id"
+  	  :style="{
+  	    width: styleUtil.px2vw(width),
+  	    height: styleUtil.px2vh(height),
+		opacity:list.length?1:0,
+  	  }"
+  	/>
+  	<div v-if="condShow==0" class="nYong-du">加载中...</div>
+  	<div v-if="condShow==1" class="nYong-du">暂无数据</div>
+  </div>
 </template>
 
 <script setup>
@@ -31,13 +37,21 @@
 
   const { id, setOption } = useEchart()
   let params = null
-
+	let condShow = ref(0)
+	let aIndex = 1
   watch(
     () => props.list,
-    () => {
-      setTimeout(() => {
-        init()
-      }, 1000)
+    (val) => {
+		aIndex+=1
+		if(aIndex>=3&&!val.length){
+			  condShow.value = 1
+		}
+	   if (val.length > 0) {
+		   setTimeout(() => {
+			 init()
+		   }, 1000)
+	   }
+
     },
     {
       immediate: true
@@ -165,6 +179,19 @@
 </script>
 
 <style scoped lang="scss">
+	.nYong-du{
+		position:absolute;
+		left:0;
+		top:0;
+		width: 100%;
+		height: 100%;
+		font-size:vw(18);
+		// color:#999;
+		color:#02f9fa;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
   .top {
     width: vw(250);
     height: vh(366);
diff --git a/src/components/TicketSource/index.vue b/src/components/TicketSource/index.vue
index 9572023..21e949f 100644
--- a/src/components/TicketSource/index.vue
+++ b/src/components/TicketSource/index.vue
@@ -6,7 +6,8 @@
   	  :id="id"
   	  :style="{
   	    width: styleUtil.px2vw(width),
-  	    height: styleUtil.px2vh(height)
+  	    height: styleUtil.px2vh(height),
+		opacity:list.length?1:0,
   	  }"
   	/>
   	<div v-if="condShow==0" class="nYong-du">加载中...</div>
@@ -42,7 +43,8 @@
   watch(
     () => props.list,
     (val) => {
-		if(aIndex>=3&&!newVal.length){
+		aIndex+=1
+		if(aIndex>=3&&!val.length){
 			  condShow.value = 1
 		}
       if (val.length > 0) {
diff --git a/src/hooks/echart.js b/src/hooks/echart.js
index 6dae2a8..342fe12 100644
--- a/src/hooks/echart.js
+++ b/src/hooks/echart.js
@@ -4,14 +4,22 @@ import { guid } from '@/utils/util'
 
 export function useEchart() {
   let chart = null
+  let chartVal = ref(null)
   let id = ref(guid())
   const initChart = () => {
     const dom = document.getElementById(id.value)
     chart = echarts.init(dom)
+	chartVal.value = chart
   }
   const setOption = (params, update = false) => {
     chart.setOption(params, update)
   }
+  const clearOption = () => {
+	   // 将series设置为空数组，可以清空图表内容
+    chart.setOption({
+		series:[]
+	})
+  }
   const dispose = () => {
     chart.dispose()
     chart = null
@@ -25,5 +33,5 @@ export function useEchart() {
     window.addEventListener('resize', resize)
   })
 
-  return { id, chart, setOption, dispose, initChart }
+  return { id, chart, setOption, dispose, initChart,chartVal,clearOption }
 }
diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue
index bdb2128..4c8462e 100644
--- a/src/views/home/components/box-3.vue
+++ b/src/views/home/components/box-3.vue
@@ -27,7 +27,7 @@
         <img class="icon" src="@/assets/images/icon-4.png" alt="" />
         <div>
           <countup :end-val="homeStore.trafficInfoData.info.zdydsc" />
-          <div class="label">最大拥堵时长 </div>
+          <div class="label">最大拥堵时长(分钟) </div>
         </div>
       </div>
     </div>
diff --git a/src/views/home/components/jam-count.vue b/src/views/home/components/jam-count.vue
index a769843..cf31343 100644
--- a/src/views/home/components/jam-count.vue
+++ b/src/views/home/components/jam-count.vue
@@ -1,7 +1,9 @@
 <!-- 拥堵次数占比 -->
 <template>
 	<div style="position: relative;">
-		<div class="jam-count" :id="id" />
+		<div class="jam-count" :style="{
+			opacity:list.length?1:0,
+		}" :id="id" />
 		<div v-if="condShow==0" class="nYong-du">加载中...</div>
 		<div v-if="condShow==1" class="nYong-du">{{text}}</div>
 	</div>
@@ -81,7 +83,8 @@
           itemGap: fitChartSize(6),
           formatter: (name) => {
             let obj = props.list.find((item) => item.name == name)
-            return '{name|' + name + '} {value|' + obj?.count + '}{value|%}'
+			console.log(obj,'5555555555555555555')
+            return '{name|' + name + '} {value|' + obj?.value + '}{value|%}'
           },
           textStyle: {
             rich: {
diff --git a/src/views/home/components/jam-duration.vue b/src/views/home/components/jam-duration.vue
index 3e54199..2b451fb 100644
--- a/src/views/home/components/jam-duration.vue
+++ b/src/views/home/components/jam-duration.vue
@@ -1,7 +1,9 @@
 <template>
   <!-- 拥堵时长 -->
   <div style="position:relative;">
-	  <div  class="jam" :id="id" />
+	  <div  class="jam" :style="{
+			opacity:list.length?1:0,
+		}" :id="id" />
 	  <div v-if="condShow==0" class="nYong-du">加载中...</div>
 	  <div v-if="condShow==1" class="nYong-du">{{text}}</div>
   </div>
diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue
index 7c59a04..6fcf472 100644
--- a/src/views/scenic/components/big-map.vue
+++ b/src/views/scenic/components/big-map.vue
@@ -131,8 +131,8 @@
       number: 0
     },
     {
-      label: '行驶',
-      value: '行驶',
+      label: '运行',
+      value: '运行',
       number: 0
     },
     {
diff --git a/src/views/scenic/components/jam.vue b/src/views/scenic/components/jam.vue
index d9dc659..4b44f7d 100644
--- a/src/views/scenic/components/jam.vue
+++ b/src/views/scenic/components/jam.vue
@@ -5,7 +5,8 @@
   	  :id="id"
   	  :style="{
   	    width: styleUtil.px2vw(width),
-  	    height: styleUtil.px2vh(height)
+  	    height: styleUtil.px2vh(height),
+		opacity:list.length?1:0,
   	  }"
   	/>
   	<div v-if="condShow==0" class="nYong-du">加载中...</div>
diff --git a/src/views/scenic/components/traffic-flow.vue b/src/views/scenic/components/traffic-flow.vue
index 21785f0..20b7f6d 100644
--- a/src/views/scenic/components/traffic-flow.vue
+++ b/src/views/scenic/components/traffic-flow.vue
@@ -1,6 +1,13 @@
 <!-- 交通负载 -->
 <template>
-  <div class="traffic-flow" :id="id" />
+  
+  <div style="position: relative;">
+  	<div class="traffic-flow" :style="{
+			opacity:list.length?1:0,
+		}" :id="id" />
+  	<div v-if="condShow==0" class="nYong-du">加载中...</div>
+  	<div v-if="condShow==1" class="nYong-du">{{text}}</div>
+  </div>
 </template>
 
 <script setup>
@@ -13,14 +20,24 @@
     list: {
       type: Array,
       default: () => []
-    }
+    },
+	text:{
+		type: String,
+		default: '暂无数据'
+	}
   })
-
+  let condShow = ref(0)
+  let aIndex = 1
   watch(
     () => props.list,
     (val) => {
+		aIndex+=1
+		if(aIndex>=3&&!val.length){
+		   condShow.value = 1
+		}
       if (val.length) {
         setTimeout(() => {
+			condShow.value = 2
           init()
         }, 1000)
       }
@@ -126,6 +143,19 @@
 </script>
 
 <style scoped lang="scss">
+	.nYong-du{
+		position:absolute;
+		left:0;
+		top:0;
+		width: 100%;
+		height: 100%;
+		font-size:vw(18);
+		// color:#999;
+		color:#02f9fa;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
   .traffic-flow {
     width: vw(260);
     height: vh(300);
diff --git a/src/views/vehicles/components/big-map.vue b/src/views/vehicles/components/big-map.vue
index 00d6657..645cb30 100644
--- a/src/views/vehicles/components/big-map.vue
+++ b/src/views/vehicles/components/big-map.vue
@@ -133,8 +133,8 @@ import PubSub from 'pubsub-js'
       number: 0
     },
     {
-      label: '行驶',
-      value: '行驶',
+      label: '运行',
+      value: '运行',
       number: 0
     },
     {