Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
duanxiaohai 2024-07-02 09:37:12 +08:00
commit 8e7a980146
6 changed files with 16 additions and 7 deletions

View File

@ -12,6 +12,10 @@
font-family: TCloudNumber;
src: url('../css/TCloudNumber-Regular.ttf')
}
@font-face {
font-family: titleNore;
src: url('../css/优设标题黑.ttf')
}
span,
p,

Binary file not shown.

View File

@ -409,7 +409,7 @@ onMounted(() => {
startAutoSwitching();
});
onBeforeMount(() => {
onBeforeMount(async () => {
getData();
});

View File

@ -10,6 +10,7 @@ import {
defineProps,
ref,
nextTick,
watch,
} from "vue";
// echarts
import * as echarts from "echarts";
@ -168,9 +169,17 @@ const setChart1 = () => {
data.list2.push(item.rs); //
});
};
//
watch(
() => props.list,
(newVal, oldVal) => {
console.log(2222,newVal, oldVal)
}
);
onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
console.log(1111,data.list)
setChart1();
getOption();
setChart();

View File

@ -687,11 +687,6 @@ onBeforeMount(async () => {
});
onMounted(() => {
startAutoScroll();
console.log(
mainRef.value.scrollTop,
mainRef.value.scrollHeight,
mainRef.value.clientHeight
);
});
</script>

View File

@ -465,6 +465,7 @@ body {
margin-top: 150px;
border-bottom: 1px solid #71ddff;
position: relative;
font-family: titleNore;
&::after {
content: "";
position: absolute;
@ -556,7 +557,7 @@ body {
line-height: 31px;
text-align: center;
color: #fff;
font-size: 18px;
font-size: 24px;
letter-spacing: 2px;
text-shadow: 0px 0px 4px #58b9ff;
}