From e1325d633579ba8d2b788e450c3361112be21814 Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Fri, 20 Dec 2024 09:15:17 +0800 Subject: [PATCH 1/3] =?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 --- .../support/fastjson2/serializer/MinioPrefixSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java b/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java index 83bc2a5..1e6a48b 100644 --- a/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java +++ b/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java @@ -26,6 +26,6 @@ public class MinioPrefixSerializer implements ObjectWriter { if (object instanceof String path && StrUtil.isNotEmpty(path)) { jsonWriter.writeString(minioPrefix + object); } - jsonWriter.writeNull(); + jsonWriter.writeString(""); } } From 90b506b7ecd7088cbe053b2755d4b0dfe4b4842a Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Fri, 20 Dec 2024 09:17:43 +0800 Subject: [PATCH 2/3] =?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 --- .../support/fastjson2/serializer/MinioPrefixSerializer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java b/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java index 1e6a48b..7dd293d 100644 --- a/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java +++ b/policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java @@ -25,7 +25,8 @@ public class MinioPrefixSerializer implements ObjectWriter { public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) { if (object instanceof String path && StrUtil.isNotEmpty(path)) { jsonWriter.writeString(minioPrefix + object); + } else { + jsonWriter.writeString(""); } - jsonWriter.writeString(""); } } From 8801a0937a8554571def0a0c1ed016bc81bf507a Mon Sep 17 00:00:00 2001 From: wangyilin <1454641981@qq.com> Date: Tue, 24 Dec 2024 13:40:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=9D?= =?UTF-8?q?=E5=AE=89=E5=BD=95=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/projectManager/index/index.vue | 6 +++--- .../myProject/projectDetails/projectDetails.scss | 7 ++++++- .../myProject/projectDetails/projectDetails.vue | 2 +- .../projectManager/securityUserForm/securityUserForm.vue | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue index e4c007c..f9cc67d 100644 --- a/collect_information/src/pages/projectManager/index/index.vue +++ b/collect_information/src/pages/projectManager/index/index.vue @@ -15,15 +15,15 @@ 服务项目 - 13123 + 1 有保安证人员 - 1000 + 6 无保安证人员 - 140 + 3 diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.scss b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.scss index acb1441..7ab0711 100644 --- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.scss +++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.scss @@ -28,7 +28,6 @@ .projectDetailsTableDrop { height: 80%; - .projectDetailsTable { margin: 20px; border-radius: 10px; @@ -58,7 +57,13 @@ } } } + .placeholder{ + height: 180px; + } } + //.projectDetailsTable:last-child { + // padding-bottom: 180px; + //} .projectDetailsButton { position: fixed; diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue index bbc7cbf..4969065 100644 --- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue @@ -77,8 +77,8 @@ - + diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue index 1a2ca65..194ed5e 100644 --- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue +++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue @@ -167,12 +167,12 @@ useLoad((options) => { } } else { const form = JSON.parse(options.securityUser) - educationLevelValue.value = form.educationLevel.label + educationLevelValue.value = form.educationLevel?.label formData.value = Object.assign({}, form, { idCard: form.idCard.originalValue, telephone: form.telephone.originalValue, photo: form.photo, - educationLevel: form.educationLevel.value + educationLevel: form.educationLevel?.value }) } })