From 48d94ef430cb831568f69428434d43e9188922ea Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 12 Sep 2025 14:12:59 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/index.vue b/src/views/index.vue index c73c522..9fbf71d 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -11,7 +11,7 @@

地块总数

-

块

+

宗

承包总金额

@@ -22,7 +22,7 @@

待调查总数

-

块

+

宗

兑现总金额

@@ -33,7 +33,7 @@

已调查总数

-

块

+

宗

尚欠总金额

@@ -47,10 +47,9 @@

亩

-

经营总面积

-

亩

+

年总收益

+

¥

-
@@ -59,10 +58,11 @@

亩

-

年总收益

-

¥

+

经营总面积

+

亩

+
From 0a79719eaffd6b63bca813f9bbee85ab5f3da1da Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 12 Sep 2025 14:29:32 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/app/list.vue | 4 ++-- src/views/app/operate_edit.vue | 4 ++-- src/views/resource/land/index.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/app/list.vue b/src/views/app/list.vue index 2ec67cc..808d8fb 100644 --- a/src/views/app/list.vue +++ b/src/views/app/list.vue @@ -5,7 +5,7 @@

{{surveyStatus}}

- +
搜索
@@ -103,7 +103,7 @@ this.showPicker = false; }, searchChange(value) { - this.queryParams.dkmc = value; + this.queryParams.dkbm = value; }, goSearch(){ this.queryParams.pageNum = 1; diff --git a/src/views/app/operate_edit.vue b/src/views/app/operate_edit.vue index 539ce80..fee7aeb 100644 --- a/src/views/app/operate_edit.vue +++ b/src/views/app/operate_edit.vue @@ -171,9 +171,9 @@ this.form = response.data }) } - getInfoByImportCode(response.data.importCode).then((res) => { + /*getInfoByImportCode(response.data.importCode).then((res) => { this.form.deptId = res.data.deptId - }); + });*/ }); }, onConfirmJydxlx(value) { diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue index a984ce2..395bbd3 100644 --- a/src/views/resource/land/index.vue +++ b/src/views/resource/land/index.vue @@ -514,7 +514,7 @@ export default { dkmc: null, syqxz: '30', dklb: '22', - tdlylx: '011', + tdlylx: '01', dldj: '01', tdyt: '1', sfjbnt: '1', From 22d6ecba06e18d12907e0447d99af3b7d0e74803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Fri, 12 Sep 2025 15:10:10 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/config.js | 8 + src/assets/images/app/mark.png | Bin 0 -> 482 bytes src/router/index.js | 30 +- src/views/app/index.vue | 11 +- src/views/app/map.vue | 438 ++++++++++-------- .../app/{ => project}/attribute_edit.vue | 0 src/views/app/{ => project}/detail.vue | 2 +- src/views/app/{ => project}/list.vue | 2 +- src/views/app/{ => project}/operate_edit.vue | 30 +- src/views/app/user/info.vue | 167 +++++++ src/views/app/user/passWord.vue | 147 ++++++ src/views/app/{ => user}/user.vue | 38 +- 12 files changed, 652 insertions(+), 221 deletions(-) create mode 100644 src/assets/images/app/mark.png rename src/views/app/{ => project}/attribute_edit.vue (100%) rename src/views/app/{ => project}/detail.vue (97%) rename src/views/app/{ => project}/list.vue (98%) rename src/views/app/{ => project}/operate_edit.vue (90%) create mode 100644 src/views/app/user/info.vue create mode 100644 src/views/app/user/passWord.vue rename src/views/app/{ => user}/user.vue (68%) diff --git a/src/api/system/config.js b/src/api/system/config.js index 85df3dc..e92dc00 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -59,6 +59,14 @@ export function refreshCache() { }) } +// 附件地址前缀 +export function getSystemAttachmentUrl() { + return request({ + url: '/open/typz/configKey/system.attachment.url', + method: 'get' + }) +} + // 根据参数键名查询参数值 // export function getConfigKey(configKey) { // return request({ diff --git a/src/assets/images/app/mark.png b/src/assets/images/app/mark.png new file mode 100644 index 0000000000000000000000000000000000000000..782d405aaebfaa8619eee83932fbff08b8ae571e GIT binary patch literal 482 zcmV<80UiE{P)In|=CC66C0ctU6-ObF$ zw8Ed^U~9j(9+E&^Nrizxv5AC4LV;4LTP6|`2_3A2o;zdESXv216FhrgG(79h$Ju(o z*@>6qb7zH4KUN%vci3FOv2Z1USe1_c9*C8gNGMjNMM8gF>8K3QEA-$qodT*Gw=wBC z9OX0Y!=~**pqn0mx(otV^cZ3Z=qa6>!(acvBz=p+yi90MP-#I%zIEmA`rahawN*I@ zd%&zpiVL4LFqrfUk6?qtZGZ3Kt@S99hv2hV%xDP!yqVETuhj%BW+fpbqkvGfiX require(['@/views/app/user/user'], resolve) + }, + { //用户页 + path: '/app/user/info', + name: 'appUserInfo', + hidden: true, + meta: { + title: '用户信息', + }, + component: (resolve) => require(['@/views/app/user/info'], resolve) + }, + { //用户页 + path: '/app/user/passWord', + name: 'appUserPassWord', + hidden: true, + meta: { + title: '修改密码', }, - component: (resolve) => require(['@/views/app/user'], resolve) + component: (resolve) => require(['@/views/app/user/passWord'], resolve) }, { //列表 path: '/app/list', @@ -122,7 +140,7 @@ export const constantRoutes = [ meta: { title: '列表', }, - component: (resolve) => require(['@/views/app/list'], resolve) + component: (resolve) => require(['@/views/app/project/list'], resolve) }, { //属性修改 path: '/app/attribute_edit', @@ -131,7 +149,7 @@ export const constantRoutes = [ meta: { title: '修改', }, - component: (resolve) => require(['@/views/app/attribute_edit'], resolve) + component: (resolve) => require(['@/views/app/project/attribute_edit'], resolve) }, { //经营修改 path: '/app/operate_edit', @@ -140,7 +158,7 @@ export const constantRoutes = [ meta: { title: '修改', }, - component: (resolve) => require(['@/views/app/operate_edit'], resolve) + component: (resolve) => require(['@/views/app/project/operate_edit'], resolve) }, { //地图 path: '/app/map', @@ -158,7 +176,7 @@ export const constantRoutes = [ meta: { title: '详情', }, - component: (resolve) => require(['@/views/app/detail'], resolve) + component: (resolve) => require(['@/views/app/project/detail'], resolve) }, ] diff --git a/src/views/app/index.vue b/src/views/app/index.vue index 5da14b6..7d69a92 100644 --- a/src/views/app/index.vue +++ b/src/views/app/index.vue @@ -5,8 +5,8 @@
-

