From 90e5ea4a6ed71210e28419a0d872900d9b9c8ad4 Mon Sep 17 00:00:00 2001
From: lx <826276471@qq.com>
Date: Thu, 24 Apr 2025 13:30:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{land/底部框架.png => basic/footerBG.png} | Bin
src/layouts/index.vue | 28 +++++++++++++++++-
src/router/index.js | 2 +-
3 files changed, 28 insertions(+), 2 deletions(-)
rename src/assets/images/{land/底部框架.png => basic/footerBG.png} (100%)
diff --git a/src/assets/images/land/底部框架.png b/src/assets/images/basic/footerBG.png
similarity index 100%
rename from src/assets/images/land/底部框架.png
rename to src/assets/images/basic/footerBG.png
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 25495fd..7fde755 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -2,10 +2,23 @@
+
diff --git a/src/router/index.js b/src/router/index.js
index a776199..c644a7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,7 @@ export const constantRoutes = [
path: '/',
name: 'layout',
component: Layout,
- // redirect: '/home',
+ redirect: '/home',
meta: { title: '首页', icon: 'House' },
children: [
{
From 968a0412b7483d551c7a619660c7ed140af4397a Mon Sep 17 00:00:00 2001
From: lx <826276471@qq.com>
Date: Thu, 24 Apr 2025 13:43:14 +0800
Subject: [PATCH 2/5] feta
---
src/layouts/index.vue | 2 +-
src/views/land/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 7fde755..d8d9af0 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -8,7 +8,7 @@
+
+
diff --git a/src/views/land/index.vue b/src/views/land/index.vue
index 33dc092..4182329 100644
--- a/src/views/land/index.vue
+++ b/src/views/land/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -28,9 +28,9 @@
-
+
-
+
@@ -59,9 +59,12 @@ import landareaCharts from './components/landareaCharts.vue';
import landCirculation from './components/landCirculation.vue';
import landPlan from './components/landPlan.vue';
import landPatrol from './components/landPatrol.vue';
+import LandAera from './components/LandAera.vue';
diff --git a/src/router/index.js b/src/router/index.js
index c644a7a..275def0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,6 +2,8 @@ import { createRouter, createWebHistory } from 'vue-router';
import Layout from '@/layouts/index.vue';
import demoRouters from './modules/demo';
+import path from 'path-browserify';
+import v2 from './modules/v2';
export const constantRoutes = [
// {
@@ -22,58 +24,59 @@ export const constantRoutes = [
component: Layout,
redirect: '/home',
meta: { title: '首页', icon: 'House' },
- children: [
- {
- path: '/home',
- component: () => import('@/views/home/index.vue'),
- name: 'home',
- meta: { title: '首页', icon: 'House' },
- },
- {
- path: '/land',
- component: () => import('@/views/land/index.vue'),
- name: 'land',
- meta: { title: '土地资源', icon: 'House' },
- },
- {
- path: '/inputs',
- name: 'inputs',
- component: () => import('@/views/inputs/index.vue'),
- hidden: true,
- },
- {
- path: '/entities',
- name: 'entities',
- component: () => import('@/views/entities/index.vue'),
- hidden: true,
- },
- {
- path: '/breed',
- name: 'breed',
- component: () => import('@/views/breed/index.vue'),
- hidden: true,
- },
- {
- path: '/plant',
- name: 'plant',
- component: () => import('@/views/plant/index.vue'),
- hidden: true,
- },
- {
- path: '/trace',
- name: 'trace',
- component: () => import('@/views/trace/index.vue'),
- hidden: true,
- },
- {
- path: '/early',
- name: 'early',
- component: () => import('@/views/early/index.vue'),
- hidden: true,
- },
- ],
+ // children: [
+ // {
+ // path: '/home',
+ // component: () => import('@/views/home/index.vue'),
+ // name: 'home',
+ // meta: { title: '首页', icon: 'House' },
+ // },
+ // {
+ // path: '/land',
+ // component: () => import('@/views/land/index.vue'),
+ // name: 'land',
+ // meta: { title: '土地资源', icon: 'House' },
+ // },
+ // {
+ // path: '/inputs',
+ // name: 'inputs',
+ // component: () => import('@/views/inputs/index.vue'),
+ // hidden: true,
+ // },
+ // {
+ // path: '/entities',
+ // name: 'entities',
+ // component: () => import('@/views/entities/index.vue'),
+ // hidden: true,
+ // },
+ // {
+ // path: '/breed',
+ // name: 'breed',
+ // component: () => import('@/views/breed/index.vue'),
+ // hidden: true,
+ // },
+ // {
+ // path: '/plant',
+ // name: 'plant',
+ // component: () => import('@/views/plant/index.vue'),
+ // hidden: true,
+ // },
+ // {
+ // path: '/trace',
+ // name: 'trace',
+ // component: () => import('@/views/trace/index.vue'),
+ // hidden: true,
+ // },
+ // {
+ // path: '/early',
+ // name: 'early',
+ // component: () => import('@/views/early/index.vue'),
+ // hidden: true,
+ // },
+ // ],
},
...demoRouters,
+ v2,
{
path: '/test',
name: 'test',
diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js
new file mode 100644
index 0000000..0e91c01
--- /dev/null
+++ b/src/router/modules/v2.js
@@ -0,0 +1,59 @@
+import Layout from '@/layouts/index.vue';
+
+export default {
+ path: '/v2',
+ name: 'layout',
+ component: Layout,
+ redirect: '/v2/home',
+ meta: { title: '首页', icon: 'House' },
+ children: [
+ {
+ path: 'home',
+ component: () => import('@/views/home/index.vue'),
+ name: 'home',
+ meta: { title: '首页', icon: 'House' },
+ },
+ {
+ path: 'land',
+ component: () => import('@/views/land/index.vue'),
+ name: 'land',
+ meta: { title: '土地资源', icon: 'House' },
+ },
+ {
+ path: 'inputs',
+ name: 'inputs',
+ component: () => import('@/views/inputs/index.vue'),
+ hidden: true,
+ },
+ {
+ path: 'entities',
+ name: 'entities',
+ component: () => import('@/views/entities/index.vue'),
+ hidden: true,
+ },
+ {
+ path: 'breed',
+ name: 'breed',
+ component: () => import('@/views/breed/index.vue'),
+ hidden: true,
+ },
+ {
+ path: 'plant',
+ name: 'plant',
+ component: () => import('@/views/plant/index.vue'),
+ hidden: true,
+ },
+ {
+ path: 'trace',
+ name: 'trace',
+ component: () => import('@/views/trace/index.vue'),
+ hidden: true,
+ },
+ {
+ path: 'early',
+ name: 'early',
+ component: () => import('@/views/early/index.vue'),
+ hidden: true,
+ },
+ ],
+};