diff --git a/main/.env.development b/main/.env.development index a332768..328aab0 100644 --- a/main/.env.development +++ b/main/.env.development @@ -12,5 +12,6 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080'//线下测试 VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' \ No newline at end of file diff --git a/main/src/views/login/index.vue b/main/src/views/login/index.vue index a11cc1a..78e67eb 100644 --- a/main/src/views/login/index.vue +++ b/main/src/views/login/index.vue @@ -16,7 +16,7 @@ - + 记住密码 @@ -61,13 +61,13 @@ export default { username: 'admin', password: 'admin123', rememberMe: false, - code: '', + code: '1', uuid: '', }, loginRules: { username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }], - code: [{ required: true, trigger: 'change', message: '请输入验证码' }], + // code: [{ required: true, trigger: 'change', message: '请输入验证码' }], }, loading: false, // 验证码开关 diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 187aabc..ec64d21 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -6,5 +6,7 @@ VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-government-affairs-service' VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.14:8080' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.14:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index fa327e9..63cf3cc 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,7 +1,8 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' -VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +# VITE_APP_MIAN_URL = 'http://47.109.205.240:88' +VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/src/assets/images/logo.png b/sub-government-affairs-service/src/assets/images/logo.png new file mode 100644 index 0000000..3d7da94 Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/logo.png differ diff --git a/sub-government-affairs-service/src/layouts/component/Logo/index.vue b/sub-government-affairs-service/src/layouts/component/Logo/index.vue index 1fda7e2..9462ca9 100644 --- a/sub-government-affairs-service/src/layouts/component/Logo/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Logo/index.vue @@ -7,8 +7,8 @@ --> @@ -43,5 +43,9 @@ const { VITE_APP_TITLE } = import.meta.env; line-height: 35px; color: $color-primary; } + .logo-picture { + width: 100%; + height: 50px; + } } diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 9ac3c03..5e19252 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -47,10 +47,10 @@ export const constantRoutes = [ ...resourceRouter, ...productOperateMainRoutes, ...inputSuppliesRoutes, - produceGoods, - ...plantingAndBreedingRouter, + // produceGoods, + // ...plantingAndBreedingRouter, ...traceRouter, - ...systemRouter, + // ...systemRouter, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index b4a21d2..7274aca 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -34,30 +34,30 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), meta: { title: '肥料管理', icon: '' }, }, - { - path: '/sub-government-affairs-service/material/pesticide', - name: 'input-supplies-pesticide', - component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/material/ratPoison', - name: 'input-supplies-ratPoison', - component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), - meta: { title: '兽药管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/material/pesticide', + // name: 'input-supplies-pesticide', + // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + // meta: { title: '农药管理', icon: '' }, + // }, + // { + // path: '/sub-government-affairs-service/material/ratPoison', + // name: 'input-supplies-ratPoison', + // component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), + // meta: { title: '兽药管理', icon: '' }, + // }, { path: '/sub-government-affairs-service/material/seed', name: 'input-supplies-seed', component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种源管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/material/farmMachinery', - name: 'input-supplies-farmMachinery', - component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), - meta: { title: '农机管理', icon: '' }, + meta: { title: '种子管理', icon: '' }, }, + // { + // path: '/sub-government-affairs-service/material/farmMachinery', + // name: 'input-supplies-farmMachinery', + // component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), + // meta: { title: '农机管理', icon: '' }, + // }, ], }, { @@ -72,12 +72,12 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), meta: { title: '企业经销商抽检', icon: '' }, }, - { - path: '/sub-government-affairs-service/useSupervise', - name: 'useSupervise', - component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), - meta: { title: '使用监管', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/useSupervise', + // name: 'useSupervise', + // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), + // meta: { title: '使用监管', icon: '' }, + // }, { path: '/sub-government-affairs-service/leaseSupervise', name: 'leaseSupervise', diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js index 8ec8eb7..eecb357 100644 --- a/sub-government-affairs-service/src/router/modules/productOperateMain.js +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -8,37 +8,37 @@ export default [ redirect: '/sub-government-affairs-service/mainHome', meta: { title: '生产经营主体', icon: 'icon-shop' }, children: [ - { - path: '/sub-government-affairs-service/mainHome', - component: () => import('@/views/productOperateMain/home/index.vue'), - name: 'mainHome', - meta: { title: '数据可视化管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/mainHome', + // component: () => import('@/views/productOperateMain/home/index.vue'), + // name: 'mainHome', + // meta: { title: '数据可视化管理', icon: '' }, + // }, { path: '/sub-government-affairs-service/individual', component: () => import('@/views/productOperateMain/individual/index.vue'), name: 'individual', - meta: { title: '个体户', icon: '' }, - }, - { - path: '/sub-government-affairs-service/collective', - component: () => import('@/views/productOperateMain/collective/index.vue'), - name: 'collective', - meta: { title: '村集体', icon: '' }, + meta: { title: '农户', icon: '' }, }, + // { + // path: '/sub-government-affairs-service/collective', + // component: () => import('@/views/productOperateMain/collective/index.vue'), + // name: 'collective', + // meta: { title: '村集体', icon: '' }, + // }, { path: '/sub-government-affairs-service/coop', component: () => import('@/views/productOperateMain/coOp/index.vue'), name: 'coop', - meta: { title: '合作社', icon: '' }, - }, - { - path: '/sub-government-affairs-service/enterprise', - component: () => import('@/views/productOperateMain/enterprise/index.vue'), - name: 'enterprise', - meta: { title: '经营企业', icon: '' }, + meta: { title: '农企合作社', icon: '' }, }, // { + // path: '/sub-government-affairs-service/enterprise', + // component: () => import('@/views/productOperateMain/enterprise/index.vue'), + // name: 'enterprise', + // meta: { title: '经营企业', icon: '' }, + // }, + // { // path: '/sub-government-affairs-service/individual', // component: () => import('@/views/productOperateMain/individual/index.vue'), // name: 'individual', diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index cc07d30..570c443 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -31,17 +31,17 @@ export default [ name: 'member', meta: { title: '新增网格员', icon: '' }, }, - { - path: '/sub-government-affairs-service/grid--management', - component: () => import('@/views/resource/grid/GridManagement.vue'), - name: 'management', - meta: { title: '网格化管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/grid--management', + // component: () => import('@/views/resource/grid/GridManagement.vue'), + // name: 'management', + // meta: { title: '网格化管理', icon: '' }, + // }, ], }, ...annualplanRouters, ...landsRoutes, - ...statisticsRoutes, + // ...statisticsRoutes, ...dictRoutes, ], }, diff --git a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js index 870447c..cfe4464 100644 --- a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js +++ b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js @@ -8,12 +8,12 @@ export default [ redirect: '/sub-government-affairs-service/analysis-land', meta: { title: '统计分析', icon: 'icon-test' }, children: [ - { - path: '/sub-government-affairs-service/analysis-land', - component: () => import('@/views/resource/statisticAnalysis/land/index.vue'), - name: 'analysis-land', - meta: { title: '土地利用与规划分析', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/analysis-land', + // component: () => import('@/views/resource/statisticAnalysis/land/index.vue'), + // name: 'analysis-land', + // meta: { title: '土地利用与规划分析', icon: '' }, + // }, { path: '/sub-government-affairs-service/analysis-agriculture', name: 'analysis-agriculture', diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js index c223a69..ee74665 100644 --- a/sub-government-affairs-service/src/router/modules/trace.js +++ b/sub-government-affairs-service/src/router/modules/trace.js @@ -13,7 +13,7 @@ export default [ path: '/sub-government-affairs-service/record', name: 'record', component: Views, - meta: { title: '种养植档案', icon: 'Tickets' }, + meta: { title: '种植档案', icon: 'Tickets' }, redirect: '/sub-government-affairs-service/record-base', children: [ { @@ -26,7 +26,7 @@ export default [ path: '/sub-government-affairs-service/record-seed', component: () => import('@/views/trace/record/seed/index.vue'), name: 'record-seed', - meta: { title: '种源档案', icon: '' }, + meta: { title: '种子档案', icon: '' }, }, ], }, diff --git a/sub-government-affairs-service/src/views/home/index.vue b/sub-government-affairs-service/src/views/home/index.vue index 78ebb27..b3888ca 100644 --- a/sub-government-affairs-service/src/views/home/index.vue +++ b/sub-government-affairs-service/src/views/home/index.vue @@ -6,13 +6,13 @@ 综合数据统计 -

