diff --git a/main/.env.development b/main/.env.development
index 3aa18c8..8ed46a0 100644
--- a/main/.env.development
+++ b/main/.env.development
@@ -17,5 +17,5 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# 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.74: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 8b97e98..7a86ca4 100644
--- a/sub-government-affairs-service/.env.development
+++ b/sub-government-affairs-service/.env.development
@@ -14,4 +14,4 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# 内网接口地址
VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
-VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
+VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
diff --git a/sub-government-affairs-service/src/components/AreaSelect/index.vue b/sub-government-affairs-service/src/components/AreaSelect/index.vue
index 82669c1..e087d9c 100644
--- a/sub-government-affairs-service/src/components/AreaSelect/index.vue
+++ b/sub-government-affairs-service/src/components/AreaSelect/index.vue
@@ -104,21 +104,6 @@ const fetchAreaData = async () => {
// }
// );
-// 内部更新 => 外部同步
-watch(
- selectedAreaPath,
- (val) => {
- if (props.emitPath) {
- // 期望数组模式,确保输出数组
- emit('update:modelValue', Array.isArray(val) ? val : []);
- } else {
- // 期望字符串模式,确保输出字符串
- emit('update:modelValue', typeof val === 'string' ? val : '');
- }
- },
- { deep: true }
-);
-
onMounted(() => {
fetchAreaData();
});
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 ec56f28..4a265f4 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -13,31 +13,31 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/material/pesticide',
name: 'input-supplies-pesticide',
component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
- meta: { title: '农药管理', icon: '' },
+ meta: { title: '农药管理', icon: 'Orange' },
},
{
path: '/sub-government-affairs-service/material/fertilizer',
name: 'input-supplies-fertilizer',
component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
- meta: { title: '肥料管理', icon: '' },
+ meta: { title: '肥料管理', icon: 'Grid' },
},
{
path: '/sub-government-affairs-service/material/seed',
name: 'input-supplies-seed',
component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
- meta: { title: '种子使用监督管理', icon: '' },
+ meta: { title: '种子使用监督管理', icon: 'Watermelon' },
},
{
path: '/sub-government-affairs-service/material/others',
name: 'input-supplies-others',
component: () => import('@/views/inputSuppliesManage/material/others/index.vue'),
- meta: { title: '其他投入品', icon: '' },
+ meta: { title: '其他投入品', icon: 'TakeawayBox' },
},
{
path: '/sub-government-affairs-service/material/annualPlans',
name: 'annualPlans',
component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'),
- meta: { title: '种植进度网格化管理', icon: '' },
+ meta: { title: '种植进度网格化管理', icon: 'Timer' },
},
// {
// path: '/sub-government-affairs-service/materialManage',
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index 59f4b19..33f2adb 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -18,7 +18,7 @@ export default [
path: '/sub-government-affairs-service/individual',
component: () => import('@/views/productOperateMain/individual/index.vue'),
name: 'individual',
- meta: { title: '农户管理', icon: '' },
+ meta: { title: '农户管理', icon: 'Place' },
},
// {
// path: '/sub-government-affairs-service/collective',
@@ -30,7 +30,7 @@ export default [
path: '/sub-government-affairs-service/coop',
component: () => import('@/views/productOperateMain/coOp/index.vue'),
name: 'coop',
- meta: { title: '企业管理', icon: '' },
+ meta: { title: '企业管理', icon: 'Finished' },
},
// {
// path: '/sub-government-affairs-service/enterprise',
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
index 14f0296..4af8da8 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
@@ -13,19 +13,7 @@
-
-
-
-
+
@@ -47,18 +35,6 @@
-
@@ -67,14 +43,7 @@