lixuefeng/fengjie-datascreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.15

Browse Source
This commit is contained in:
duanliang
2025-04-15 17:48:25 +08:00
parent 44e612361c
commit d7eeea3efe
6 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/HlsPlayer/index.vue
View File

@@ -75,6 +75,7 @@
immediate: true
},
url(newUrl) {
console.log(newUrl,'77777777777777777777777777777777')
if (newUrl && this.isActive) {
this.initializePlayer()
}

4
src/layout/components/CoreVideo/index.vue
View File

@@ -23,6 +23,7 @@
muted
autoplay
:controls="false"
:src="item.hlsUrl"
controlsList="nodownload"
>
<source src="" type="application/x-mpegURL" />
@@ -83,7 +84,7 @@ let isCollect = ref(0)
postVideoRemainApi({
cameraIndexCode: list.value.map((item) => item.cameraIndexCode)
})
}, 5000)
}, 4000)
}
const getPreviewUrl = async (code) => {
@@ -100,7 +101,6 @@ let isCollect = ref(0)
pageSize: 5
})
list.value = res.data
console.log(list.value,'ddsdsdsfdd')
if(list.value.length){
postVideoRemain()
}else{

2
src/utils/config.js
View File

@@ -4,7 +4,7 @@ export const proBaseUrl = 'http://192.168.77.200'
export const socketBaseUrl = 'ws://192.168.77.209:81/fjtcc-api'
export const proSocketBaseUrl = 'ws://192.168.77.200:8060'
export const mode = 'dev' // 测试 dev 正式 pro
export const mode = 'pro' // 测试 dev 正式 pro
export const devToken =
'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImE1OWFmNWYwLTU3OWItNDJkNy1hZDJhLTY0Y2JlODA5ZWI1NiJ9.BTxvu6jUWbN0qONWf5K6VzXopE8T8qXzKuX-mij21VJT4U0LdgnqToyqeNDQ2OyJ6cvpdJBzQ9mEEb-dnwrTpQ'

7
src/views/home/components/box-1.vue
View File

@@ -69,7 +69,7 @@
</div>
<div class="ticket-box">
<Title2 @changClick="CheckClick" :type="2" title="景区购票" />
<Title2 @changClick="CheckClick" title="景区购票" />
<!-- <div class="select-box">
<Select
@@ -81,7 +81,7 @@
</div> -->
<div class="ticket-wrap">
<img src="@/assets/images/ticket.png" />
<div v-for="(item, index) in countList" :key="index">
<div v-for="(item, index) in homeStore.scenicData.data" :key="index">
<span class="label">{{ item.name }}：</span>
<countup :end-val="item.value" />
</div>
@@ -170,7 +170,8 @@
return homeStore.scenicQueueData.dataList.map((item) => item.name)
})
onMounted(()=>{
countList.value = homeStore.scenicData.data;
// countList.value = homeStore.scenicData.data;
// console.log(homeStore.scenicData.data,'homeStore.scenicData.data')
})
</script>

18
src/views/scenic/components/box-1.vue
View File

@@ -20,6 +20,7 @@
</div>
</div>
<div class="main">
<!-- <div @click="hanldeToDetails" class="look-btn">查看详情</div> -->
<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>
@@ -125,6 +126,9 @@
const handleMore = () => {
router.push('/workOrder')
}
const hanldeToDetails = ()=>{
router.push('/traffic')
}
let src = ref('')
let cameraIndexCode = ref('')
let videoShow = ref(false)
@@ -235,6 +239,20 @@
height: vh(600);
overflow-x: auto;
overflow-y: hidden;
position:relative;
.look-btn{
position: absolute;
right: vw(20);
top: 50%;
transform: translateY(-50%);
padding: vw(12);
display: flex;
align-items: center;
background: #0a4190;
border-radius: vw(4);
font-size: vw(14);
color: #fff;
}
.scenic-box {
width: 100%;
height: 100%;

18
src/views/vehicles/components/big-map.vue
View File

@@ -209,14 +209,28 @@ import PubSub from 'pubsub-js'
console.log(item,'item')
if (item.lng && item.lat) {
if (item.status == '行驶') {
if(item.type==0){
addMarker(carIcon, [item.lng, item.lat], [36, 50])
}else{
addMarker(shipIcon, [item.lng, item.lat], [36, 50])
}
}
if (item.status == '离线') {
if(item.type==0){
addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50])
}else{
addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50])
}
}
if (item.status == '静止') {
if(item.type==0){
addMarker(carStopIcon, [item.lng, item.lat], [36, 50])
}else{
addMarker(shipStopIcon, [item.lng, item.lat], [36, 50])
}
}
marker.value.addEventListener('click', (e) => {
e.sim = e.target.sim
currentMarker.value = carOverlays.value.find(
@@ -497,7 +511,7 @@ import PubSub from 'pubsub-js'
display: none;
}
.dialog {
width: vw(3140);
width: vw(3170);
padding: vw(8);
background-image: url('@/assets/images/dialog-bg.png') !important;
background-size: 100% 100%;
@@ -505,7 +519,7 @@ import PubSub from 'pubsub-js'
height:vh(930);
margin-top:vh(130);
:deep(.el-dialog) {
width: vw(3140);
width: vw(3170);
padding: vw(8);
background-image: url('@/assets/images/dialog-bg.png') !important;
background-size: 100% 100%;