From b74cc40192ab11a1c8c3970296a51c9062188c61 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Fri, 25 Apr 2025 02:22:19 +0100 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8A=95=E5=85=A5=E5=93=81=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/custom-scroll-title/index.vue | 2 +- src/router/modules/demo.js | 6 ----- src/router/modules/v2.js | 28 ++++++++++---------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue index 6472b01..cc6f49a 100644 --- a/src/components/custom-scroll-title/index.vue +++ b/src/components/custom-scroll-title/index.vue @@ -48,7 +48,7 @@ const props = defineProps({ return [ { label: '首页', value: 'home' }, { label: '土地资源', value: 'land' }, - { label: '投入品', value: 'inputs' }, + { label: '投入品监管', value: 'inputs' }, { label: '生产经营主体', value: 'entities' }, // { label: '智慧种植监测', value: 'plant' }, // { label: '智慧养殖监测', value: 'breed' }, diff --git a/src/router/modules/demo.js b/src/router/modules/demo.js index 6dfba05..21efc26 100644 --- a/src/router/modules/demo.js +++ b/src/router/modules/demo.js @@ -20,12 +20,6 @@ export default [ component: () => import('@/views/demo/rank.vue'), meta: { title: '滚动排名列表', icon: 'document' }, }, - // { - // path: '/page', - // component: () => import('@/views/demo/test.vue'), - // name: 'page', - // meta: { title: '测试', icon: 'document' }, - // }, ], }, ]; diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js index aa33c41..dbc3920 100644 --- a/src/router/modules/v2.js +++ b/src/router/modules/v2.js @@ -5,55 +5,55 @@ export default { name: 'v2', component: Layout, redirect: '/v2/home', - meta: { title: '首页', icon: 'House' }, + meta: { title: '首页', icon: '' }, children: [ // { // path: '/v2/home', // component: () => import('@/views/home/index.vue'), // name: 'home', - // meta: { title: '首页', icon: 'House' }, + // meta: { title: '首页', icon: '' }, // }, { path: '/v2/land', component: () => import('@/views/land/index.vue'), name: 'land', - meta: { title: '土地资源', icon: 'House' }, + meta: { title: '土地资源', icon: '' }, + }, + { + path: 'inputs', + name: 'inputs', + component: () => import('@/views/inputs/index.vue'), + meta: { title: '投入品监管', icon: '' }, }, - // { - // path: 'inputs', - // name: 'inputs', - // component: () => import('@/views/inputs/index.vue'), - // hidden: true, - // }, // { // path: 'entities', // name: 'entities', // component: () => import('@/views/entities/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'breed', // name: 'breed', // component: () => import('@/views/breed/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'plant', // name: 'plant', // component: () => import('@/views/plant/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'trace', // name: 'trace', // component: () => import('@/views/trace/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'early', // name: 'early', // component: () => import('@/views/early/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, ], }; From b30874fa48f55b166df250f52bfe7302c7d15e50 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Fri, 25 Apr 2025 02:42:34 +0100 Subject: [PATCH 2/8] feat:title --- src/views/inputs/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/inputs/index.vue b/src/views/inputs/index.vue index 255d418..6f642e1 100644 --- a/src/views/inputs/index.vue +++ b/src/views/inputs/index.vue @@ -3,21 +3,21 @@
- +
- +
- + @@ -29,21 +29,21 @@
- +
- +
- + From 13936b8b5b9be1f3eb14f70d99eb9aaa50100425 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Fri, 25 Apr 2025 02:45:53 +0100 Subject: [PATCH 3/8] fix --- src/views/inputs/index.vue | 107 +++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/src/views/inputs/index.vue b/src/views/inputs/index.vue index 6f642e1..7ded830 100644 --- a/src/views/inputs/index.vue +++ b/src/views/inputs/index.vue @@ -1,57 +1,55 @@ diff --git a/src/styles/global.scss b/src/styles/global.scss index 3533878..397fb53 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,6 +1,6 @@ // color $legacy-ie: 10; -$color-primary: #20a0ff; +$color-primary: #35D0C0; $color-success: #13ce66; $color-warning: #f7ba2a; $color-danger: #ff4949; @@ -58,4 +58,6 @@ $color-types: ( ), ); +$color-custom-main: #35D0C0; + @import 'utils/utils'; From 8f3223e8e49c01b51fd7d0fe262711da898fb0b5 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Fri, 25 Apr 2025 10:12:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/subTop.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/subTop.vue b/src/components/subTop.vue index e0a2336..4d4a521 100644 --- a/src/components/subTop.vue +++ b/src/components/subTop.vue @@ -55,7 +55,7 @@ const props = defineProps({ }, isDown: { type: Boolean, - default: true, + default: false, }, downTitle: { type: String, From 3fa4900eb942bbfb44d25c0fe334f78fa35230b1 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Fri, 25 Apr 2025 10:37:33 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/custom-echart-line/index.vue | 14 +++++- src/components/customBack.vue | 52 +++++++++++++++++++- src/components/subTop.vue | 5 +- src/views/land/components/landPatrol.vue | 54 +++++++++++++++++---- src/views/land/index.vue | 33 ++++++++++++- 5 files changed, 142 insertions(+), 16 deletions(-) diff --git a/src/components/custom-echart-line/index.vue b/src/components/custom-echart-line/index.vue index d2a04ae..946d7f8 100644 --- a/src/components/custom-echart-line/index.vue +++ b/src/components/custom-echart-line/index.vue @@ -2,7 +2,7 @@