diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 09a389f..68027fc 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -1,6 +1,6 @@ import actions from './actions'; -const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; +const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; export const leftApps = [ { @@ -12,7 +12,7 @@ export const leftApps = [ }, { name: 'sub-operation-admin', - entry: VITE_APP_SUB_OS, + entry: VITE_APP_SUB_OA, activeRule: '/sub-operation-admin', title: '管理后台', icon: 'images/platform/icon-admin.png', @@ -77,7 +77,7 @@ export const defaultApps = [ }, { name: 'sub-operation-admin', - entry: VITE_APP_SUB_OS, + entry: VITE_APP_SUB_OA, activeRule: '/sub-operation-admin', title: '运营管理后台', icon: 'images/platform/icon-admin.png', diff --git a/new-digital-agriculture-screen/src/views/trace/components/detectionCharts.vue b/new-digital-agriculture-screen/src/views/trace/components/detectionCharts.vue index 028e384..fa463bb 100644 --- a/new-digital-agriculture-screen/src/views/trace/components/detectionCharts.vue +++ b/new-digital-agriculture-screen/src/views/trace/components/detectionCharts.vue @@ -26,18 +26,18 @@
溯源信息
- - - - - - - - - - - - + + + + + + + + + + + +
新鲜{{ info.productType }}
diff --git a/sub-operation-admin/index.html b/sub-operation-admin/index.html index e1d7b64..4844de2 100644 --- a/sub-operation-admin/index.html +++ b/sub-operation-admin/index.html @@ -5,7 +5,7 @@ - 政务服务 + 运营服务 @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/sub-operation-service/src/assets/images/userCenter/weweima.png b/sub-operation-service/src/assets/images/userCenter/weweima.png new file mode 100644 index 0000000..1e9d6bc Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/weweima.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/检测报告.png b/sub-operation-service/src/assets/images/userCenter/检测报告.png new file mode 100644 index 0000000..69f9336 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/检测报告.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png b/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png new file mode 100644 index 0000000..27ac5b2 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png b/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png new file mode 100644 index 0000000..a14e4f8 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/messageBox.png b/sub-operation-service/src/assets/images/warehouseLogistics/messageBox.png new file mode 100644 index 0000000..2dc2daf Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/messageBox.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/position.png b/sub-operation-service/src/assets/images/warehouseLogistics/position.png new file mode 100644 index 0000000..e0d30f6 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/position.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top1.png b/sub-operation-service/src/assets/images/warehouseLogistics/top1.png new file mode 100644 index 0000000..1422ace Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top1.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top2.png b/sub-operation-service/src/assets/images/warehouseLogistics/top2.png new file mode 100644 index 0000000..dae777c Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top2.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top3.png b/sub-operation-service/src/assets/images/warehouseLogistics/top3.png new file mode 100644 index 0000000..cb8c0f4 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top3.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png b/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png new file mode 100644 index 0000000..fa17cef Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/认证.png b/sub-operation-service/src/assets/images/warehouseLogistics/认证.png new file mode 100644 index 0000000..6125c4b Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/认证.png differ diff --git a/sub-operation-service/src/components/common/leftMenu.vue b/sub-operation-service/src/components/common/leftMenu.vue new file mode 100644 index 0000000..22c780f --- /dev/null +++ b/sub-operation-service/src/components/common/leftMenu.vue @@ -0,0 +1,190 @@ + + + diff --git a/sub-operation-service/src/components/common/modul.js b/sub-operation-service/src/components/common/modul.js new file mode 100644 index 0000000..bf86846 --- /dev/null +++ b/sub-operation-service/src/components/common/modul.js @@ -0,0 +1,27 @@ +import { useGetCommonData } from '../../store/modules/common'; +const store = useGetCommonData(); + +// 仓储 +function createProductA() { + store.getData({ title: '仓储' }); +} + +// 物流 +function createProductB() { + store.getData1({ title: '物流' }); +} + +// 工厂函数 +export function productFactory(title) { + switch (title) { + case '仓储': + return createProductA(); + case '物流': + return createProductB(); + default: + throw new Error('未知产品类型'); + } +} + +// 可选:直接导出具体产品构造函数 +export { createProductA, createProductB }; diff --git a/sub-operation-service/src/layouts/component/Menu/SubItem.vue b/sub-operation-service/src/layouts/component/Menu/SubItem.vue index 966e14b..30e215d 100644 --- a/sub-operation-service/src/layouts/component/Menu/SubItem.vue +++ b/sub-operation-service/src/layouts/component/Menu/SubItem.vue @@ -10,14 +10,15 @@ @@ -30,6 +31,7 @@ import { ref } from 'vue'; // import { isExternal } from '@/utils/validate.js'; import LayoutLink from './Link'; import LayoutIcon from './Icon'; +import { getAssetsFile } from '@/utils/index.js'; // import path from 'path-browserify'; defineProps({ @@ -65,7 +67,6 @@ const hasOneShowingChild = (children = [], parent) => { onlyOneChild.value = { ...parent, noShowingChildren: true }; return true; } - return false; }; diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 6fbefbd..e1567fa 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -73,6 +73,18 @@ export const constantRoutes = [ name: 'userLands', meta: { title: '我的土地' }, }, + { + path: '/sub-operation-service/mySource', + component: () => import('@/views/userCenter/mySource.vue'), + name: 'mySource', + meta: { title: '我的溯源' }, + }, + { + path: '/sub-operation-service/myFinance', + component: () => import('@/views/userCenter/myFinance.vue'), + name: 'myFinance', + meta: { title: '我的金融' }, + }, ], }, @@ -203,14 +215,20 @@ export const constantRoutes = [ path: '/sub-operation-service/packaging', name: 'packaging', component: Layout, - redirect: '/sub-operation-service/packaging/index', + redirect: '/sub-operation-service/packaging/sorting', meta: { title: '分拣包装' }, children: [ + { + path: '/sub-operation-service/packaging/sorting', + component: () => import('@/views/packaging/sorting.vue'), + name: 'sortingMain', + meta: { title: '分拣首页' }, + }, { path: '/sub-operation-service/packaging/index', component: () => import('@/views/packaging/index.vue'), name: 'packagingMain', - meta: { title: '分拣包装首页' }, + meta: { title: '包装首页' }, }, ], }, @@ -218,14 +236,20 @@ export const constantRoutes = [ path: '/sub-operation-service/warehouseLogistics', name: 'warehouseLogistics', component: Layout, - redirect: '/sub-operation-service/warehouseLogistics/index', + redirect: '/sub-operation-service/warehouse', meta: { title: '仓储物流' }, children: [ { - path: '/sub-operation-service/warehouseLogistics/index', - component: () => import('@/views/warehouseLogistics/index.vue'), - name: 'warehouseLogisticsMain', - meta: { title: '仓储物流首页' }, + path: '/sub-operation-service/warehouse', + component: () => import('@/views/warehouseLogistics/warehouse/index.vue'), + name: 'warehouseMain', + meta: { title: '仓储首页' }, + }, + { + path: '/sub-operation-service/logistics', + component: () => import('@/views/warehouseLogistics/logistics/index.vue'), + name: 'logistics-list', + meta: { title: '物流首页' }, }, ], }, diff --git a/sub-operation-service/src/router/modules/warehouseLogistics.js b/sub-operation-service/src/router/modules/warehouseLogistics.js index 20bdccb..680dc2c 100644 --- a/sub-operation-service/src/router/modules/warehouseLogistics.js +++ b/sub-operation-service/src/router/modules/warehouseLogistics.js @@ -43,7 +43,7 @@ export default [ path: '/sub-operation-service/logistics-list', component: () => import('@/views/warehouseLogistics/logistics/index.vue'), name: 'logistics-list', - meta: { title: '物流列表', icon: '' }, + meta: { title: '物流', icon: '' }, hidden: true, }, { @@ -55,27 +55,27 @@ export default [ }, ], }, - { - path: '/sub-operation-service/test', - component: Views, - redirect: '/sub-operation-service/test1', - name: 'test', - meta: { title: '测试', icon: 'images/ecommerce/menu3.png' }, - children: [ - { - path: '/sub-operation-service/test1', - component: () => import('@/views/warehouseLogistics/test/test1.vue'), - name: 'test1', - meta: { title: '子菜单1', icon: '' }, - }, - { - path: '/sub-operation-service/test2', - component: () => import('@/views/warehouseLogistics/test/test1.vue'), - name: 'test2', - meta: { title: '子菜单2', icon: '' }, - }, - ], - }, + // { + // path: '/sub-operation-service/test', + // component: Views, + // redirect: '/sub-operation-service/test1', + // name: 'test', + // meta: { title: '测试', icon: 'images/ecommerce/menu3.png' }, + // children: [ + // { + // path: '/sub-operation-service/test1', + // component: () => import('@/views/warehouseLogistics/test/test1.vue'), + // name: 'test1', + // meta: { title: '子菜单1', icon: '' }, + // }, + // { + // path: '/sub-operation-service/test2', + // component: () => import('@/views/warehouseLogistics/test/test1.vue'), + // name: 'test2', + // meta: { title: '子菜单2', icon: '' }, + // }, + // ], + // }, ], }, ]; diff --git a/sub-operation-service/src/store/modules/common.js b/sub-operation-service/src/store/modules/common.js new file mode 100644 index 0000000..5e8a1a1 --- /dev/null +++ b/sub-operation-service/src/store/modules/common.js @@ -0,0 +1,22 @@ +import { defineStore } from 'pinia'; +import { constantRoutes, notFoundRouter } from '@/router'; +import { createAsyncRoutes, filterAsyncRoutes, filterKeepAlive } from '@/utils/router'; +import { useUserStore } from '@/store/modules/user'; +import { getTree } from '@/utils'; + +export const useGetCommonData = defineStore('commonData', { + state: () => ({ + data: {}, + }), + actions: { + //仓储调用方法 + getData(res) { + useGetCommonData().$state.data = res; + }, + //物流调用方法 + getData1(res) { + useGetCommonData().$state.data = res; + }, + }, + getters: {}, +}); diff --git a/sub-operation-service/src/styles/style.scss b/sub-operation-service/src/styles/style.scss index 76c03ab..48d4df4 100644 --- a/sub-operation-service/src/styles/style.scss +++ b/sub-operation-service/src/styles/style.scss @@ -3,7 +3,7 @@ @import '@/assets/fonts/aliiconfont.css'; #app { - position: relative; + position: absolute; width: 100%; height: 100%; font-family: Avenir, sans-serif; diff --git a/sub-operation-service/src/views/packaging/components/common.vue b/sub-operation-service/src/views/packaging/components/common.vue new file mode 100644 index 0000000..847afce --- /dev/null +++ b/sub-operation-service/src/views/packaging/components/common.vue @@ -0,0 +1,122 @@ + + + diff --git a/sub-operation-service/src/views/packaging/components/leftMenu.vue b/sub-operation-service/src/views/packaging/components/leftMenu.vue new file mode 100644 index 0000000..a644a56 --- /dev/null +++ b/sub-operation-service/src/views/packaging/components/leftMenu.vue @@ -0,0 +1,192 @@ + + + diff --git a/sub-operation-service/src/views/packaging/sorting.vue b/sub-operation-service/src/views/packaging/sorting.vue new file mode 100644 index 0000000..1583740 --- /dev/null +++ b/sub-operation-service/src/views/packaging/sorting.vue @@ -0,0 +1,256 @@ + + + diff --git a/sub-operation-service/src/views/userCenter/components/common.vue b/sub-operation-service/src/views/userCenter/components/common.vue index 2fedef8..4a581bf 100644 --- a/sub-operation-service/src/views/userCenter/components/common.vue +++ b/sub-operation-service/src/views/userCenter/components/common.vue @@ -24,7 +24,10 @@ const props = defineProps({ diff --git a/sub-operation-service/src/views/userCenter/myFinance.vue b/sub-operation-service/src/views/userCenter/myFinance.vue new file mode 100644 index 0000000..8e41880 --- /dev/null +++ b/sub-operation-service/src/views/userCenter/myFinance.vue @@ -0,0 +1,393 @@ + + + diff --git a/sub-operation-service/src/views/userCenter/mySource.vue b/sub-operation-service/src/views/userCenter/mySource.vue new file mode 100644 index 0000000..a6c5a50 --- /dev/null +++ b/sub-operation-service/src/views/userCenter/mySource.vue @@ -0,0 +1,488 @@ + + + diff --git a/sub-operation-service/src/views/warehouseLogistics/components/common.vue b/sub-operation-service/src/views/warehouseLogistics/components/common.vue new file mode 100644 index 0000000..a89ec32 --- /dev/null +++ b/sub-operation-service/src/views/warehouseLogistics/components/common.vue @@ -0,0 +1,75 @@ + + + diff --git a/sub-operation-service/src/views/warehouseLogistics/components/leftMenu.vue b/sub-operation-service/src/views/warehouseLogistics/components/leftMenu.vue new file mode 100644 index 0000000..f78c0ac --- /dev/null +++ b/sub-operation-service/src/views/warehouseLogistics/components/leftMenu.vue @@ -0,0 +1,192 @@ + + + diff --git a/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue b/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue index 38afccf..a848ceb 100644 --- a/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue +++ b/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue @@ -1,17 +1,18 @@ + diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue index a8bd236..7e957d7 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue @@ -1,53 +1,74 @@