diff --git a/src/components/charts/LineHol.vue b/src/components/charts/LineHol.vue index 17d075d..0b9b808 100644 --- a/src/components/charts/LineHol.vue +++ b/src/components/charts/LineHol.vue @@ -21,6 +21,10 @@ const props = defineProps({ type: Object, default: () => {}, }, + barColor: { + type: String, + default: "#3C74F1", + }, }); watch( @@ -127,10 +131,10 @@ const initChart = () => { show: true, }, itemStyle: { - color: "#3C74F1", + color: props.barColor, normal: { borderRadius: [0, 4, 4, 0], - color: "#3C74F1", + color: props.barColor, // color: function (params) { // return colorList[params.dataIndex]; // }, diff --git a/src/components/charts/LineHolYellow.vue b/src/components/charts/LineHolYellow.vue index ad1b0fa..f9da692 100644 --- a/src/components/charts/LineHolYellow.vue +++ b/src/components/charts/LineHolYellow.vue @@ -19,7 +19,11 @@ const values = ref([]); const props = defineProps({ data: { type: Object, - default: () => { }, + default: () => {}, + }, + barColor: { + type: String, + default: "#3C74F1", }, }); @@ -95,7 +99,7 @@ const initChart = () => { color: "#FFCE34", normal: { borderRadius: [0, 4, 4, 0], - color: "#3C74F1", + color: props.barColor, // color: function (params) { // return colorList[params.dataIndex]; // }, @@ -129,7 +133,6 @@ onMounted(async () => { // await getData(); // initChart(); // }, 5000); - }); diff --git a/src/pages/realtimeInfo/indexRelease.vue b/src/pages/realtimeInfo/indexRelease.vue index 6a542fa..21fdd19 100644 --- a/src/pages/realtimeInfo/indexRelease.vue +++ b/src/pages/realtimeInfo/indexRelease.vue @@ -11,8 +11,8 @@ - - + + 已处理 @@ -39,7 +38,6 @@ 概念标签贴标 - 已处理 @@ -51,14 +49,14 @@ - + --> - + - - - + + +
@@ -69,19 +67,18 @@
- + - + @@ -101,8 +98,11 @@ 退出登录 - + @@ -291,14 +291,12 @@ async function getLineDataFn() { } function goSreach() { - if (uni.getStorageSync("token")) { + if (Session.get("token")) { uni.navigateTo({ url: "/pages/sreachReq/index", }); } else { - uni.navigateTo({ - url: "/pages/login/indexMini", - }); + LoginShow.value = true; } }