From 55c9bfa19b5538cd171c8cba14e40c7a845afe2b Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Sat, 14 Sep 2024 11:09:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/subPages/pages/form/form.vue | 62 ++++++-------------
.../pages/projectDetails/projectDetails.vue | 48 ++++++++------
.../types/pages/form/index.d.ts | 12 ++--
3 files changed, 56 insertions(+), 66 deletions(-)
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index ccb86ec..adf3386 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -4,7 +4,7 @@
-
+
{{ item.label }}
@@ -15,7 +15,8 @@
-
+ {{formData.dateOfBirth || "请填写出生年月"}}
+
@@ -50,38 +51,22 @@
diff --git a/collect_information/types/pages/form/index.d.ts b/collect_information/types/pages/form/index.d.ts
index 991e90c..92dca04 100644
--- a/collect_information/types/pages/form/index.d.ts
+++ b/collect_information/types/pages/form/index.d.ts
@@ -1,11 +1,15 @@
-interface formDate {
- snowFlakeId?:string;
- name: string;
+import {Dayjs} from "dayjs";
+
+export interface formDate {
+ snowFlakeId?: string;
+ serviceProjectId: string;
+ name?: string;
workPost?:string;
+ telephone?: string;
sex:number;
nativePlace?:string;
idCard:string;
- dateOfBirth?:string;
+ dateOfBirth?:Dayjs;
securityNumber?:string;
remark?:string;
homeAddress?: string
From 96ab5fe9e22dc2dcb4387fc03cf4553a85f54c98 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Sat, 14 Sep 2024 14:16:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
collect_information/.gitignore | 1 +
.../miniProgram/pojo/vo/IndexServiceProjectListVo.java | 3 +++
.../src/main/resources/mapper/ServiceProjectMapper.xml | 7 ++++++-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/collect_information/.gitignore b/collect_information/.gitignore
index 4abd8e3..e83724e 100644
--- a/collect_information/.gitignore
+++ b/collect_information/.gitignore
@@ -8,4 +8,5 @@ node_modules/
yarn.lock
components.d.ts
package-lock.json
+.idea
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
index 40af593..961908a 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java
@@ -1,5 +1,6 @@
package com.changhu.module.miniProgram.pojo.vo;
+import cn.hutool.core.lang.Dict;
import com.changhu.common.db.enums.IsOrNot;
import com.changhu.common.db.enums.ServiceProjectType;
import com.changhu.module.management.pojo.model.ContactPersonInfo;
@@ -52,6 +53,8 @@ public class IndexServiceProjectListVo {
static class ServiceProjectVo {
@Schema(description = "服务项目id")
private Long snowFlakeId;
+ @Schema(description = "项目经理信息")
+ private Dict projectManagerMiniProgramUserInfo;
@Schema(description = "服务项目名称")
private String name;
@Schema(description = "服务项目类型")
diff --git a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
index 44ad736..b18db61 100644
--- a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
+++ b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml
@@ -57,9 +57,14 @@
'houseTotal', sp.house_total,
'staffTotal', sp.staff_total,
'securityUserTotal', sp.security_user_total,
+ 'projectManagerMiniProgramUserInfo',JSON_OBJECT(
+ 'name',mpu.name,
+ 'telephone',mpu.telephone,
+ 'idCard',mpu.id_card),
'remark', sp.remark)) as 'service_project_list'
from enterprises_unit eu
join service_project sp on eu.snow_flake_id = sp.enterprises_unit_id and sp.delete_flag = 0
+ left join mini_program_user mpu on sp.project_manager_mini_program_user_id = mpu.snow_flake_id and mpu.delete_flag = 0
left join administrative_division ad1 on eu.province = ad1.code and ad1.delete_flag = 0
left join administrative_division ad2 on eu.city = ad2.code and ad2.delete_flag = 0
left join administrative_division ad3 on eu.districts = ad3.code and ad3.delete_flag = 0
@@ -76,4 +81,4 @@
group by eu.snow_flake_id
order by any_value(sp.create_time) desc;
-
\ No newline at end of file
+
From e5fa6ae33523c1f5d2e5d8339eb6f3aee0bebcfa Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Sat, 14 Sep 2024 14:48:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
collect_information/src/request/index.ts | 5 +-
.../src/subPages/pages/form/form.vue | 186 ++++++++----------
.../pages/projectDetails/projectDetails.vue | 142 ++++++-------
collect_information/tsconfig.json | 16 +-
.../types/pages/form/index.d.ts | 28 ++-
5 files changed, 188 insertions(+), 189 deletions(-)
diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts
index a7227d0..0947285 100644
--- a/collect_information/src/request/index.ts
+++ b/collect_information/src/request/index.ts
@@ -8,7 +8,7 @@ const requestInterceptor = (chain: Taro.Chain) => {
if (token) {
requestParams.header = {
...requestParams.header,
- token:token.value
+ token: token.value
}
}
return chain.proceed(requestParams)
@@ -30,7 +30,6 @@ class CustomRequest {
}).then()
}
- console.log(params,method)
Taro.request, object>({
url: this.BASE_API + url,
data: params,
@@ -62,7 +61,7 @@ class CustomRequest {
duration: 2000
}).then()
reject(res.errMsg);
- console.log(res.errMsg,'000')
+ console.log(res.errMsg, '000')
}
})
})
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index adf3386..3fd8a3a 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -1,75 +1,79 @@
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
- {{formData.dateOfBirth || "请填写出生年月"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
- 重置提示状态
-
-
-
-
-
+
+ {{ formData }}
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{
+ dayjs(formData.dateOfBirth).isValid() ? dayjs(formData.dateOfBirth).format('YYYY-MM-DD') : '请选择出生年月'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置表单
+
+
+
+
+
diff --git a/collect_information/src/subPages/pages/myProject/myProject.vue b/collect_information/src/subPages/pages/myProject/myProject.vue
index 68aba24..06eedd0 100644
--- a/collect_information/src/subPages/pages/myProject/myProject.vue
+++ b/collect_information/src/subPages/pages/myProject/myProject.vue
@@ -1,6 +1,6 @@
-
+
{{ item?.name }}
@@ -36,10 +36,12 @@ import Taro from "@tarojs/taro";
import './myproject.scss'
const myProjectList = ref()
+
+const number = ref(0)
const getMyServiceProject = async () => {
const resp = await api.get(`/projectManageIndex/getMyServiceProject`)
myProjectList.value = resp.data
- console.log(myProjectList.value.length)
+ number.value = resp.data.length
}
const projectClick = (items: ServiceProjectList, name: string) => {
diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
index 8ce4b28..a04f043 100644
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
@@ -110,21 +110,22 @@