feat:完善首页功能

This commit is contained in:
zjc
2025-01-15 11:20:32 +08:00
parent ebac43f818
commit ef5cb642ca
14 changed files with 163 additions and 111 deletions

View File

@@ -13,7 +13,7 @@ export function getVideoListApi(data) {
return request({ return request({
url: '/api/largeScreen/video/list', url: '/api/largeScreen/video/list',
method: 'post', method: 'post',
params: data data
}) })
} }

View File

@@ -14,11 +14,11 @@ const router = useRouter()
*/ */
const instance = axios.create({ const instance = axios.create({
// baseURL: 'http://36.138.38.16:6180/fjtcc-api', // baseURL: 'http://36.138.38.16:6180/fjtcc-api',
// baseURL: 'http://36.138.38.16:8001/fjtcc-api', baseURL: 'http://36.138.38.16:8001/fjtcc-api',
baseURL: ' http://172.22.15.170/fjtcc-api', // baseURL: 'http://172.22.15.170/fjtcc-api',
timeout: 100000, timeout: 100000,
headers: { headers: {
Authorization: proToken, Authorization: devToken,
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'
} }
}) })

View File

@@ -50,6 +50,7 @@
let res = await getVideoListApi({ let res = await getVideoListApi({
businessVideoDisplayPosition: '' businessVideoDisplayPosition: ''
}) })
console.log(res, '============')
list.value = res.data list.value = res.data
nextTick(() => { nextTick(() => {
list.value.forEach(async (item, index) => { list.value.forEach(async (item, index) => {

View File

@@ -62,7 +62,7 @@
} }
} }
} }
let defaultConfig = { const defaultConfig = {
colors: defaultColors, colors: defaultColors,
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
@@ -168,7 +168,7 @@
if (val[0].length > 0 && val[1].length > 0) { if (val[0].length > 0 && val[1].length > 0) {
setTimeout(() => { setTimeout(() => {
updateOption() updateOption()
}, 500) }, 1000)
} }
}, },
{ immediate: true } { immediate: true }

View File

@@ -5,20 +5,29 @@
<script setup> <script setup>
import { fitChartSize } from '@/utils/dataUtil' import { fitChartSize } from '@/utils/dataUtil'
import { useEchart } from '@/hooks/echart' import { useEchart } from '@/hooks/echart'
import { useHomeStore } from '@/stores/home'
const homeStore = useHomeStore() let props = defineProps({
list: {
type: Array,
default: () => []
}
})
const { id, setOption } = useEchart() const { id, setOption } = useEchart()
let params = null let params = null
watch( watch(
() => homeStore.userPortraitData?.ageRate, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )
const init = () => { const init = () => {
if (!params) { if (!params) {
params = { params = {
@@ -31,7 +40,7 @@
itemWidth: fitChartSize(8), itemWidth: fitChartSize(8),
itemGap: fitChartSize(10), itemGap: fitChartSize(10),
formatter: function (name) { formatter: function (name) {
let obj = homeStore.userPortraitData?.ageRate.find((item) => item.name == name) let obj = props.list.find((item) => item.name == name)
return '{name|' + name + '} {value|' + obj.value + '}{value|%}' return '{name|' + name + '} {value|' + obj.value + '}{value|%}'
}, },
textStyle: { textStyle: {
@@ -64,7 +73,7 @@
color: '#D3F0FE', color: '#D3F0FE',
fontSize: fitChartSize(12) fontSize: fitChartSize(12)
}, },
data: homeStore.userPortraitData?.ageRate || [] data: props.list || []
}, },
{ {
type: 'pie', type: 'pie',
@@ -82,7 +91,7 @@
color: '#D3F0FE', color: '#D3F0FE',
fontSize: fitChartSize(12) fontSize: fitChartSize(12)
}, },
data: homeStore.userPortraitData?.ageRate || [] data: props.list
}, },
{ {
type: 'pie', type: 'pie',
@@ -115,9 +124,13 @@
] ]
} }
} else { } else {
params.series[0].data = props.list
} }
setOption(params) setOption(params)
} }
defineExpose({
init
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@@ -28,7 +28,6 @@
<span class="statistic-title">{{ item.name }}</span> <span class="statistic-title">{{ item.name }}</span>
<span v-if="item.value > 0" class="statistic-value"> <span v-if="item.value > 0" class="statistic-value">
<span class="prefix">排队</span> <span class="prefix">排队</span>
<!-- <span class="value">{{ item.value }}</span> -->
<countup class="value" :end-val="item.value" /> <countup class="value" :end-val="item.value" />
<span class="suffix"></span> <span class="suffix"></span>
</span> </span>
@@ -78,7 +77,8 @@
<div class="ticket-wrap"> <div class="ticket-wrap">
<img src="@/assets/images/ticket.png" /> <img src="@/assets/images/ticket.png" />
<div v-for="(item, index) in homeStore.scenicData.data" :key="index"> <div v-for="(item, index) in homeStore.scenicData.data" :key="index">
<span class="label">{{ item.name }}</span><countup :end-val="item.value" /> <span class="label">{{ item.name }}</span>
<countup :end-val="item.value" />
</div> </div>
</div> </div>
</div> </div>
@@ -87,7 +87,9 @@
<div class="flex"> <div class="flex">
<div class="age-box"> <div class="age-box">
<Title3 title="年龄/性别占比" /> <Title3 title="年龄/性别占比" />
<div class="mt-8"> <age /></div> <div class="mt-8">
<age :list="homeStore.userPortraitData?.ageRate" />
</div>
<div v-if="ageRateTotal > 0" class="count">总人数:<countup :end-val="ageRateTotal" /></div> <div v-if="ageRateTotal > 0" class="count">总人数:<countup :end-val="ageRateTotal" /></div>
<div <div
class="cell pt-20" class="cell pt-20"

View File

@@ -170,7 +170,11 @@
watch( watch(
() => homeStore?.baiduMapData, () => homeStore?.baiduMapData,
(val) => { (val) => {
if (val) init(val) if (val) {
setTimeout(() => {
init(val)
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )

View File

@@ -22,7 +22,11 @@
watch( watch(
() => props.list, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ {
immediate: true immediate: true

View File

@@ -19,7 +19,11 @@
watch( watch(
() => props.list, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )

View File

@@ -19,7 +19,11 @@
watch( watch(
() => props.list, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )

View File

@@ -20,7 +20,11 @@
watch( watch(
() => homeStore.userPortraitData.channel, () => homeStore.userPortraitData.channel,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ {
immediate: true immediate: true

View File

@@ -10,9 +10,11 @@
const homeStore = useHomeStore() const homeStore = useHomeStore()
const { id, setOption } = useEchart() const { id, setOption } = useEchart()
let params = null
const init = () => { const init = () => {
setOption({ if (!params) {
params = {
backgroundColor: 'transparent', backgroundColor: 'transparent',
tooltip: { tooltip: {
show: false show: false
@@ -104,13 +106,19 @@
}) })
} }
] ]
}) }
}
setOption(params)
} }
watch( watch(
() => homeStore?.userPortraitData?.provinceRate, () => homeStore?.userPortraitData?.provinceRate,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ {
immediate: true immediate: true

View File

@@ -19,7 +19,11 @@
watch( watch(
() => props.list, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )

View File

@@ -19,7 +19,11 @@
watch( watch(
() => props.list, () => props.list,
(val) => { (val) => {
if (val.length > 0) init() if (val.length > 0) {
setTimeout(() => {
init()
}, 1000)
}
}, },
{ immediate: true } { immediate: true }
) )