luozhun
/
policeSecurity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity

This commit is contained in:
TimSpan 2024-12-25 09:39:34 +08:00
parent 10b4a1b102 a46d6e2f24
commit 76b1105337
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collect_information/src/pages/projectManager/index/index.vue
View File

@ -15,15 +15,15 @@
</view> </view>
<view class="itemSchool"> <view class="itemSchool">
<text>服务项目</text> <text>服务项目</text>
<text> 13123 </text> <text> 1 </text>
</view> </view>
<view class="itemSchool"> <view class="itemSchool">
<text>有保安证人员</text> <text>有保安证人员</text>
<text> 1000</text> <text> 6</text>
</view> </view>
<view class="itemSchool"> <view class="itemSchool">
<text>无保安证人员</text> <text>无保安证人员</text>
<text> 140</text> <text> 3</text>
</view> </view>
</view> </view>
<view class="swiperDemoItem"> <view class="swiperDemoItem">

7
collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.scss
View File

@ -28,7 +28,6 @@
.projectDetailsTableDrop { .projectDetailsTableDrop {
height: 80%; height: 80%;
.projectDetailsTable { .projectDetailsTable {
margin: 20px; margin: 20px;
border-radius: 10px; border-radius: 10px;
@ -58,7 +57,13 @@
} }
} }
} }
.placeholder{
height: 180px;
} }
}
//.projectDetailsTable:last-child {
// padding-bottom: 180px;
//}
.projectDetailsButton { .projectDetailsButton {
position: fixed; position: fixed;

2
collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue
View File

@ -77,8 +77,8 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="placeholder"></view>
</scroll-view> </scroll-view>
</view> </view>
<view class="projectDetailsButton"> <view class="projectDetailsButton">

4
collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue
View File

@ -167,12 +167,12 @@ useLoad((options) => {
} }
} else { } else {
const form = JSON.parse(options.securityUser) const form = JSON.parse(options.securityUser)
educationLevelValue.value = form.educationLevel.label educationLevelValue.value = form.educationLevel?.label
formData.value = Object.assign({}, form, { formData.value = Object.assign({}, form, {
idCard: form.idCard.originalValue, idCard: form.idCard.originalValue,
telephone: form.telephone.originalValue, telephone: form.telephone.originalValue,
photo: form.photo, photo: form.photo,
educationLevel: form.educationLevel.value educationLevel: form.educationLevel?.value
}) })
} }
}) })

3
policeSecurityServer/src/main/java/com/changhu/support/fastjson2/serializer/MinioPrefixSerializer.java
View File

@ -25,7 +25,8 @@ public class MinioPrefixSerializer implements ObjectWriter<String> {
public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) { public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) {
if (object instanceof String path && StrUtil.isNotEmpty(path)) { if (object instanceof String path && StrUtil.isNotEmpty(path)) {
jsonWriter.writeString(minioPrefix + object); jsonWriter.writeString(minioPrefix + object);
} else {
jsonWriter.writeString("");
} }
jsonWriter.writeNull();
} }
} }