农村人口

+

人口

万人

耕地面积

- + 万亩
@@ -38,7 +38,8 @@ - + + @@ -51,14 +52,15 @@ - - - - - + + @@ -85,11 +87,11 @@ const state = reactive({ }, yAxis: { type: 'value', - name: '亩', + name: '万亩', }, tooltip: { formatter: function (params) { - return `${params.name}:${params.value}亩`; + return `${params.name}:${params.value}万亩`; }, }, barStyle: { @@ -101,16 +103,16 @@ const state = reactive({ }, }, areaData: [ - { value: 230, name: '耿马镇' }, - { value: 165, name: '勐永镇' }, - { value: 217, name: '勐撒镇' }, - { value: 200, name: '孟定镇' }, - { value: 305, name: '大兴乡' }, + { value: 2, name: '耿马镇' }, + { value: 6, name: '勐永镇' }, + { value: 4, name: '勐撒镇' }, + { value: 2, name: '孟定镇' }, + { value: 3, name: '大兴乡' }, ], breedingOption: { color: ['#41b879', '#fed500'], title: { - text: '种养殖综合数据统计', + text: '种殖综合数据统计', textStyle: { color: '#333', }, @@ -131,9 +133,9 @@ const state = reactive({ }, breedingData: [ { value: 230, name: '种植面积', unit: '亩' }, - { value: 165, name: '养殖面积', unit: '亩' }, + // { value: 165, name: '养殖面积', unit: '亩' }, { value: 217, name: '种植基地', unit: '个' }, - { value: 200, name: '养殖基地', unit: '个' }, + // { value: 200, name: '养殖基地', unit: '个' }, ], inputsOption: { color: ['#ffd500'], @@ -192,9 +194,9 @@ const state = reactive({ }, inputsData: [ { value: 75, name: '农药使用', type: '投入品', max: 100, unit: '吨' }, - { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' }, - { value: 74, name: '种源使用', type: '投入品', max: 100, unit: '万吨' }, - { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' }, + // { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' }, + { value: 74, name: '种子使用', type: '投入品', max: 100, unit: '吨' }, + // { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' }, { value: 65, name: '肥料使用', type: '投入品', max: 100, unit: '吨' }, ], businessOption: { @@ -233,12 +235,12 @@ const state = reactive({ ], }, businessData: [ - { value: 28, name: '个体户' }, - { value: 358, name: '村集体' }, - { value: 217, name: '合作社' }, - { value: 128, name: '农资企业' }, - { value: 22, name: '种源企业' }, - { value: 41, name: '生产加工企业' }, + { value: 217, name: '农户' }, + // { value: 358, name: '村集体' }, + { value: 28, name: '农企/合作社' }, + // { value: 128, name: '农资企业' }, + // { value: 22, name: '种源企业' }, + // { value: 41, name: '生产加工企业' }, ], codingOption: { color: ['#41b879', '#ffd500'], diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue index fc4c94f..2ab2ba9 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue @@ -21,7 +21,8 @@ @row-update="handleRowUpdate" > @@ -154,16 +155,65 @@ async function getData(resetPage) { searchCondition.value ); console.log('params', params); - for (let i = 0; i < 14; i++) { - data.value.push({ - taskNum: '20220101' + `${i}${i}${i}${i}${i}`, - taskType: i % 2 == 0 ? '0' : '1', - enterpriseName: '上海XX有限公司', - enterpriseOwner: '张三', - phone: '123456789', - status: i % 2 == 0 ? '0' : '1', - }); - } + data.value = [ + { + taskNum: '202451211', + taskType: '0', + enterpriseName: '合肥丰乐种业股份有限公司', + enterpriseOwner: '戴登安', + phone: '18785733748', + status: '0', + }, + { + taskNum: '202471241', + taskType: '0', + enterpriseName: '山东登海种业股份有限公司', + enterpriseOwner: '唐世伟', + phone: '18785733748', + status: '0', + }, + { + taskNum: '2024111241', + taskType: '0', + enterpriseName: '甘肃省敦煌种业股份有限公司', + enterpriseOwner: '李世晓', + phone: '15685474526', + status: '0', + }, + { + taskNum: '2024112244', + taskType: '1', + enterpriseName: '河南秋乐种业科技股份有限公司', + enterpriseOwner: '侯传伟', + phone: '17485693256', + status: '1', + }, + { + taskNum: '2024122242', + taskType: '0', + enterpriseName: '安徽荃银高科种业股份有限公司', + enterpriseOwner: '应敏杰', + phone: '18423568745', + status: '0', + }, + { + taskNum: '2024122242', + taskType: '0', + enterpriseName: '辽宁东亚种业有限公司', + enterpriseOwner: '杨永华', + phone: '15236989568', + status: '0', + }, + { + taskNum: '202472255', + taskType: '0', + enterpriseName: '云南广大种业有限公司', + enterpriseOwner: '王云贵', + phone: '13888965335', + status: '0', + }, + ]; + pageData.value.total = data.value.length; _loading.value = false; } diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue index b17c05f..b5cae96 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue @@ -1,6 +1,6 @@