From 5af0f0aefe3b65739ba5f727a5514ec06d24ab72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= Date: Mon, 16 Jun 2025 13:31:47 +0800 Subject: [PATCH 01/10] tag20250616-master --- .../src/router/index.js | 17 +- .../src/router/modules/inputSupplies/index.js | 2 +- .../src/router/modules/produceGoods/index.js | 24 -- .../landManage/component/landPartol/index.vue | 32 ++ .../src/views/outputProductsManage/index.vue | 318 ++++++++++++++++++ .../src/views/outputProductsManage/output.js | 122 +++++++ .../src/views/resource/database/landData.js | 20 +- 7 files changed, 498 insertions(+), 37 deletions(-) delete mode 100644 sub-government-affairs-service/src/router/modules/produceGoods/index.js create mode 100644 sub-government-affairs-service/src/views/outputProductsManage/index.vue create mode 100644 sub-government-affairs-service/src/views/outputProductsManage/output.js diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 23aaafe..b795f37 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -14,7 +14,6 @@ import productOperateMainRoutes from './modules/productOperateMain'; import inputSuppliesRoutes from './modules/inputSupplies'; import plantingAndBreedingRouter from './modules/plantingAndBreeding'; import systemRouter from './modules/system'; -import produceGoods from './modules/produceGoods'; export const constantRoutes = [ { @@ -47,7 +46,21 @@ export const constantRoutes = [ ...resourceRouter, ...productOperateMainRoutes, ...inputSuppliesRoutes, - // produceGoods, + { + path: '/sub-government-affairs-service/output-products', + name: 'outputProducts', + component: Layout, + redirect: '/sub-government-affairs-service/output-products/index', + meta: { title: '产出品管理', icon: 'Box' }, + children: [ + { + path: '/sub-government-affairs-service/output-products/index', + component: () => import('@/views/outputProductsManage/index.vue'), + name: 'outputProductsIndex', + meta: { title: '产出品管理', icon: 'List' }, + }, + ], + }, // ...plantingAndBreedingRouter, ...traceRouter, // ...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 d891930..8ee4f7f 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -37,7 +37,7 @@ const inputSuppliesRoutes = [ path: '/sub-government-affairs-service/material/others', name: 'input-supplies-others', component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), - meta: { title: '其他投入品', icon: 'TakeawayBox' }, + meta: { title: '其他投入品管理', icon: 'TakeawayBox' }, }, ], }, diff --git a/sub-government-affairs-service/src/router/modules/produceGoods/index.js b/sub-government-affairs-service/src/router/modules/produceGoods/index.js deleted file mode 100644 index fefe229..0000000 --- a/sub-government-affairs-service/src/router/modules/produceGoods/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import Layout from '@/layouts/index.vue'; - -export default { - path: '/sub-government-affairs-service/produceGoodsMain', - name: 'produceGoodsMain', - component: Layout, - redirect: '/sub-government-affairs-service/produceGoods', - meta: { title: '产出品', icon: 'Document' }, - children: [ - // { - // path: '/sub-government-affairs-service/produceGoods', - // name: 'produceGoods', - // component: () => import('@/views/produceGoods/list/index.vue'), - // meta: { title: '产出品列表', icon: 'Document' }, - // }, - // { - // path: '/sub-government-affairs-service/produceGoods1', - // name: 'produceGoods1', - // component: () => import('@/views/produceGoods/test/index.vue'), - // meta: { title: '投入品监管平台', icon: 'Document' }, - // }, - ], -}; -// export default produceGoodsRoutes; diff --git a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue index 27788f2..d1c0f80 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue @@ -63,6 +63,30 @@ + +
+

种植信息登记

+ + + + + + + + + + + + + + 是 + 否 + + + + + +
@@ -153,6 +167,7 @@ const router = useRouter(); const goodId = route.query.id; // 获取参数 const pId = route.query.pid; const currentWeight = ref(0); +const showPhone = ref(false); let bannerList = reactive(['images/ecommerce/' + 'banner.png', 'images/ecommerce/' + 'banner.png']); const tabList = reactive([ @@ -614,15 +629,22 @@ const toCopy = () => {}; } } .top-btn { + display: flex; + justify-content: flex-start; + align-items: center; + .contact { + text-align: center; + cursor: pointer; + margin-left: 10px; + } + .contact:hover { + } .item-btn { - display: inline-block; - margin: 8px 24px 8px 0; - margin-top: 16px; - padding: 0 24px; + padding: 7px 24px; + margin-right: 20px; font-size: 20px; border-radius: 12px; color: $color-fff; - line-height: 42px; &.sign { background: $color-main; cursor: pointer; diff --git a/sub-operation-service/src/views/ecommerce/supplierDetail.vue b/sub-operation-service/src/views/ecommerce/supplierDetail.vue index 52d042e..ba458bb 100644 --- a/sub-operation-service/src/views/ecommerce/supplierDetail.vue +++ b/sub-operation-service/src/views/ecommerce/supplierDetail.vue @@ -50,7 +50,7 @@
数量：
- + 有货: {{ currentStock }} 售罄
diff --git a/sub-operation-service/src/views/ruralFinance/integratedSector/detail.vue b/sub-operation-service/src/views/ruralFinance/integratedSector/detail.vue index 37de509..eb43182 100644 --- a/sub-operation-service/src/views/ruralFinance/integratedSector/detail.vue +++ b/sub-operation-service/src/views/ruralFinance/integratedSector/detail.vue @@ -6,9 +6,9 @@
- +
-
惠农e贷
+
{{ currentDetail.title }}
额度高
政策扶持
@@ -40,7 +40,9 @@
担保方式：信用、抵押
-
所属机构：农业银行
+
+ 所属机构：{{ currentDetail.type }} +
还款方式：等额本息、先息后本
@@ -48,30 +50,30 @@
-
-
- -
-
产品介绍
-
+
+
+
+ +
+
{{ item.title }}
+
+
+
-
- 惠农e贷是中国农业银行依托互联网大数据技术，专门为农民设计的一款线上化、批量化、便捷化、普惠化的贷款产品。创新运用互联网大数据分析技术，采取线上线下相结合方式办理贷款。 -
-
-
- -
-
适用客户
-
-
-
-
-
- 广泛覆盖从事特色产业经营、农村电商购销、农业产业链供销以及在农行有金融资产或信贷关系等客户，贷款可用于生产经营和消费，包括但不限于以下范围：
1.在农行存款、理财、基金等金融资产达到一定标准的农户。
2.在农行办理住房贷款且尚未结清的农户。
3.在农行办理过农户贷款且信用记录良好的农户。
4.从事茶叶、林果、蔬菜、烟草、谷物种植和畜牧、家禽、渔业养殖等农行认可的特色产业经营农户。
5.农行认可的信用村内有资产、有收入、有诚信的农户。
6.与农行合作的农业产业化龙头企业上下游农户。
7.与农行合作的电商平台上下游购销农户。
8.纳入政府增信机制或融资性担保公司担保的农户。 -
+ + + + + + + + + + + + @@ -79,7 +81,7 @@ @@ -105,7 +183,7 @@ const goLoan = () => { text-indent: 2em; font-size: 18px; text-align: left; - padding: 20px; + padding: 10px 20px; } .product-card { border-radius: 16px; diff --git a/sub-operation-service/src/views/ruralFinance/integratedSector/loan.vue b/sub-operation-service/src/views/ruralFinance/integratedSector/loan.vue index afafbbc..0c750ac 100644 --- a/sub-operation-service/src/views/ruralFinance/integratedSector/loan.vue +++ b/sub-operation-service/src/views/ruralFinance/integratedSector/loan.vue @@ -4,7 +4,7 @@ @@ -13,7 +13,7 @@ diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue index c5c3b30..0dbf4f0 100644 --- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue +++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue @@ -17,13 +17,7 @@
{{ n.title }} - +
From 7193836ea9b7fa35015a1a548c8ff605223990cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= Date: Mon, 16 Jun 2025 22:54:51 +0800 Subject: [PATCH 03/10] tag2025061602master --- main/.env.development | 8 ++--- .../.env.development | 8 ++--- .../src/layouts/component/Avatar/index.vue | 7 ----- .../src/router/index.js | 7 ----- .../src/router/modules/inputSupplies/index.js | 30 +++++++++---------- .../material/annualPlan/index.vue | 2 +- .../src/views/outputProductsManage/index.vue | 2 +- .../productOperateMain/individual/index.vue | 2 +- .../views/resource/database/Statistics.vue | 2 ++ 9 files changed, 27 insertions(+), 41 deletions(-) diff --git a/main/.env.development b/main/.env.development index 8ed46a0..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.99:8080' -VITE_APP_UPLOAD_URL = 'http://192.168.18.99: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/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index cdf02f5..7829228 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -9,13 +9,11 @@ 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.98:9204' -VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' +# VITE_APP_BASE_URL = 'http://192.168.18.99:8080' # 本地开发接口地址 # VITE_APP_BASE_URL = 'http://192.168.18.74:8080' diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue index 5dab309..95f6f22 100644 --- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue @@ -1,10 +1,3 @@ - - diff --git a/sub-government-affairs-service/src/views/resource/database/Grassland.vue b/sub-government-affairs-service/src/views/resource/database/Grassland.vue index 5209aa7..68a239d 100644 --- a/sub-government-affairs-service/src/views/resource/database/Grassland.vue +++ b/sub-government-affairs-service/src/views/resource/database/Grassland.vue @@ -142,18 +142,8 @@ 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 new file mode 100644 index 0000000..dae4e5f --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/FormDialog.vue @@ -0,0 +1,113 @@ + + + + + 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 new file mode 100644 index 0000000..9f7780a --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue @@ -0,0 +1,80 @@ + + + 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 new file mode 100644 index 0000000..ea93367 --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/SearchBar.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/index.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/index.vue new file mode 100644 index 0000000..35e73e3 --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/indexBac.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/indexBac.vue new file mode 100644 index 0000000..b445e14 --- /dev/null +++ b/sub-government-affairs-service/src/views/planting-management/variety-record/indexBac.vue @@ -0,0 +1,537 @@ + + + + +