Merge remote-tracking branch 'origin/main'

collect_information/src/pages/projectManager/index/index.vue

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

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;

collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue

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

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
     })
   }
 })

policeManagement/src/views/query/index.tsx

@@ -218,7 +218,6 @@ const clearForm = () => {
   _formParams.homeAddress = ''
   _formParams.remark = ''
   _formParams.educationLevel = ''
-  
 }
 export const showEnterprisesUnit = (record_) => {
   // console.log('🚀 ~ showEnterprisesUnit ~ record_:', record_)
@@ -346,20 +345,6 @@ export const showEnterprisesUnit = (record_) => {
         size='small'
         columns={_columns}
         requestApi={_reqApi}
-        // searchFormOptions={{
-        //   name: {
-        //     type: 'input',
-        //     label: '姓名',
-        //   },
-        //   securityNumber: {
-        //     type: 'input',
-        //     label: '保安证号',
-        //   },
-        //   telephone: {
-        //     type: 'input',
-        //     label: '手机号',
-        //   },
-        // }}
         v-slots={
           {
             tableHeader: (_) => {