From 0446bcc2ebecb904a9f5151ffdc67362a516b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= Date: Mon, 23 Jun 2025 17:12:01 +0800 Subject: [PATCH 1/3] tag20250623 --- main/.env.development | 6 +- .../components.d.ts | 1 - .../.env.development | 9 +- sub-government-affairs-service/.eslintrc.cjs | 1 + sub-government-affairs-service/package.json | 3 +- .../src/apis/inputSuppliesApi/record.js | 47 ++ .../src/components/AreaCascader/index.vue | 9 +- .../src/config/map.js | 55 ++ sub-government-affairs-service/src/main.js | 7 +- .../src/router/modules/inputSupplies/index.js | 1 - .../variety-record/components/FormDialog.vue | 113 --- .../variety-record/components/RecordForm.vue | 94 +++ .../variety-record/components/RecordPage.vue | 99 ++- .../variety-record/components/SearchBar.vue | 12 +- .../variety-record/mockData.js | 87 +++ .../views/productOperateMain/coOp/index.vue | 20 +- .../productOperateMain/coOp/oldindex.vue | 712 ------------------ .../productOperateMain/individual/index.vue | 31 +- .../src/views/resource/database/LandMap.vue | 403 +++++++++- .../views/resource/database/LandMapBak.vue | 47 ++ sub-government-affairs-service/yarn.lock | 18 + 21 files changed, 871 insertions(+), 904 deletions(-) create mode 100644 sub-government-affairs-service/src/apis/inputSuppliesApi/record.js create mode 100644 sub-government-affairs-service/src/config/map.js delete mode 100644 sub-government-affairs-service/src/views/planting-management/variety-record/components/FormDialog.vue create mode 100644 sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordForm.vue create mode 100644 sub-government-affairs-service/src/views/planting-management/variety-record/mockData.js delete mode 100644 sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue create mode 100644 sub-government-affairs-service/src/views/resource/database/LandMapBak.vue diff --git a/main/.env.development b/main/.env.development index 6687280..7729b29 100644 --- a/main/.env.development +++ b/main/.env.development @@ -13,9 +13,9 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' VITE_APP_BASE_API = '/apis' VITE_APP_UPLOAD_API = '/uploadApis' # 阿里云接口地址 -# VITE_APP_BASE_URL = 'http://47.109.205.240:8080' -# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' +VITE_APP_BASE_URL = 'http://47.109.205.240:8080' +VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # 内网接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.99:8080' # VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' # VITE_APP_VIST_URL = 'http://192.168.18.99' diff --git a/new-digital-agriculture-screen/components.d.ts b/new-digital-agriculture-screen/components.d.ts index ca0fa36..694dcaa 100644 --- a/new-digital-agriculture-screen/components.d.ts +++ b/new-digital-agriculture-screen/components.d.ts @@ -12,7 +12,6 @@ declare module 'vue' { 'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] Components: typeof import('./src/components/index.js')['default'] - copy: typeof import('./src/components/centerMap copy.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 83d7258..a0a3355 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -9,12 +9,13 @@ VITE_APP_BASE_API = '/apis' VITE_APP_UPLOAD_API = '/uploadApis' # 阿里云接口地址 -# VITE_APP_BASE_URL = 'http://47.109.205.240:8080' -# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204' +VITE_APP_BASE_URL = 'http://47.109.205.240:8080' +VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204' # 内网测试库接口地址 # VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' # 本地开发接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.74:8080' -VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' \ No newline at end of file +# VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/.eslintrc.cjs b/sub-government-affairs-service/.eslintrc.cjs index 974ba1b..04d04c5 100644 --- a/sub-government-affairs-service/.eslintrc.cjs +++ b/sub-government-affairs-service/.eslintrc.cjs @@ -50,6 +50,7 @@ module.exports = { defineEmits: 'readonly', defineExpose: 'readonly', withDefaults: 'readonly', + T: 'readonly', }, // 这里时配置规则的,自己看情况配置 rules: { diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index 3f98bb4..ea6967b 100644 --- a/sub-government-affairs-service/package.json +++ b/sub-government-affairs-service/package.json @@ -34,7 +34,8 @@ "screenfull": "^6.0.2", "splitpanes": "^4.0.3", "vue": "^3.3.11", - "vue-router": "^4.2.5" + "vue-router": "^4.2.5", + "vue-tianditu": "^2.7.6" }, "devDependencies": { "@babel/core": "^7.23.7", diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/record.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/record.js new file mode 100644 index 0000000..5ea0597 --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/record.js @@ -0,0 +1,47 @@ +import request from '@/utils/axios'; +//新增备案信息（POST） +export function createRecord(data) { + return request({ + url: '/inputGoods/cropPlantRegistration/save', + method: 'post', + data: data, + }); +} +// 删除备案信息（DELETE） +export function deleteRecord(id) { + return request({ + url: `/inputGoods/cropPlantRegistration/delete/${id}`, + method: 'delete', + }); +} +// 修改备案信息（PUT） +export function updateRecord(data) { + return request({ + url: `/inputGoods/cropPlantRegistration/uploadReport`, + method: 'put', + data: data, + }); +} +// 查询备案信息（GET） +export function getRecord(id) { + return request({ + url: `/inputGoods/cropPlantRegistration/get/${id}`, + method: 'get', + }); +} +// 查询备案信息列表（GET） +export function fetchRecordList(params) { + return request({ + url: '/inputGoods/cropPlantRegistration/page', + method: 'get', + params: params, + }); +} +// 备案审核（PUT） +export function auditRecord(data) { + return request({ + url: `/inputGoods/cropPlantRegistration/approval`, + method: 'put', + data, + }); +} diff --git a/sub-government-affairs-service/src/components/AreaCascader/index.vue b/sub-government-affairs-service/src/components/AreaCascader/index.vue index 81d74f2..b65c570 100644 --- a/sub-government-affairs-service/src/components/AreaCascader/index.vue +++ b/sub-government-affairs-service/src/components/AreaCascader/index.vue @@ -98,7 +98,14 @@ async function fetchGridList(regionCode) { } } -onMounted(fetchAreaData); +onMounted(async () => { + await fetchAreaData(); + + // 初始化时如果有区域编码，加载对应网格 + if (props.regionCode) { + await fetchGridList(props.regionCode); + } +}); // 样式计算 const containerStyle = computed(() => ({ diff --git a/sub-government-affairs-service/src/config/map.js b/sub-government-affairs-service/src/config/map.js new file mode 100644 index 0000000..a8da465 --- /dev/null +++ b/sub-government-affairs-service/src/config/map.js @@ -0,0 +1,55 @@ +export const map_config = { + tianditu: { + version: '4.0', + token: '5e3204b9312c1d2618049d90a4ae917c', + center: [100.088, 23.883], + zoom: 13, + }, + + baseMaps: [ + { + label: 'OSM街道图', + Url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + }, + { + label: 'ArcGIS影像图', + Url: 'https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', + }, + { + label: 'ArcGIS街道图', + Url: 'http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}', + }, + { + label: '天地图街道图', + Url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=7786923a385369346d56b966bb6ad62f', + }, + { + label: '天地图影像图', + Url: 'http://t{s}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=7786923a385369346d56b966bb6ad62f', + }, + { + label: '谷歌街道图', + Url: 'http://www.google.cn/maps/vt?lyrs=m@189&gl=cn&x={x}&y={y}&z={z}', + }, + { + label: '谷歌影像图', + Url: 'http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', + }, + { + label: '高德街道图', + Url: 'http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}', + }, + { + label: '高德影像图', + Url: 'http://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}', + }, + { + label: '百度街道图', + Url: 'http://online{s}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles={styles}&scaler=1&p=1', + }, + { + label: '百度影像图', + Url: 'http://shangetu{s}.map.bdimg.com/it/u=x={x};y={y};z={z};v=009;type=sate&fm=46', + }, + ], +}; diff --git a/sub-government-affairs-service/src/main.js b/sub-government-affairs-service/src/main.js index 1228094..96ae706 100644 --- a/sub-government-affairs-service/src/main.js +++ b/sub-government-affairs-service/src/main.js @@ -13,9 +13,14 @@ import { registerGlobalComponents } from './plugins/globalComponents'; import { registerElIcons } from './plugins/icon'; import { registerMicroApps } from './plugins/micro'; import { registerSplitpanes } from './plugins/splitpanes'; +import VueTianditu from 'vue-tianditu'; +import { map_config } from './config/map'; const app = createApp(App); -app.use(pinia).use(router).use(ElementPlus).use(Avue); +app.use(pinia).use(router).use(ElementPlus).use(Avue).use(VueTianditu, { + v: map_config.tianditu.version, + tk: map_config.tianditu.token, +}); registerGlobalComponents(app); registerElIcons(app); registerSplitpanes(app); 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 e03e12f..f8e28e6 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -9,7 +9,6 @@ const inputSuppliesRoutes = [ redirect: '/sub-government-affairs-service/material/pesticide', meta: { title: '农产品种植管理', icon: 'FullScreen' }, children: [ - // 使用监管概况统计图表 { path: '/sub-government-affairs-service/statistics', name: 'Statistics', diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/components/FormDialog.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/components/FormDialog.vue deleted file mode 100644 index dae4e5f..0000000 --- a/sub-government-affairs-service/src/views/planting-management/variety-record/components/FormDialog.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordForm.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordForm.vue new file mode 100644 index 0000000..2105e1a --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordForm.vue @@ -0,0 +1,94 @@ + + + diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue index 9f7780a..9c55009 100644 --- a/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue @@ -1,5 +1,5 @@ + diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/components/SearchBar.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/components/SearchBar.vue index ea93367..594b552 100644 --- a/sub-government-affairs-service/src/views/planting-management/variety-record/components/SearchBar.vue +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/SearchBar.vue @@ -5,9 +5,9 @@ - + - + 搜索 @@ -61,9 +61,3 @@ const onReset = () => { emit('reset'); }; - - diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/mockData.js b/sub-government-affairs-service/src/views/planting-management/variety-record/mockData.js new file mode 100644 index 0000000..2f04b04 --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/mockData.js @@ -0,0 +1,87 @@ +export const mockData = [ + { + id: 'LD20230001', + landName: '阳光农场1号地', + area: 120.5, + fullRegionName: '浙江省杭州市余杭区', + gridName: '网格A', + address: '余杭区五常街道阳光路1号', + CropName: '水稻', + CropVarietyName: '超级稻', + plantingStartTime: '2023-04-10', + plantingEndTime: '2023-09-20', + businessSubjectName: '杭州阳光农业有限公司', + account: '13800138001', + fillTime: '2023-04-05 10:30', + auditTime: '', // 待审核状态没有审核时间 + landStatus: 0, // 0=待审核 + }, + { + id: 'LD20230002', + landName: '绿洲农场2号地', + area: 85.2, + fullRegionName: '浙江省杭州市西湖区', + gridName: '网格B', + address: '西湖区转塘街道绿洲路2号', + CropName: '小麦', + CropVarietyName: '冬小麦', + plantingStartTime: '2023-03-15', + plantingEndTime: '2023-07-25', + businessSubjectName: '杭州绿洲农业合作社', + account: '13900139002', + fillTime: '2023-03-10 14:20', + auditTime: '2023-03-12 09:15', // 已通过有审核时间 + landStatus: 1, // 1=已通过 + }, + { + id: 'LD20230003', + landName: '丰收农场3号地', + area: 200.0, + fullRegionName: '浙江省杭州市萧山区', + gridName: '网格C', + address: '萧山区宁围街道丰收路3号', + CropName: '玉米', + CropVarietyName: '甜玉米', + plantingStartTime: '2023-05-01', + plantingEndTime: '2023-10-30', + businessSubjectName: '萧山丰收农业有限公司', + account: '13700137003', + fillTime: '2023-04-28 16:45', + auditTime: '2023-04-30 11:00', // 已驳回有审核时间 + landStatus: 2, // 2=已驳回 + }, + { + id: 'LD20230004', + landName: '试验田4号地', + area: 50.8, + fullRegionName: '浙江省杭州市滨江区', + gridName: '网格D', + address: '滨江区长河街道试验田路4号', + CropName: '大豆', + CropVarietyName: '转基因大豆', + plantingStartTime: '2023-06-01', + plantingEndTime: '2023-11-15', + businessSubjectName: '滨江农业研究所', + account: '13600136004', + fillTime: '2023-05-25 09:10', + auditTime: '', // 待审核状态没有审核时间 + landStatus: 0, // 0=待审核 + }, + { + id: 'LD20230005', + landName: '有机农场5号地', + area: 180.3, + fullRegionName: '浙江省杭州市临安区', + gridName: '网格E', + address: '临安区青山湖街道有机路5号', + CropName: '蔬菜', + CropVarietyName: '有机菠菜', + plantingStartTime: '2023-02-20', + plantingEndTime: '2023-12-31', + businessSubjectName: '临安有机农业有限公司', + account: '13500135005', + fillTime: '2023-02-15 13:25', + auditTime: '2023-02-18 10:30', // 已通过有审核时间 + landStatus: 1, // 1=已通过 + }, +]; diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue index 74c44fc..0dc337b 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue @@ -2,7 +2,7 @@
- + @@ -60,7 +60,7 @@ import { getEnterList, getEnterById, addEnter, updateEnter, approvalEnter, delet // 控制弹窗显示 const visible = ref(false); -const activeCrudTab = ref('0'); +const activeCrudTab = ref('1'); const activeTab = ref('basic'); const dialogTitle = ref('新增'); const isReadonly = ref(false); @@ -173,13 +173,19 @@ const crudOptions = reactive({ searchBtn: false, emptyBtn: false, column: [ + { label: '生产经营主体编码', prop: 'id' }, { label: '企业名称', prop: 'businessName' }, - { label: '所属行政区划', prop: 'address' }, + { label: '企业负责人', prop: 'contactPerson' }, + { label: '联系方式', prop: 'phone' }, + { label: '企业地址', prop: 'address' }, + { label: '地块数量', prop: 'villageCount' }, + { label: '地块编号', prop: 'villageCode' }, + { label: '地块名称', prop: 'villageName' }, { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` }, - { label: '经营产品', prop: 'businessScope' }, - { label: '联系人', prop: 'contactPerson' }, - { label: '联系电话', prop: 'phone' }, - // { label: '聘工人数', prop: 'villageCount' }, + { label: '所属行政区划', prop: 'address' }, + { label: '所属网格', prop: 'gridCode' }, + { label: '种植作物', prop: 'primaryProduct' }, + { label: '账号（手机号）', prop: 'account' }, { label: '信息录入时间', prop: 'createTime' }, { label: '信息更新时间', prop: 'updateTime' }, ], diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue deleted file mode 100644 index 90e9ba1..0000000 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue +++ /dev/null @@ -1,712 +0,0 @@ - - diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue index 2230106..3953b1a 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue @@ -13,7 +13,7 @@ - + @@ -141,7 +141,7 @@ const isAuditor = computed(() => role.value === 'auditor'); // --------------------------------------------------------------------- // 2. Tab 与数据的状态控制 // --------------------------------------------------------------------- -const activeTab = ref('0'); +const activeTab = ref('1'); const dialogTitle = ref('新增'); const isReadonly = ref(false); // 搜索表单模型 @@ -203,26 +203,19 @@ const crudOptions = reactive({ emptyBtn: false, refreshBtn: false, column: [ + { label: '生产经营主体编码', prop: 'id' }, { label: '姓名', prop: 'name' }, - { - label: '证件类型', - prop: 'idType', - formatter: (row, column, cellValue) => { - return cellValue === '101' ? '身份证' : cellValue === '2' ? '护照' : cellValue === '3' ? '港澳身份证' : ''; - }, - }, - { label: '证件号码', prop: 'idCardEncrypt' }, - { - label: '性别', - prop: 'sex', - formatter: (row, column, cellValue) => { - return cellValue === '1' ? '男' : cellValue === '0' ? '女' : ''; - }, - }, - { label: '年龄', prop: 'age' }, { label: '联系方式', prop: 'phone' }, - { label: '居住地行政区划', prop: 'address' }, + // 地址 + { label: '地址', prop: 'address', width: '300px' }, + { label: '地块数量', prop: 'villageCount' }, + { label: '地块编号', prop: 'villageCode' }, + { label: '地块名称', prop: 'villageName' }, + { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` }, + { label: '所属行政区划', prop: 'address' }, + { label: '所属网格', prop: 'gridCode' }, { label: '种植作物', prop: 'planCropName' }, + { label: '账号（手机号）', prop: 'account' }, { label: '创建时间', prop: 'createTime' }, { label: '更新时间', prop: 'updateTime' }, ], diff --git a/sub-government-affairs-service/src/views/resource/database/LandMap.vue b/sub-government-affairs-service/src/views/resource/database/LandMap.vue index cfa7f6b..09701fa 100644 --- a/sub-government-affairs-service/src/views/resource/database/LandMap.vue +++ b/sub-government-affairs-service/src/views/resource/database/LandMap.vue @@ -1,20 +1,401 @@ - diff --git a/sub-government-affairs-service/src/views/resource/database/LandMapBak.vue b/sub-government-affairs-service/src/views/resource/database/LandMapBak.vue new file mode 100644 index 0000000..49c7114 --- /dev/null +++ b/sub-government-affairs-service/src/views/resource/database/LandMapBak.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/sub-government-affairs-service/yarn.lock b/sub-government-affairs-service/yarn.lock index afaedd9..b0e36a8 100644 --- a/sub-government-affairs-service/yarn.lock +++ b/sub-government-affairs-service/yarn.lock @@ -4183,6 +4183,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +mitt@^3.0.0: + version "3.0.1" + resolved "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" + integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw== + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -6516,6 +6521,11 @@ vue-demi@*, vue-demi@^0.14.10: resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04" integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg== +vue-demi@^0.12.1: + version "0.12.5" + resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz#8eeed566a7d86eb090209a11723f887d28aeb2d1" + integrity sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q== + vue-eslint-parser@^9.4.3: version "9.4.3" resolved "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8" @@ -6536,6 +6546,14 @@ vue-router@^4.2.5: dependencies: "@vue/devtools-api" "^6.6.4" +vue-tianditu@^2.7.6: + version "2.7.6" + resolved "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-2.7.6.tgz#c48425c49306300cae9664182dd170c626a38371" + integrity sha512-Yvcxg0IAgGB3ZY8zlC5ayjo9f85fa8PFTaifguTNpri76g67GO9toaRWMjBKi39yYHMBADaT3P6bEkJx87X8MQ== + dependencies: + mitt "^3.0.0" + vue-demi "^0.12.1" + vue@^3.3.11: version "3.5.13" resolved "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz#9f760a1a982b09c0c04a867903fc339c9f29ec0a" From 9a821652f0d481a1d30beb9e18900bd088429dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com> Date: Mon, 23 Jun 2025 17:12:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=9C=E4=BA=8B=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/farmingService.js | 19 ++++++++ .../farmingService/farmingConsult/index.vue | 40 +++++++++++++++-- .../farmingConsult/policyDetail.vue | 45 ++++++++++++------- .../ruralFinance/integratedSector/detail.vue | 4 -- 4 files changed, 85 insertions(+), 23 deletions(-) create mode 100644 sub-operation-service/src/apis/farmingService.js diff --git a/sub-operation-service/src/apis/farmingService.js b/sub-operation-service/src/apis/farmingService.js new file mode 100644 index 0000000..2a03f23 --- /dev/null +++ b/sub-operation-service/src/apis/farmingService.js @@ -0,0 +1,19 @@ +import request from '@/utils/axios'; + +// 农事服务 + +// 获取农事政策分类查询数据 +export function informationList(params = {}) { + return request('contentManage/information/informationPage', { + method: 'GET', + params, + }); +} + +// 获取农资分类查询数据 +export function informationDetail(id, params = {}) { + return request(`contentManage/information/informationInfo/${id}`, { + method: 'GET', + params, + }); +} diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/index.vue b/sub-operation-service/src/views/farmingService/farmingConsult/index.vue index 11c0333..fd300c6 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/index.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/index.vue @@ -6,12 +6,12 @@

农业政策

-
+
{{ item.title }}
- {{ item.desc }} + {{ item.content }}
@@ -29,10 +29,11 @@