diff --git a/dist3.28.zip b/dist3.28.zip deleted file mode 100644 index 22292a5..0000000 Binary files a/dist3.28.zip and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico index df36fcf..38ab6d2 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/components/Title2/index.vue b/src/components/Title2/index.vue index 348b6ec..d0c2e83 100644 --- a/src/components/Title2/index.vue +++ b/src/components/Title2/index.vue @@ -4,7 +4,7 @@
- 景区购票 + 景区购票
直通车购票 @@ -42,6 +42,7 @@ .item{ // margin-right: vw(22); padding:vw(5) vw(10); + cursor: pointer; // border-bottom:1px solid #ccc; } & span { diff --git a/src/components/VideoDialog/index.vue b/src/components/VideoDialog/index.vue index dd597e1..18b195a 100644 --- a/src/components/VideoDialog/index.vue +++ b/src/components/VideoDialog/index.vue @@ -32,7 +32,7 @@ /> - +
props.isCollect, (val) => { if (val) { - console.log(val,'val 2222222222222222222222') colletCond.value = val // setTimeout(() => { // init() @@ -112,7 +111,6 @@ ) // 关注 const handleCollect = async (id, status, index) => { - // console.log(props.isCollect,777788888) await postVideoCollectApi({ cameraIndexCode:props.cameraIndexCode, isCollect: props.isCollect == 0 ? 1 : 0 @@ -182,9 +180,9 @@ } }) } - + onMounted(()=>{ - + }) diff --git a/src/components/monitor/index.vue b/src/components/monitor/index.vue index d000733..ce6aa3f 100644 --- a/src/components/monitor/index.vue +++ b/src/components/monitor/index.vue @@ -90,7 +90,7 @@
- +
返回 diff --git a/src/stores/home.js b/src/stores/home.js index 1b37c96..a9beb9a 100644 --- a/src/stores/home.js +++ b/src/stores/home.js @@ -10,17 +10,17 @@ export const useHomeStore = defineStore('home', () => { { value: 0, name: '低感景区总数' } ], data: [ - { name: '当日购票量:', value: 0 }, - { name: '未来3天购票量:', value: 0 }, - { name: '3天后购票量:', value: 0 } + { name: '购今日票数:', value: 0 }, + { name: '购未来三天票数:', value: 0 }, + { name: '购三天后票数:', value: 0 } ] }) //直通车购票 let trainData = ref({ data: [ - { name: '当日购票量:', value: 0 }, - { name: '未来3天购票量:', value: 0 }, - { name: '3天后购票量:', value: 0 } + { name: '购今日票数:', value: 0 }, + { name: '购未来三天票数:', value: 0 }, + { name: '购三天后票数:', value: 0 } ] }) // 景区排队数据 diff --git a/src/stores/scenic.js b/src/stores/scenic.js index 5008dd5..fb1b270 100644 --- a/src/stores/scenic.js +++ b/src/stores/scenic.js @@ -37,7 +37,7 @@ export const useScenicStore = defineStore('scenic', () => { dataList: [], headList: [ { name: '当前告警总数', count: 0, type: 0 }, - { name: '安全告警总数', count: 0, type: 0 }, + { name: '异常告警总数', count: 0, type: 0 }, { name: '已解除告警数', count: 0, type: 0 } ] }) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ab3cd18..3417d11 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -96,6 +96,13 @@ scenicSpotId: '' }) ) + sendMessage( + JSON.stringify({ + action: 'start', + type: 'getMapNotifyInfo', + scenicSpotId: '' + }) + ) } }, 5000) } diff --git a/src/views/hotel/components/info-box.vue b/src/views/hotel/components/info-box.vue index 3946447..103f0d2 100644 --- a/src/views/hotel/components/info-box.vue +++ b/src/views/hotel/components/info-box.vue @@ -14,7 +14,7 @@
- 联系电话:+86-23-56636999 + 联系电话:{{ info?.phone }}
@@ -210,7 +210,7 @@ background-size: 100% 100%; } &-box-2{ - + } &-container { padding: vh(20) vw(20) 0 vw(20); diff --git a/src/views/hotel/components/video-box.vue b/src/views/hotel/components/video-box.vue index 313c402..c65a137 100644 --- a/src/views/hotel/components/video-box.vue +++ b/src/views/hotel/components/video-box.vue @@ -75,7 +75,7 @@
- +
返回 @@ -107,7 +107,7 @@
- +
返回 @@ -162,7 +162,7 @@
- +