From 74aa210c5f8c11f600d7e6b1fc549e7b3dce3736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com> Date: Fri, 23 May 2025 16:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E5=A4=A7=E5=B1=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/custom-scroll-title/index.vue | 5 + .../views/inputs/components/inputsFive.vue | 8 +- .../views/inputs/components/inputsFour.vue | 85 ++++++- .../src/views/inputs/components/inputsMap.vue | 2 +- .../src/views/inputs/components/inputsOne.vue | 4 +- .../src/views/inputs/components/inputsSix.vue | 11 +- .../views/inputs/components/inputsThere.vue | 50 ++-- .../src/views/inputs/index.vue | 19 +- .../src/views/land/components/landMap.vue | 12 +- .../src/views/land/index.vue | 237 +++++++++++++++--- .../src/apis/agricultural.js | 10 +- .../views/ecommerce/agriculturalDetail.vue | 3 +- .../views/ecommerce/components/evaluate.vue | 29 +++ 13 files changed, 383 insertions(+), 92 deletions(-) diff --git a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue index 86d8906..885e74c 100644 --- a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue +++ b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue @@ -55,6 +55,7 @@ const props = defineProps({ default() { return [ // { label: '首页', value: '/new-digital-agriculture-screen/v2/home' }, + { label: '首页', value: 'home' }, { label: '土地资源', value: '/new-digital-agriculture-screen/v2/land' }, { label: '投入品监管', value: '/new-digital-agriculture-screen/v2/inputs' }, { label: '产出品管理', value: '/new-digital-agriculture-screen/v2/entities' }, @@ -120,6 +121,10 @@ function handleTitleBtn(t = -1) { } } function handleTitleClick(val) { + if (val === 'home') { + window.location.href = 'http://47.109.205.240/platform'; + return; + } activeTitle.value = val; // emit('changeTitle', val); router.push({ path: val }); diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue index dc549af..b8df1a9 100644 --- a/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue +++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsFive.vue @@ -27,9 +27,9 @@ const chartData = ref( // 各品类基础值 return [ - { type: '种子种苗', values: generateWaveData(15) }, + { type: '种子', values: generateWaveData(1) }, { type: '化肥', values: generateWaveData(20) }, - { type: '农药', values: generateWaveData(10) }, + { type: '农药', values: generateWaveData(2) }, ].flatMap(({ type, values }) => values.map((value, i) => ({ type, @@ -50,7 +50,7 @@ function hexToRGBA(hex, alpha = 1) { const chartOption = ref({ color: ['#02FD94', '#FEF906', '#01FEFD'], legend: { - data: ['种子种苗', '化肥', '农药'], + data: ['种子', '化肥', '农药'], top: 8, itemWidth: 12, // 矩形宽度 itemHeight: 12, // 矩形高度 @@ -104,7 +104,7 @@ const chartOption = ref({ }, series: [ { - name: '种子种苗', + name: '种子', type: 'line', smooth: true, symbol: 'none', diff --git a/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue b/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue index f06f6e1..79a60ec 100644 --- a/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue +++ b/new-digital-agriculture-screen/src/views/inputs/components/inputsFour.vue @@ -1,12 +1,20 @@