diff --git a/src/assets/css/common.css b/src/assets/css/common.css index ed16e28..42b5abc 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -12,6 +12,10 @@ font-family: TCloudNumber; src: url('../css/TCloudNumber-Regular.ttf') } +@font-face { + font-family: titleNore; + src: url('../css/优设标题黑.ttf') +} span, p, diff --git a/src/assets/css/优设标题黑.ttf b/src/assets/css/优设标题黑.ttf new file mode 100644 index 0000000..3729151 Binary files /dev/null and b/src/assets/css/优设标题黑.ttf differ diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 6151f09..7004296 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -409,7 +409,7 @@ onMounted(() => { startAutoSwitching(); }); -onBeforeMount(() => { +onBeforeMount(async () => { getData(); }); diff --git a/src/view/echart_analyze/right1.vue b/src/view/echart_analyze/right1.vue index 72f1dfb..771a97d 100644 --- a/src/view/echart_analyze/right1.vue +++ b/src/view/echart_analyze/right1.vue @@ -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(); diff --git a/src/view/education.vue b/src/view/education.vue index 44eb540..de5100d 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -687,11 +687,6 @@ onBeforeMount(async () => { }); onMounted(() => { startAutoScroll(); - console.log( - mainRef.value.scrollTop, - mainRef.value.scrollHeight, - mainRef.value.clientHeight - ); }); diff --git a/src/view/guide.vue b/src/view/guide.vue index 05326ff..30d4cc2 100644 --- a/src/view/guide.vue +++ b/src/view/guide.vue @@ -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; }