diff --git a/package.json b/package.json index e9d14eb..f00f4fd 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,12 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", + "@icon-park/vue-next": "^1.4.2", "@vuemap/vue-amap": "^2.1.1", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.6.1", "axios": "0.27.2", + "babel-plugin-import": "^1.13.8", "echarts": "5.4.3", "element-plus": "2.4.3", "file-saver": "2.0.5", diff --git a/src/assets/images/v2_rxo8qp.png b/src/assets/images/v2_rxo8qp.png new file mode 100644 index 0000000..b3fdb9e Binary files /dev/null and b/src/assets/images/v2_rxo8qp.png differ diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 6e7a790..7f929ae 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -20,7 +20,7 @@ function getBreadcrumb() { const first = matched[0] // 判断是否为首页 if (!isDashboard(first)) { - matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched) + matched = [{ path: '/index', meta: { title: '概览' } }].concat(matched) } levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 18c201e..2e822fd 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -1,15 +1,34 @@ @@ -21,9 +40,49 @@ defineProps({ } }) -const emit = defineEmits() +const emit = defineEmits(['toggleClick']) +const showDrawer = ref(false) +const menuList = ref([ + { + label: '基础数据管理', children: [ + {label: '育种基地管理'}, + {label: '数据采集设备管理'}, + {label: '作物品种管理'}, + ] + }, + { + label: '环境数据', children: [ + {label: '基地地图',href:'/system/base/map'}, + {label: '地块管理'}, + {label: '土壤数据'}, + {label: '气象数据'}, + {label: '监控数据'}, + ] + }, + { + label: '表型数据', children: [ + {label: '原始数据管理'}, + {label: '表型数据管理'}, + {label: '植株表型数据'}, + ] + }, + { + label: '基因型数据', children: [ + {label: '基因型数据管理'}, + ] + }, +]) +const router = useRouter(); +const openRouter = (href) => { + if (href){ + router.push(href) + showDrawer.value = false + } +} const toggleClick = () => { - emit('toggleClick'); + if (import.meta.env.VITE_APP_ENV === 'development') { + emit('toggleClick'); + } } @@ -38,4 +97,18 @@ const toggleClick = () => { .hamburger.is-active { transform: rotate(180deg); } + +/*菜单样式*/ +.classify { + display: flex; + align-items: center; + margin-top: 20px; + + .i-icon { + margin-right: 5px; + } +} +.children-item { + margin-top: 10px; +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 473d20f..b446b61 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,13 +2,18 @@
{{title}}
- +
-
- -
{{userStore.name}}
- - 退出 - -
- +
@@ -41,7 +39,7 @@ 个人中心 - + 布局设置 @@ -50,6 +48,13 @@ +
+ +
{{userStore.name}}
+
+ 退出 +
+
@@ -111,12 +116,14 @@ function setLayout() { diff --git a/src/layout/index.vue b/src/layout/index.vue index 256efd5..028a124 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -34,6 +34,7 @@ const classObj = computed(() => ({ hideSidebar: !sidebar.value.opened, openSidebar: sidebar.value.opened, withoutAnimation: sidebar.value.withoutAnimation, + // mobile: device.value === 'mobile' mobile: true })) diff --git a/src/main.js b/src/main.js index 187e35d..155ce58 100644 --- a/src/main.js +++ b/src/main.js @@ -7,7 +7,9 @@ import 'element-plus/dist/index.css' import locale from 'element-plus/es/locale/lang/zh-cn' import '@/assets/styles/index.scss' // global css - +// iconpark样式 +import {install} from '@icon-park/vue-next/es/all'; +import '@icon-park/vue-next/styles/index.css'; import App from './App' import store from './store' import router from './router' @@ -56,6 +58,8 @@ initAMapApiLoader({ // version: '2.0.0' //} // 如果需要使用loca组件库，需要加载Loca }) +install(app, 'i'); // use custom prefix 'i', eg: icon is People, name is i-people. + // 全局方法挂载 app.config.globalProperties.useDict = useDict app.config.globalProperties.download = download diff --git a/src/router/index.js b/src/router/index.js index b05d1c1..1892f26 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,7 +66,7 @@ export const constantRoutes = [ path: '/index', component: () => import('@/views/index'), name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } + meta: { title: '概览', icon: 'dashboard', affix: true } } ] }, diff --git a/src/settings.js b/src/settings.js index 3b46e85..75594d6 100644 --- a/src/settings.js +++ b/src/settings.js @@ -10,7 +10,7 @@ export default { /** * 是否系统布局配置 */ - showSettings: true, + showSettings: false, /** * 是否显示顶部导航 @@ -35,7 +35,7 @@ export default { /** * 是否显示动态标题 */ - dynamicTitle: false, + dynamicTitle: true, /** * @type {string | array} 'production' | ['production', 'development'] diff --git a/src/views/index.vue b/src/views/index.vue index 8644e4a..ac3dfb7 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,990 +1,117 @@ @@ -997,6 +124,7 @@ function goTarget(url) { diff --git a/src/views/index_old.vue b/src/views/index_old.vue new file mode 100644 index 0000000..8644e4a --- /dev/null +++ b/src/views/index_old.vue @@ -0,0 +1,1062 @@ + + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index 66d8d1d..e5d7e4f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,53 +1,62 @@ + + + + \ No newline at end of file diff --git a/src/views/system/base/map.vue b/src/views/system/base/map.vue index a914b54..aee902d 100644 --- a/src/views/system/base/map.vue +++ b/src/views/system/base/map.vue @@ -1,13 +1,45 @@ @@ -23,7 +55,7 @@ const draw = (value) => { - + { :auto-clear="true" @draw="draw" /> + + + + + + + +
diff --git a/src/views/system/base/mapMarkers.vue b/src/views/system/base/mapMarkers.vue new file mode 100644 index 0000000..c57e38a --- /dev/null +++ b/src/views/system/base/mapMarkers.vue @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file