From c96914ca17612a6ec90fe805f8980b684c4fd8d4 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Thu, 24 Apr 2025 07:50:22 +0100 Subject: [PATCH] =?UTF-8?q?feat:=E5=9C=9F=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- .env.test | 2 +- index.html | 2 +- src/components/custom-echart-line/index.vue | 4 +- src/components/custom-rank-list/index.vue | 55 +++-- src/layouts/index.vue | 17 +- src/router/modules/demo.js | 37 +++- src/views/demo/rank.vue | 4 + .../land/components/distributionCharts.vue | 161 +++++++++------ src/views/land/components/landCirculation.vue | 173 +++++++--------- src/views/land/components/landPatrol.vue | 190 +++++++----------- 12 files changed, 334 insertions(+), 315 deletions(-) diff --git a/.env.development b/.env.development index ccb75e6..de343f2 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ # 开发环境 VITE_PORT = 9000 VITE_APP_NAME = 'digital-agriculture-screen' -VITE_APP_TITLE = '政务云数据大屏可视化' +VITE_APP_TITLE = '政务云数字农业智慧大屏' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' diff --git a/.env.production b/.env.production index 570b025..1e8d1d8 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 生产环境 VITE_APP_NAME = 'digital-agriculture-screen' -VITE_APP_TITLE = '政务云数据大屏可视化' +VITE_APP_TITLE = '政务云数字农业智慧大屏' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' \ No newline at end of file diff --git a/.env.test b/.env.test index 5e8358b..164baac 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ # 测试环境 VITE_APP_NAME = 'digital-agriculture-screen' -VITE_APP_TITLE = '政务云数据大屏可视化' +VITE_APP_TITLE = '政务云数字农业智慧大屏' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' \ No newline at end of file diff --git a/index.html b/index.html index f8ec8cc..967d07d 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - 数据大屏 + 政务云数字农业智慧大屏 diff --git a/src/components/custom-echart-line/index.vue b/src/components/custom-echart-line/index.vue index 65e8ac5..d2a04ae 100644 --- a/src/components/custom-echart-line/index.vue +++ b/src/components/custom-echart-line/index.vue @@ -91,11 +91,11 @@ export default { colorStops: [ { offset: 0, - color: hexToRGBA(color, 0.2), + color: hexToRGBA(color, 1), }, { offset: 1, - color: hexToRGBA(color, 1), + color: hexToRGBA(color, 0.2), }, ], }, diff --git a/src/components/custom-rank-list/index.vue b/src/components/custom-rank-list/index.vue index f9e1f9f..f792eee 100644 --- a/src/components/custom-rank-list/index.vue +++ b/src/components/custom-rank-list/index.vue @@ -1,19 +1,23 @@ @@ -28,7 +32,9 @@ const props = defineProps({ }, }); const { w, h } = toRefs(props.chartConfig.attr); -const { rowNum, unit, color, textColor, borderColor, indexFontSize, leftFontSize, rightFontSize } = toRefs(props.chartConfig.option); +const { type, rowNum, unit, height, color, textColor, borderColor, borderRadius, indexPrefix, indexFontSize, leftFontSize, rightFontSize } = toRefs( + props.chartConfig.option +); const status = reactive({ mergedConfig: props.chartConfig.option, @@ -91,7 +97,7 @@ const calcHeights = (onresize = false) => { const animation = async (start = false) => { let { avgHeight, animationIndex, mergedConfig, rowsData, updater } = status; - const { waitTime, carousel, rowNum } = mergedConfig; + const { isAnimation, waitTime, carousel, rowNum } = mergedConfig; const rowLength = rowsData.length; if (rowNum >= rowLength) return; if (start) { @@ -104,6 +110,7 @@ const animation = async (start = false) => { status.rows = rows.slice(0, rowNum + 1); status.heights = new Array(rowLength).fill(avgHeight); await new Promise((resolve) => setTimeout(resolve, 300)); + if (!isAnimation) return; if (updater !== status.updater) return; status.heights.splice(0, animationNum, ...new Array(animationNum).fill(0)); animationIndex += animationNum; @@ -177,7 +184,7 @@ onUnmounted(() => { diff --git a/src/views/land/components/landCirculation.vue b/src/views/land/components/landCirculation.vue index fda8e7c..687d111 100644 --- a/src/views/land/components/landCirculation.vue +++ b/src/views/land/components/landCirculation.vue @@ -1,113 +1,88 @@ - diff --git a/src/views/land/components/landPatrol.vue b/src/views/land/components/landPatrol.vue index d7682f5..f68255c 100644 --- a/src/views/land/components/landPatrol.vue +++ b/src/views/land/components/landPatrol.vue @@ -1,121 +1,79 @@ - - -