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
})
}
})
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..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.writeNull();
}
}