3.28

src/components/TicketSource/index.vue

@@ -69,7 +69,7 @@
         legend: {
           show: true,
           x: 'center',
-          y: '64%',
+          y: 'bottom',
           itemHeight: fitChartSize(12),
           itemWidth: fitChartSize(12),
           itemGap: fitChartSize(6),

src/components/VideoDialog/index.vue

@@ -208,7 +208,6 @@
 	  background-size: 100% 100%;
 	}
 	.video-item__follow {
-	  
 	  // background-image: url('@/assets/images/unfollow.png');
 	}
   .dialog {
@@ -270,7 +269,7 @@
     }
     .video {
       width: vw(1814);
-      height: vw(980);
+      height: vw(950);
       object-fit: contain;
       background-color: #062b57;
     }

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

@@ -90,7 +90,7 @@
 
     <template v-if="scenicSpotId">
       <div class="detection-top">
-        <img
+       <!-- <img
           v-if="scenicSpotId == 'root000000'"
           class="map-img"
           src="@/assets/images/bdc.png"
@@ -102,7 +102,9 @@
           src="@/assets/images/sxzd.png"
           alt=""
         />
-        <img v-if="scenicSpotId == '龙桥河'" class="map-img" src="@/assets/images/lqh.jpg" alt="" />
+        <img v-if="scenicSpotId == '龙桥河'" class="map-img" src="@/assets/images/lqh.jpg" alt="" /> -->
+		<iframe v-if="scenicSpotId == 'root000000' || 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>
       </div>
       <div class="flex">
         <div class="monitor">

src/views/scenic/components/age.vue

@@ -132,6 +132,6 @@
 <style lang="scss" scoped>
   .age {
     width: vw(240);
-    height: vh(260);
+    height: vh(280);
   }
 </style>