From a1501c143bbf3c6686c09b628b5337c08bc43b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= Date: Tue, 27 May 2025 17:13:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=9C=9F=E5=9C=B0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86)-=E5=90=84=E8=A1=A8=E6=A0=BC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B7=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/.env.development | 6 +- .../.env.development | 2 +- .../src/router/modules/dict.js | 12 +- .../src/router/modules/lands.js | 36 +++--- .../src/router/modules/resource.js | 12 +- .../component/annualPlans/index.vue | 36 +++--- .../src/views/resource/grid/AddGrid.vue | 111 +++++++----------- .../src/views/resource/grid/GridMember.vue | 24 ++-- 8 files changed, 110 insertions(+), 129 deletions(-) diff --git a/main/.env.development b/main/.env.development index 422e1d4..58bdec5 100644 --- a/main/.env.development +++ b/main/.env.development @@ -11,7 +11,7 @@ VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/' 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.9:8080' +# VITE_APP_BASE_URL = 'http://47.109.205.2409:8080' +VITE_APP_BASE_URL = 'http://47.109.205.240:8080' VITE_APP_UPLOAD_API = '/uploadApis' -VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' \ No newline at end of file +VITE_APP_UPLOAD_URL = 'http://47.109.205.240:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 34cace5..6b2978c 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -6,7 +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.9:8080' +VITE_APP_BASE_URL = 'http://47.109.205.240: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/src/router/modules/dict.js b/sub-government-affairs-service/src/router/modules/dict.js index ba5f8c3..c8eea4c 100644 --- a/sub-government-affairs-service/src/router/modules/dict.js +++ b/sub-government-affairs-service/src/router/modules/dict.js @@ -9,12 +9,12 @@ const dictRoutes = [ redirect: '/sub-government-affairs-service/region', meta: { title: '基础信息维护', icon: 'DocumentRemove' }, children: [ - // { - // path: '/sub-government-affairs-service/region', - // name: 'region', - // component: () => import('@/views/dict/component/region/index.vue'), - // meta: { title: '行政信息', icon: '' }, - // }, + { + path: '/sub-government-affairs-service/region', + name: 'region', + component: () => import('@/views/dict/component/region/index.vue'), + meta: { title: '行政信息', icon: '' }, + }, { path: '/sub-government-affairs-service/landCassification', name: 'landCassification', diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js index 6a9057c..8cb3648 100644 --- a/sub-government-affairs-service/src/router/modules/lands.js +++ b/sub-government-affairs-service/src/router/modules/lands.js @@ -9,24 +9,24 @@ const landsRoutes = [ redirect: '/sub-government-affairs-service/plantPlan', meta: { title: '土地管理', icon: 'Grape' }, children: [ - // { - // path: '/sub-government-affairs-service/landsManage', - // name: 'landsManage', - // component: () => import('@/views/landManage/component/landsManage/index.vue'), - // meta: { title: '土地信息登记', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/plantPlan', - // name: 'plantPlan', - // component: () => import('@/views/landManage/component/plantPlan/index.vue'), - // meta: { title: '种植计划', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/operationRecord', - // name: 'operationRecord', - // component: () => import('@/views/landManage/component/operationRecord/index.vue'), - // meta: { title: '作业记录', icon: '' }, - // }, + { + path: '/sub-government-affairs-service/landsManage', + name: 'landsManage', + component: () => import('@/views/landManage/component/landsManage/index.vue'), + meta: { title: '土地信息登记', icon: '' }, + }, + { + path: '/sub-government-affairs-service/plantPlan', + name: 'plantPlan', + component: () => import('@/views/landManage/component/plantPlan/index.vue'), + meta: { title: '种植计划', icon: '' }, + }, + { + path: '/sub-government-affairs-service/operationRecord', + name: 'operationRecord', + component: () => import('@/views/landManage/component/operationRecord/index.vue'), + meta: { title: '作业记录', icon: '' }, + }, { path: '/sub-government-affairs-service/landPartol', name: 'landPartol', diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index 329abfb..3a5ff78 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -31,12 +31,12 @@ 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, diff --git a/sub-government-affairs-service/src/views/annualPlan/component/annualPlans/index.vue b/sub-government-affairs-service/src/views/annualPlan/component/annualPlans/index.vue index 7c9bc3f..54508a8 100644 --- a/sub-government-affairs-service/src/views/annualPlan/component/annualPlans/index.vue +++ b/sub-government-affairs-service/src/views/annualPlan/component/annualPlans/index.vue @@ -116,7 +116,7 @@ const state = reactive({ addBtnText: '', addBtn: false, column: [ - { label: '计划编号', prop: 'id', width: '200px', showOverflowTooltip: true, addDisplay: false, editDisplay: false }, + { label: '计划编号', prop: 'id', width: '200px', search: true, showOverflowTooltip: true, addDisplay: false, editDisplay: false }, { label: '计划名称', prop: 'planName', @@ -129,8 +129,9 @@ const state = reactive({ trigger: 'blur', }, }, + { label: '种植作物', prop: 'cop', width: '120px', search: true, editDisplay: false }, { - label: '种植面积（亩）', + label: '种植面积', prop: 'plantingArea', rules: { required: true, @@ -156,7 +157,7 @@ const state = reactive({ }, }, { - label: '生长周期（周）', + label: '生长周期', prop: 'growthCycle', width: '120px', viewDisabled: true, @@ -173,19 +174,22 @@ const state = reactive({ }, }, }, - { - label: '备注', - prop: 'note', - width: '180px', - showOverflowTooltip: true, - rules: { - required: true, - message: '请输入', - trigger: 'blur', - }, - }, - { label: '计划进度', prop: 'planProgress', addDisplay: false, editDisplay: false }, - { label: '状态', prop: 'planStatus', addDisplay: false, editDisplay: false }, + { label: '所属行政区域', prop: 'cop1', width: '120px', search: true, searchLabelWidth: 100, addDisplay: false, editDisplay: false }, + { label: '所属网格', prop: 'cop2', width: '120px', search: true, addDisplay: false, editDisplay: false }, + { label: '当前进度', prop: 'cop3', width: '120px', addDisplay: false, editDisplay: false }, + // { + // label: '备注', + // prop: 'note', + // width: '180px', + // showOverflowTooltip: true, + // rules: { + // required: true, + // message: '请输入', + // trigger: 'blur', + // }, + // }, + // { label: '计划进度', prop: 'planProgress', addDisplay: false, editDisplay: false }, + // { label: '状态', prop: 'planStatus', addDisplay: false, editDisplay: false }, ], actions: [ { diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue index d5fdc7d..7cb831e 100644 --- a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue +++ b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue @@ -51,26 +51,11 @@ const state = reactive({ selection: [], options: { ...CRUD_OPTIONS, - // addBtnText: '添加网格', + addBtnText: '添加网格', column: [ - // { - // label: '网格区', - // prop: 'gridArea', - // search: true, - // width: 200, - // addDisplay: false, - // editDisplay: false, - // viewDisplay: true, - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', - // }, - // }, { label: '网格名称', prop: 'gridName', - search: true, rules: { required: true, message: '请输入', @@ -78,10 +63,12 @@ const state = reactive({ }, }, { - label: '网格区域', + label: '所属行政区域', prop: 'gridAreaName', // width: 300, display: false, + // search: true, + searchLabelWidth: 100, rules: { required: true, message: '请输入', @@ -89,18 +76,17 @@ const state = reactive({ }, }, { - label: '网格区域', + label: '所属行政区域', prop: 'cities', type: 'cascader', hide: true, + search: true, + searchLabelWidth: 100, + span: 24, + width: 300, addDisplay: true, editDisplay: true, viewDisplay: false, - // multiple: true, - // checkStrictly: true, - // collapseTags: true, - // emitPath: false, - // checkDescendants: false, props: { label: 'areaName', value: 'areaCode', @@ -117,54 +103,45 @@ const state = reactive({ trigger: 'blur', }, }, + { + label: '网格名称', + prop: 'gridName', + type: 'select', + addDisplay: false, + hide: true, + search: true, + searchLabelWidth: 100, + }, // { - // label: '网格管理员', - // prop: 'gridManager', - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', - // }, + // label: '省', + // prop: 'provinceCode', + // hide: true, + // display: false, // }, // { - // label: '联系方式', - // prop: 'contactInfo', - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', - // }, + // label: '市', + // prop: 'cityCode', + // hide: true, + // display: false, + // }, + // { + // label: '县/区', + // prop: 'gridAreaCode', + // hide: true, + // display: false, + // }, + // { + // label: '乡镇', + // prop: 'townCode', + // hide: true, + // display: false, + // }, + // { + // label: '乡镇', + // prop: 'village', + // hide: true, + // display: false, // }, - { - label: '省', - prop: 'provinceCode', - hide: true, - display: false, - }, - { - label: '市', - prop: 'cityCode', - hide: true, - display: false, - }, - { - label: '县/区', - prop: 'gridAreaCode', - hide: true, - display: false, - }, - { - label: '乡镇', - prop: 'townCode', - hide: true, - display: false, - }, - { - label: '乡镇', - prop: 'village', - hide: true, - display: false, - }, { label: '备注', prop: 'note', diff --git a/sub-government-affairs-service/src/views/resource/grid/GridMember.vue b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue index 97488c6..642b086 100644 --- a/sub-government-affairs-service/src/views/resource/grid/GridMember.vue +++ b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue @@ -82,7 +82,7 @@ const state = reactive({ type: 'select', width: 200, search: true, - dicData: [], // 初始为空，将在mounted中填充 + dicData: [], // loadGridOptions 方法加载网格数据 props: { label: 'gridName', value: 'id', @@ -93,17 +93,17 @@ const state = reactive({ trigger: 'change', }, }, - { - label: '管理员标识', - prop: 'adminFlag', - type: 'radio', - dicData: [ - { label: '是', value: '1' }, - { label: '否', value: '0' }, - ], - valueDefault: '0', - hide: true, // 隐藏字段，如需显示可设置为false - }, + // { + // label: '管理员标识', + // prop: 'adminFlag', + // type: 'radio', + // dicData: [ + // { label: '是', value: '1' }, + // { label: '否', value: '0' }, + // ], + // valueDefault: '0', + // hide: true, // 隐藏字段，如需显示可设置为false + // }, { label: '电话号码', prop: 'phone',