diff --git a/src/stores/scenic.js b/src/stores/scenic.js index 218a3b6..a42e50f 100644 --- a/src/stores/scenic.js +++ b/src/stores/scenic.js @@ -7,11 +7,11 @@ export const useScenicStore = defineStore('scenic', () => { // 门票销售数据 let scenicSpotData = ref({ data: [ - { name: '预定今日票', value: 0 }, + { name: '预订今日票', value: 0 }, { name: '今日购票数', value: 0 }, - - // { name: '购三天后票数', value: 0 } + { name: '预订未来三天票数', value: 0 }, + { name: '预订未来十五天票数', value: 0 } ], infoList: [ { name: '游玩舒适度', type: 0, value: '空闲' }, @@ -21,7 +21,7 @@ export const useScenicStore = defineStore('scenic', () => { ] }) // 景区排队信息 - let scenicQueueData = ref({ dataList: [], header: { jrcp: 0, jrjdrs: 0,jrjdcy:0, pdcxsj: 0, pdrs: 0 } }) + let scenicQueueData = ref({ dataList: [], header: { jrcp: 0, jrjdrs: 0,jrjdcy:0, pdcxsj: 0, pdrs: 0,pdrs_type:0 } }) // 景区负载信息 let scenicBearData = ref({ dataList: [], header: { jqRate: 0, jqzdcz: 0, jrjdrs: 0 } }) // 景区停车信息 diff --git a/src/views/home/components/allList.vue b/src/views/home/components/allList.vue index 37ec085..49e9191 100644 --- a/src/views/home/components/allList.vue +++ b/src/views/home/components/allList.vue @@ -15,15 +15,15 @@ :key="index" @click="handleItem(item)" > -
取消关注
-
关注
- + @@ -43,8 +43,8 @@ /> - - + + @@ -58,7 +58,7 @@ import Hls from 'hls.js' import pubSub from 'pubsub-js' - + let props = defineProps({ events: { type: Object, @@ -76,7 +76,7 @@ let isDiy = ref(0) let params = reactive({ pageNum: 1, - pageSize: 15, + pageSize: 6, businessScenicArea:'', }) @@ -137,11 +137,10 @@ let cond = ref(false) const getVideoList = async () => { let res = await getSpotVideoEvents(params) - console.log(res,'rrrrrrrrr') list.value = res.data total.value = res.total setTimeout(()=>{cond.value = true},1500) - + nextTick(() => { list.value.forEach(async (item, index) => { var video = document.getElementById(`video${index}`) diff --git a/src/views/home/components/box-1.vue b/src/views/home/components/box-1.vue index fcc44b3..93395e8 100644 --- a/src/views/home/components/box-1.vue +++ b/src/views/home/components/box-1.vue @@ -24,9 +24,9 @@ > {{ item.name }} - 排队 - - + 排队 + + 暂无 @@ -129,7 +129,7 @@ - + @@ -150,7 +150,7 @@ ssname: '直通车购票' } ]) - + const homeStore = useHomeStore() const countList = ref([]) const CheckClick = (index)=>{ @@ -257,6 +257,7 @@ &:nth-child(1) { margin-right: vw(10); } + .statistic { display: flex; margin-top: vh(12); @@ -287,11 +288,13 @@ .value { font-weight: bold; font-size: vw(28); + + } + .active{ color: #ff4400; } .prefix, .suffix { - color: #ff4400; font-size: vw(12); margin-bottom: vh(4); } diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue index 192f98f..4f00fa4 100644 --- a/src/views/home/components/box-3.vue +++ b/src/views/home/components/box-3.vue @@ -370,8 +370,7 @@ color: #ffffff; } .error { - color: #F15A25; - color:#DCBB48; + color:#DCBB48; } .success { color: #02F9FA; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 5d5eebb..6fb9f3c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -70,7 +70,6 @@ homeStore.setTrafficInfoData(val) break case 'carStopInfo': - console.log(val,'carStopInfocarStopInfocarStopInfocarStopInfocarStopInfo') homeStore.setCarStopInfoData(val) break case 'carShipData': @@ -97,6 +96,13 @@ scenicSpotId: '' }) ) + sendMessage( + JSON.stringify({ + action: 'start', + type: 'queuingInScenicSpots', + scenicSpotId: '' + }) + ) sendMessage( JSON.stringify({ action: 'start', diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue index 6f1ccbe..5b727dd 100644 --- a/src/views/monitor/components/box-1.vue +++ b/src/views/monitor/components/box-1.vue @@ -19,7 +19,7 @@
异常点位 - +
@@ -131,7 +131,7 @@
异常点位
@@ -153,23 +153,23 @@
- 当前告警总数 + 当前告警
-
- 异常告警总数 +
+ 异常告警
- 已解除告警总数 + 已解除告警
@@ -394,9 +394,12 @@ color: #ffffff; } &:nth-child(4) { - .monitor-statistics-item__value { + .monitor-statistics-item__error { color: #e21b1b; } + .monitor-statistics-item__value { + color: #02f9fa; + } } } } @@ -424,7 +427,14 @@ margin-top: vh(10); font-weight: bold; font-size: vw(24); - color: #e21b1b; + color: #02f9fa; + text-align: center; + } + &__error { + margin-top: vh(10); + font-weight: bold; + font-size: vw(24); + color: #ff4400; text-align: center; } &:nth-child(4) { @@ -644,6 +654,12 @@ font-size: vw(24); color: #02f9fa; } + &-error{ + margin-top: vh(10); + font-weight: bold; + font-size: vw(24); + color: #ff4400; + } .count { font-weight: bold; font-size: vw(28); diff --git a/src/views/scenic/components/box-1.vue b/src/views/scenic/components/box-1.vue index 80f02e2..7c23e4e 100644 --- a/src/views/scenic/components/box-1.vue +++ b/src/views/scenic/components/box-1.vue @@ -16,7 +16,7 @@
{{ item.name }}
-

{{ item.value }}

+

{{ item.value }}

@@ -65,7 +65,7 @@
今日紧急工单数: - +
@@ -112,7 +112,7 @@
{{ item.time }}
{{ item.value }}
- +
@@ -181,9 +181,9 @@ import pubSub from 'pubsub-js' } onMounted(() => { scenicChange = PubSub.subscribe('scenicChange', (msg, data) => { - + gridTitle.value = data.name - + hrefItem.value = data // initMap('scenic-map', data.lng, data.lat, 15) // map.value.setDisplayOptions({ @@ -266,6 +266,9 @@ import pubSub from 'pubsub-js' text-align: center; line-height: vh(60); } + .warning { + color:#DCBB48;; + } .error { color: #ff4400; } @@ -466,7 +469,7 @@ import pubSub from 'pubsub-js' // margin-top:vh(10); min-width:vw(900); height:vh(800); - + } .header-title{ font-size:vw(32); @@ -474,7 +477,7 @@ import pubSub from 'pubsub-js' text-align:center; font-weight:bold; margin-bottom:vh(20); - + } .bom-box { .table2{ @@ -487,7 +490,7 @@ import pubSub from 'pubsub-js' .header { height: vh(28); font-weight: 400; - font-size: vw(12); + font-size: vw(24); color: #fff; display: flex; background: linear-gradient(180deg, rgba(0, 99, 255, 0) 0%, #0063ff 100%); @@ -517,7 +520,7 @@ import pubSub from 'pubsub-js' .item { height: vh(50); font-weight: 400; - font-size: vw(14); + font-size: vw(24); color: #f1f7ff; display: flex; &:nth-child(2n + 1) { diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue index e703ef1..cd3e58c 100644 --- a/src/views/scenic/components/box-2.vue +++ b/src/views/scenic/components/box-2.vue @@ -17,13 +17,9 @@ -