张晋升

-

常家围子村委会

+

{{$store.getters.user.user.nickName}}

+

{{$store.getters.user.user.dept.deptName}}

@@ -38,12 +38,15 @@ name: "appIndex", data() { return { - menuList:[] + menuList:[], + user:{}, + avatar:'' }; }, created() { this.getMenuApp(); - console.log(this.$store.getters) + }, + mounted() { }, methods: { getMenuApp(){ diff --git a/src/views/app/map.vue b/src/views/app/map.vue index 7acc35d..7f44549 100644 --- a/src/views/app/map.vue +++ b/src/views/app/map.vue @@ -14,7 +14,7 @@ 搜索
-
+
@@ -32,145 +32,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+

属性数据

+ + + + + + + + + + + + + + + + + + + + + +

经营数据

+ + + + + + + + + +
+ + + +
+
+ 关闭弹窗 +
+
+
+ + diff --git a/src/views/app/user/passWord.vue b/src/views/app/user/passWord.vue new file mode 100644 index 0000000..f1e9dbc --- /dev/null +++ b/src/views/app/user/passWord.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/app/user.vue b/src/views/app/user/user.vue similarity index 68% rename from src/views/app/user.vue rename to src/views/app/user/user.vue index 208f60d..f88e852 100644 --- a/src/views/app/user.vue +++ b/src/views/app/user/user.vue @@ -5,28 +5,28 @@
-
+
-

张晋升

-

常家围子村委会

+

{{$store.getters.user.user.nickName}}

+

{{$store.getters.user.user.dept.deptName}}

- + - + - +
@@ -36,6 +36,7 @@ diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue index 2b4244d..370dc60 100644 --- a/src/views/business/import/index.vue +++ b/src/views/business/import/index.vue @@ -651,6 +651,7 @@ export default { if(!this.log.taskId) return; downloadLog(this.log.taskId).then((resp) => { + this.$message.success('开始下载......'); save(`导入任务_${this.log.taskId}.log`, resp); }); }, From 63cbfb28ac308152c93c73084dd7b0dee02dc923 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 12 Sep 2025 17:31:50 +0800 Subject: [PATCH 14/18] fix --- src/views/app/project/operate_edit.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/app/project/operate_edit.vue b/src/views/app/project/operate_edit.vue index ecf2d8f..de52a93 100644 --- a/src/views/app/project/operate_edit.vue +++ b/src/views/app/project/operate_edit.vue @@ -181,9 +181,9 @@ this.form.jymj = 0; }) } - // getInfoByImportCode(response.data.importCode).then((res) => { - // this.form.deptId = res.data.deptId - // }); + getInfoByImportCode(response.data.importCode).then((res) => { + this.form.deptId = res.data.deptId + }); }); }, onConfirmJydxlx(value) { From f9972a1f2103206245cc355e2575d4844417e50c Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 12 Sep 2025 17:57:40 +0800 Subject: [PATCH 15/18] fix --- src/views/app/project/operate_edit.vue | 65 +++++++++++++++++++------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/src/views/app/project/operate_edit.vue b/src/views/app/project/operate_edit.vue index de52a93..d8c05e6 100644 --- a/src/views/app/project/operate_edit.vue +++ b/src/views/app/project/operate_edit.vue @@ -99,20 +99,14 @@ - - - - - + + + + + 提交 @@ -124,6 +118,7 @@ + + diff --git a/src/components/form/FieldCalender.vue b/src/components/form/FieldCalender.vue new file mode 100644 index 0000000..d4cc5b2 --- /dev/null +++ b/src/components/form/FieldCalender.vue @@ -0,0 +1,107 @@ + + + + + + diff --git a/src/components/form/FieldCascadeSelect.vue b/src/components/form/FieldCascadeSelect.vue new file mode 100644 index 0000000..ce93ab4 --- /dev/null +++ b/src/components/form/FieldCascadeSelect.vue @@ -0,0 +1,216 @@ + + + + + + diff --git a/src/components/form/FieldCascader.vue b/src/components/form/FieldCascader.vue new file mode 100644 index 0000000..d65499d --- /dev/null +++ b/src/components/form/FieldCascader.vue @@ -0,0 +1,262 @@ + + + + + + diff --git a/src/components/form/FieldCheckbox.vue b/src/components/form/FieldCheckbox.vue new file mode 100644 index 0000000..4a140dc --- /dev/null +++ b/src/components/form/FieldCheckbox.vue @@ -0,0 +1,91 @@ + + + + + + diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue new file mode 100644 index 0000000..ce2bc5e --- /dev/null +++ b/src/components/form/FieldDatePicker.vue @@ -0,0 +1,196 @@ + + + + + + diff --git a/src/components/form/FieldRadio.vue b/src/components/form/FieldRadio.vue new file mode 100644 index 0000000..2b009a6 --- /dev/null +++ b/src/components/form/FieldRadio.vue @@ -0,0 +1,111 @@ + + + + + + diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue new file mode 100644 index 0000000..bebd705 --- /dev/null +++ b/src/components/form/FieldSelect.vue @@ -0,0 +1,190 @@ + + + + + + diff --git a/src/views/app/project/operate_edit.vue b/src/views/app/project/operate_edit.vue index d8c05e6..07ccddd 100644 --- a/src/views/app/project/operate_edit.vue +++ b/src/views/app/project/operate_edit.vue @@ -1,12 +1,6 @@