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

This commit is contained in:
姚宇浩 2024-07-02 10:35:58 +08:00
commit 66962bf6a8
3 changed files with 10 additions and 6 deletions

View File

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

View File

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

View File

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