Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/AirInfo.vue

@@ -94,8 +94,9 @@ export default {
         // console.log(props.data)
         data.detail = props.data
         // data.innerMonitorOptions.video-url = data.detail.internalMonitorUrl
-        data.innerVideoSrc = data.detail.internalMonitorUrl
-        data.outVideoSrc = data.detail.externalMonitorUrl
+        // data.innerVideoSrc = data.detail.internalMonitorUrl
+        data.innerVideoSrc = 'http://192.168.10.101:18000/flv/live/34020000001320000001_34020000001320000001_0200000001.flv'
+        data.outVideoSrc = 'http://192.168.10.101:18000/flv/live/34020000001320000001_34020000001320000001_0200000001.flv'
 
         getAirportInfo({
           airportId: data.detail.id
@@ -218,7 +219,7 @@ td{
   justify-content: space-around;
   .innerMonitor {
     position: relative;
-    width: 256px;
+    width: 275px;
     height: 198px;
     .monitorName {
       position: absolute;
@@ -238,5 +239,8 @@ td{
     }
   }
 }
+:deep(.vjs-live-display){
+  display:none !important;
+}
 </style>
 

src/views/dashboard/components/OneMap.vue

@@ -779,6 +779,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+*{
+  user-select: none;
+}
 .container {
   width: 100vw;
   height: 100vh;
@@ -808,12 +811,12 @@ export default {
 }
 
 .airport-overlay {
-  width: 530px;
+  width: 570px;
   height: 430px;
   background-color: rgba(0, 0, 0, 0.5);
 }
 .problem-overlay {
-  width: 530px;
+  width: 560px;
 
   background-color: rgba(0, 0, 0, 0.5);
 }