4.22

src/views/scenic/components/big-map.vue

@@ -167,8 +167,8 @@ let tabsIndex = ref(0)
 		if(val[0].map){
 			tabs.value[0].leng = val[0].all.length
 			tabs.value[1].leng = val[0].moving.length
-			tabs.value[2].leng = val[0].offline.length
-			tabs.value[3].leng = val[0].still.length
+			tabs.value[2].leng = val[0].still.length
+			tabs.value[3].leng = val[0].offline.length
 		}
 		if(val[1]==0){
 			listTabs.value = val[0].all
@@ -177,10 +177,10 @@ let tabsIndex = ref(0)
 			listTabs.value = val[0].moving
 		}
 		if(val[1]==2){
-			listTabs.value = val[0].offline
+			listTabs.value = val[0].still
 		}
 		if(val[1]==3){
-			listTabs.value = val[0].still
+			listTabs.value = val[0].offline
 		}
 		return false
    

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

@@ -20,7 +20,9 @@
       </div>
     </div>
     <div class="main">
-		<div @click="hanldeToDetails" class="look-btn">查看详情</div>
+		<a @click="hanldeToDetails"  class="look-btn">
+			<img src="@/assets/images/d-ico-1.png" />
+		</a>
       <iframe v-if="scenicSpotId == 'root000000'" width="100%" height="100%" src="/map/sxzd/bdc.html"></iframe>
       <iframe v-if="scenicSpotId == 'root00000000'" width="100%" height="100%" src="/map/sxzd/sxzd.html"></iframe>
       <iframe v-if="scenicSpotId == '龙桥河'" width="100%" height="100%" src="/map/lqh/lqh.html"></iframe>
@@ -152,7 +154,6 @@ import pubSub from 'pubsub-js'
   onMounted(() => {
     scenicChange = PubSub.subscribe('scenicChange', (msg, data) => {
 		hrefItem.value = data
-		console.log(data,'llllllllllllllllllllllllllllllll')
       // initMap('scenic-map', data.lng, data.lat, 15)
       // map.value.setDisplayOptions({
       //   poiText: false, // 隐藏poi标注
@@ -248,18 +249,23 @@ import pubSub from 'pubsub-js'
       overflow-y: hidden;
 	  position:relative;
 	  .look-btn{
+		  cursor: pointer;
 		  position: absolute;
 		  right: vw(20);
-		  top: 10%;
+		  top: 6%;
 		  transform: translateY(-50%);
 		  padding: vw(12);
 		  display: flex;
 		  align-items: center;
-		  background: #0a4190;
+		  // background: #0a4190;
 		  border-radius: vw(4);
 		  font-size: vw(14);
 		  color: #fff;
 		  z-index: 999;
+		  img{
+			  width:vw(100);
+			  // height:;
+		  }
 	  }
       .scenic-box {
         width: 100%;

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

@@ -101,22 +101,20 @@
             <div class="pt-10">
               <Title3 title="车辆归属地占比" />
             </div>
-            <div v-if="dataLists.length">
-              <PieRow
-                label="停车总数"
-                :dataList="dataLists"
-                :total="carTotal"
-                :width="360"
-                :height="300"
-              />
-            </div>
-            <div class="null-box" v-else> 暂无数据 </div>
+            <PieRow
+              label="停车总数"
+              :dataList="dataLists"
+              :total="carTotal"
+              :width="360"
+              :height="300"
+            />
+            
           </div>
         </div>
       </div>
       <div class="box-2">
         <Title1 title="异常信息 " />
-        <div @click="handleToWorkOrder" class="count-box flex">
+        <div @click="handleToWorkOrder" style="cursor: pointer;" class="count-box flex">
           <count-item
             v-for="item in headList"
             :label="item.name"
@@ -166,14 +164,16 @@
               :height="300"
               sub-title="拥堵频次总数"
               :list="scenicStore.trafficData.data.countRate"
+			  :text="'暂无拥堵'"
             />
           </div>
           <div class="border">
             <Title3 title="拥堵时长占比" />
             <jam
+			 :text="'暂无拥堵'"
               :width="220"
               :height="300"
-              sub-title="拥堵总时长"
+              sub-title="拥堵总时长(分钟)"
               :list="scenicStore.trafficData.data.timeRate"
             />
           </div>
@@ -502,6 +502,7 @@
   .look-box {
     position: relative;
     .look-btn {
+	  cursor: pointer;
       position: absolute;
       right: vw(20);
       top: 50%;

src/views/scenic/components/jam.vue

@@ -1,11 +1,16 @@
 <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)
+  	  }"
+  	/>
+  	<div v-if="condShow==0" class="nYong-du">加载中...</div>
+  	<div v-if="condShow==1" class="nYong-du">{{text}}</div>
+  </div>
 </template>
 
 <script setup>
@@ -33,16 +38,26 @@
     subTitle: {
       type: [String, Number],
       default: () => ''
-    }
+    },
+	text:{
+		type: String,
+		default: '暂无数据'
+	}
   })
 
   const { id, setOption } = useEchart()
-
+	let condShow = ref(0)
+	let aIndex = 1
   watch(
     () => props.list,
-    () => {
+    (val) => {
+		aIndex+=1
+		if(aIndex>=3&&!val.length){
+		   condShow.value = 1
+		}
       if (props.list.length > 0) {
         setTimeout(() => {
+			condShow.value = 2
           init()
         }, 1000)
       }
@@ -139,4 +154,19 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<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;
+	}
+</style>