Browse Source

Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

tags/v1.1.0^2^2
wangmengqi 1 year ago
parent
commit
d6d022a9fd
2 changed files with 12 additions and 5 deletions
  1. +7
    -3
      src/views/dashboard/components/AirInfo.vue
  2. +5
    -2
      src/views/dashboard/components/OneMap.vue

+ 7
- 3
src/views/dashboard/components/AirInfo.vue View File

// console.log(props.data) // console.log(props.data)
data.detail = props.data data.detail = props.data
// data.innerMonitorOptions.video-url = data.detail.internalMonitorUrl // 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({ getAirportInfo({
airportId: data.detail.id airportId: data.detail.id
justify-content: space-around; justify-content: space-around;
.innerMonitor { .innerMonitor {
position: relative; position: relative;
width: 256px;
width: 275px;
height: 198px; height: 198px;
.monitorName { .monitorName {
position: absolute; position: absolute;
} }
} }
} }
:deep(.vjs-live-display){
display:none !important;
}
</style> </style>



+ 5
- 2
src/views/dashboard/components/OneMap.vue View File

</script> </script>


<style lang="scss" scoped> <style lang="scss" scoped>
*{
user-select: none;
}
.container { .container {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
} }


.airport-overlay { .airport-overlay {
width: 530px;
width: 570px;
height: 430px; height: 430px;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
} }
.problem-overlay { .problem-overlay {
width: 530px;
width: 560px;


background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
} }

Loading…
Cancel
Save