diff --git a/sub-operation-service/src/assets/images/comfig.png b/sub-operation-service/src/assets/images/comfig.png new file mode 100644 index 0000000..d5070eb Binary files /dev/null and b/sub-operation-service/src/assets/images/comfig.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/01.png b/sub-operation-service/src/assets/images/farmingService/01.png new file mode 100644 index 0000000..b571eba Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/01.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/02.png b/sub-operation-service/src/assets/images/farmingService/02.png new file mode 100644 index 0000000..94b7bde Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/02.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/03.png b/sub-operation-service/src/assets/images/farmingService/03.png new file mode 100644 index 0000000..9368c63 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/03.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/04.png b/sub-operation-service/src/assets/images/farmingService/04.png new file mode 100644 index 0000000..c886db6 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/04.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/05.png b/sub-operation-service/src/assets/images/farmingService/05.png new file mode 100644 index 0000000..b429a87 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/05.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/06.png b/sub-operation-service/src/assets/images/farmingService/06.png new file mode 100644 index 0000000..4876197 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/06.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/07.png b/sub-operation-service/src/assets/images/farmingService/07.png new file mode 100644 index 0000000..c112d8e Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/07.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/08.png b/sub-operation-service/src/assets/images/farmingService/08.png new file mode 100644 index 0000000..a521fb9 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/08.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/09.png b/sub-operation-service/src/assets/images/farmingService/09.png new file mode 100644 index 0000000..5ad5bf2 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/09.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/10.png b/sub-operation-service/src/assets/images/farmingService/10.png new file mode 100644 index 0000000..ccdca44 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/10.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/11.png b/sub-operation-service/src/assets/images/farmingService/11.png new file mode 100644 index 0000000..1a30091 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/11.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/12.png b/sub-operation-service/src/assets/images/farmingService/12.png new file mode 100644 index 0000000..de8d0b2 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/12.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/13.png b/sub-operation-service/src/assets/images/farmingService/13.png new file mode 100644 index 0000000..516fb36 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/13.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/email.png b/sub-operation-service/src/assets/images/farmingService/email.png new file mode 100644 index 0000000..1591297 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/email.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/man.png b/sub-operation-service/src/assets/images/farmingService/man.png new file mode 100644 index 0000000..b16d743 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/man.png differ diff --git a/sub-operation-service/src/assets/images/farmingService/phone.png b/sub-operation-service/src/assets/images/farmingService/phone.png new file mode 100644 index 0000000..a057a95 Binary files /dev/null and b/sub-operation-service/src/assets/images/farmingService/phone.png differ diff --git a/sub-operation-service/src/assets/images/nj1.png b/sub-operation-service/src/assets/images/nj1.png new file mode 100644 index 0000000..55c0cab Binary files /dev/null and b/sub-operation-service/src/assets/images/nj1.png differ diff --git a/sub-operation-service/src/assets/images/nj2.png b/sub-operation-service/src/assets/images/nj2.png new file mode 100644 index 0000000..5fa55f2 Binary files /dev/null and b/sub-operation-service/src/assets/images/nj2.png differ diff --git a/sub-operation-service/src/assets/images/nj3.png b/sub-operation-service/src/assets/images/nj3.png new file mode 100644 index 0000000..f9790af Binary files /dev/null and b/sub-operation-service/src/assets/images/nj3.png differ diff --git a/sub-operation-service/src/assets/images/nx.png b/sub-operation-service/src/assets/images/nx.png new file mode 100644 index 0000000..4279cc3 Binary files /dev/null and b/sub-operation-service/src/assets/images/nx.png differ diff --git a/sub-operation-service/src/assets/images/or.png b/sub-operation-service/src/assets/images/or.png new file mode 100644 index 0000000..4279cc3 Binary files /dev/null and b/sub-operation-service/src/assets/images/or.png differ diff --git a/sub-operation-service/src/assets/images/pf.png b/sub-operation-service/src/assets/images/pf.png new file mode 100644 index 0000000..b3db62d Binary files /dev/null and b/sub-operation-service/src/assets/images/pf.png differ diff --git a/sub-operation-service/src/assets/images/us.png b/sub-operation-service/src/assets/images/us.png new file mode 100644 index 0000000..4d0bd87 Binary files /dev/null and b/sub-operation-service/src/assets/images/us.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 04cae76..c766da3 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -200,99 +200,90 @@ export const constantRoutes = [ path: '/sub-operation-service/farmService', component: Layout, name: 'farmService', - redirect: '/sub-operation-service/farmService/consult/laborServices', + redirect: '/sub-operation-service/farmService/farmPolicy', meta: { title: '农事服务' }, children: [ + // { + // path: 'policy', + // component: Views, + // name: 'farmPolicys', + // meta: { title: '劳务用工' }, + // children: [ + // { + // path: '', + // component: () => import('@/views/farmingService/farmingConsult/index.vue'), + // name: 'farmPolicy', + // meta: { title: '农业政策', hideInBread: true }, + // }, + // { + // path: 'detail', + // component: () => import('@/views/farmingService/farmingConsult/policyDetail.vue'), + // name: 'farmPolicyDetail', + // meta: { title: '农业政策详情' }, + // }, + // ], + // }, { - path: 'consult', - component: Views, - redirect: '/sub-operation-service/farmService/consult/laborServices', - name: 'farmServiceMain', - meta: { title: '农事' }, - children: [ - // { - // path: 'policy', - // component: Views, - // name: 'farmPolicys', - // meta: { title: '劳务用工' }, - // children: [ - // { - // path: '', - // component: () => import('@/views/farmingService/farmingConsult/index.vue'), - // name: 'farmPolicy', - // meta: { title: '农业政策', hideInBread: true }, - // }, - // { - // path: 'detail', - // component: () => import('@/views/farmingService/farmingConsult/policyDetail.vue'), - // name: 'farmPolicyDetail', - // meta: { title: '农业政策详情' }, - // }, - // ], - // }, - { - path: 'farmPolicy', - component: () => import('@/views/farmingService/farmingConsult/index.vue'), - name: 'farmPolicy', - meta: { title: '农业政策', hideInBread: true }, - }, - { - path: 'farmPolicyDetail', - component: () => import('@/views/farmingService/farmingConsult/policyDetail.vue'), - name: 'farmPolicyDetail', - meta: { title: '农业政策详情' }, - }, - { - path: 'laborServices', - component: () => import('@/views/farmingService/farmingConsult/laborServices.vue'), - // component: Views, - name: 'laborServices', - meta: { title: '劳务用工' }, - }, - { - path: 'laborServicesDel', - component: () => import('@/views/farmingService/farmingConsult/laborServicesDel.vue'), - name: 'laborServicesDel', - meta: { title: '劳务用工详情页' }, - }, - { - path: 'agriculturalMachinery', - component: () => import('@/views/farmingService/farmingConsult/agriculturalMachinery.vue'), - name: 'agriculturalMachinery', - meta: { title: '农机服务' }, - }, - { - path: 'agriculturalMachineryDel', - component: () => import('@/views/farmingService/farmingConsult/agriculturalMachineryDel.vue'), - name: 'agriculturalMachineryDel', - meta: { title: '农机服务详情' }, - }, - { - path: 'agriculturalTechnology', - component: () => import('@/views/farmingService/farmingConsult/agriculturalTechnology.vue'), - name: 'agriculturalTechnology', - meta: { title: '农技服务' }, - }, - { - path: 'agriculturalTechnologyDel', - component: () => import('@/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue'), - name: 'agriculturalTechnologyDel', - meta: { title: '农技服务详情页' }, - }, - // { - // path: 'technology', - // component: () => import('@/views/farmingService/farmingConsult/farmingTec.vue'), - // name: 'farmTechnology', - // meta: { title: '农事技术' }, - // }, - // { - // path: 'situation', - // component: () => import('@/views/farmingService/farmingConsult/situation.vue'), - // name: 'farmSituation', - // meta: { title: '市场行情' }, - // }, - ], + path: '/sub-operation-service/farmService/farmPolicy', + component: () => import('@/views/farmingService/farmingConsult/index.vue'), + name: 'farmPolicy', + meta: { title: '农业政策', hideInBread: true }, }, + { + path: '/sub-operation-service/farmService/farmPolicyDetail', + component: () => import('@/views/farmingService/farmingConsult/policyDetail.vue'), + name: 'farmPolicyDetail', + meta: { title: '农业政策详情' }, + }, + { + path: 'laborServices', + component: () => import('@/views/farmingService/farmingConsult/laborServices.vue'), + // component: Views, + name: 'laborServices', + meta: { title: '劳务用工' }, + }, + { + path: 'laborServicesDel', + component: () => import('@/views/farmingService/farmingConsult/laborServicesDel.vue'), + name: 'laborServicesDel', + meta: { title: '劳务用工详情页' }, + }, + { + path: 'agriculturalMachinery', + component: () => import('@/views/farmingService/farmingConsult/agriculturalMachinery.vue'), + name: 'agriculturalMachinery', + meta: { title: '农机服务' }, + }, + { + path: 'agriculturalMachineryDel', + component: () => import('@/views/farmingService/farmingConsult/agriculturalMachineryDel.vue'), + name: 'agriculturalMachineryDel', + meta: { title: '农机服务详情' }, + }, + { + path: 'agriculturalTechnology', + component: () => import('@/views/farmingService/farmingConsult/agriculturalTechnology.vue'), + name: 'agriculturalTechnology', + meta: { title: '农技服务' }, + }, + { + path: 'agriculturalTechnologyDel', + component: () => import('@/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue'), + name: 'agriculturalTechnologyDel', + meta: { title: '农技服务详情页' }, + }, + // { + // path: 'technology', + // component: () => import('@/views/farmingService/farmingConsult/farmingTec.vue'), + // name: 'farmTechnology', + // meta: { title: '农事技术' }, + // }, + // { + // path: 'situation', + // component: () => import('@/views/farmingService/farmingConsult/situation.vue'), + // name: 'farmSituation', + // meta: { title: '市场行情' }, + // }, ], }, { diff --git a/sub-operation-service/src/views/farmingService/components/leftMenu.vue b/sub-operation-service/src/views/farmingService/components/leftMenu.vue index 728d8dc..8e9bdaf 100644 --- a/sub-operation-service/src/views/farmingService/components/leftMenu.vue +++ b/sub-operation-service/src/views/farmingService/components/leftMenu.vue @@ -51,25 +51,25 @@ const leftMenu = reactive([ name: 'farmPolicy', title: '农业政策', icon: 'menu1.png', - path: '/sub-operation-service/farmService/consult/farmPolicy', + path: '/sub-operation-service/farmService/farmPolicy', }, { name: 'laborServices', title: '劳务用工', icon: 'menu1.png', - path: '/sub-operation-service/farmService/consult/laborServices', + path: '/sub-operation-service/farmService/laborServices', }, { name: 'agriculturalMachinery', title: '农机服务', icon: 'menu1.png', - path: '/sub-operation-service/farmService/consult/agriculturalMachinery', + path: '/sub-operation-service/farmService/agriculturalMachinery', }, { name: 'agriculturalTechnology', title: '农技服务', icon: 'menu1.png', - path: '/sub-operation-service/farmService/consult/agriculturalTechnology', + path: '/sub-operation-service/farmService/agriculturalTechnology', }, //farmPolicy @@ -84,19 +84,19 @@ const leftMenu = reactive([ // name: 'laborServices', // title: '劳务用工', // icon: 'menu1.png', - // path: '/sub-operation-service/farmService/consult/laborServices', + // path: '/sub-operation-service/farmService/laborServices', // }, // { // name: 'agriculturalMachinery', // title: '农机服务', // icon: 'menu1.png', - // path: '/sub-operation-service/farmService/consult/agriculturalMachinery', + // path: '/sub-operation-service/farmService/agriculturalMachinery', // }, // { // name: 'agriculturalTechnology', // title: '农技服务', // icon: 'menu1.png', - // path: '/sub-operation-service/farmService/consult/agriculturalTechnology', + // path: '/sub-operation-service/farmService/agriculturalTechnology', // }, // ], // }, @@ -186,7 +186,7 @@ onMounted(() => { } } const currentChild = window.sessionStorage.getItem('currentChild'); - if (currentChild && currentChild === 'main') { + if (currentChild && currentChild === 'farmPolicy') { currentIndex.value = 0; currentCIndex.value = ''; } else if (currentChild) { diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue index 9a561a2..9f1db58 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue @@ -214,7 +214,7 @@ const goDetail = (id) => { // message: '功能正在维护中,请稍后点击', // type: 'warning', // }); - router.push('/sub-operation-service/farmService/consult/agriculturalMachineryDel?id=' + id); + router.push('/sub-operation-service/farmService/agriculturalMachineryDel?id=' + id); }; // #endregion diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnology.vue b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnology.vue index 1ec6910..97447b9 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnology.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnology.vue @@ -219,7 +219,7 @@ const goDetail = (id) => { // message: '功能正在维护中,请稍后点击', // type: 'warning', // }); - router.push('/sub-operation-service/farmService/consult/agriculturalTechnologyDel?id=' + id); + router.push('/sub-operation-service/farmService/agriculturalTechnologyDel?id=' + id); }; // #endregion @@ -236,7 +236,7 @@ const goDetail = (id) => { .card-item { display: flex; justify-content: space-between; - margin: 20px 0; + margin: 10px 0 0 0; text-align: left; } .choose { diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue index 92920f4..0b280da 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue @@ -18,54 +18,63 @@