diff --git a/src/components/UploadFileFormData/index.vue b/src/components/UploadFileFormData/index.vue
index ef67e1e..e878a3c 100644
--- a/src/components/UploadFileFormData/index.vue
+++ b/src/components/UploadFileFormData/index.vue
@@ -153,6 +153,12 @@ export default {
                 return false
             }
 
+            // 判断文件名称是否过长
+            if (file.name.length > 30) {
+                this.$modal.msgError('文件名称不能超过30个字符')
+                return false
+            }
+
             this.$modal.loading('图片正在上传，请稍候...')
             // 替换文件路径中的#号
             const newFileName = file.name.replace(/#/g, '@')
@@ -200,6 +206,16 @@ export default {
                 return false
             }
 
+            // 判断文件名称是否过长
+            if (file.name.length > 30) {
+                this.$modal.msgError('文件名称不能超过30个字符')
+                this.$emit(
+                    'update:fileList',
+                    fileList.filter((item) => item.uid !== file.uid),
+                )
+                return false
+            }
+
             // // 替换文件路径中的#号
             // const newFileName = file.name.replace(/#/g, '@')
             // const newFile = new File([file], newFileName, { type: file.type })
diff --git a/src/components/UploadImgFormData/index.vue b/src/components/UploadImgFormData/index.vue
index a85258e..db8d826 100644
--- a/src/components/UploadImgFormData/index.vue
+++ b/src/components/UploadImgFormData/index.vue
@@ -169,6 +169,8 @@ export default {
                 return false
             }
 
+            console.log(file.name, 'file.name')
+
             this.$modal.loading('图片正在上传，请稍候...')
             // 替换文件路径中的#号
             const newFileName = file.name.replace(/#/g, '@')
@@ -215,6 +217,16 @@ export default {
                 )
                 return false
             }
+
+            // 判断文件名称是否过长
+            if (file.name.length > 30) {
+                this.$modal.msgError('文件名称不能超过30个字符')
+                this.$emit(
+                    'update:fileList',
+                    fileList.filter((item) => item.uid !== file.uid),
+                )
+                return false
+            }
             this.$emit('update:fileList', fileList)
             this.$emit('onUploadChange', fileList)
         },
diff --git a/src/views/construction-person/attendance-manage/attendance-machine/index.vue b/src/views/construction-person/attendance-manage/attendance-machine/index.vue
index ceb0ee8..4a9968c 100644
--- a/src/views/construction-person/attendance-manage/attendance-machine/index.vue
+++ b/src/views/construction-person/attendance-manage/attendance-machine/index.vue
@@ -95,6 +95,7 @@
                     size="mini"
                     type="danger"
                     icon="el-icon-delete"
+                    v-if="!data.proId"
                     v-hasPermi="['att:machine:delete']"
                     @click="onHandleDeleteSubBaseInfo(data)"
                 >
diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
index a870a83..29280e4 100644
--- a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
+++ b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue
@@ -261,14 +261,17 @@ export default {
         },
 
         // 最终的确定按钮
-        onHandleConfirmFinish: debounce(async () => {
-            try {
-                await this.$refs.addApplyFormRef.onHandleConfirmFinishFun()
-                this.handleCloseDialogOuter()
-                this.$refs.cardReplacementApplyTableRef.getTableList()
-            } catch (error) {
-                // console.log('表单提交失败', error)
+        onHandleConfirmFinish: debounce(function () {
+            const handleAsync = async () => {
+                try {
+                    await this.$refs.addApplyFormRef.onHandleConfirmFinishFun()
+                    this.handleCloseDialogOuter()
+                    this.$refs.cardReplacementApplyTableRef.getTableList()
+                } catch (error) {
+                    // console.log('表单提交失败', error)
+                }
             }
+            handleAsync()
         }, 1500),
 
         // 下一步
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
index 37ef87f..80569ba 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
@@ -1352,10 +1352,10 @@ export default {
 
         // 入场工程选择
         onChangeProId(val) {
+            this.keyInfoForm.teamId = ''
+            this.keyInfoForm.subId = ''
             if (!val) {
                 this.keyInfoForm.proName = ''
-                this.keyInfoForm.subId = ''
-                this.keyInfoForm.teamId = ''
                 this.subSelectList = []
                 this.teamSelectList = []
                 return
@@ -1378,9 +1378,9 @@ export default {
         },
         // 入场分包选择
         onChangeSubId(val) {
+            this.keyInfoForm.teamId = ''
             if (!val) {
-                this.keyInfoForm.subName = ''
-                this.keyInfoForm.teamId = ''
+                this.keyInfoForm.subId = ''
                 this.teamSelectList = []
                 return
             }
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/config.js b/src/views/construction-person/entry-and-exit-manage/person-entry/config.js
index c63f209..22e2efc 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/config.js
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/config.js
@@ -13,13 +13,13 @@ export const formLabel = [
         f_width: '180px',
         isShow: false, // 是否展示label
     },
-    {
-        f_label: '联系方式',
-        f_model: 'phone',
-        f_type: 'ipt',
-        f_width: '180px',
-        isShow: false, // 是否展示label
-    },
+    // {
+    //     f_label: '联系方式',
+    //     f_model: 'phone',
+    //     f_type: 'ipt',
+    //     f_width: '180px',
+    //     isShow: false, // 是否展示label
+    // },
     {
         f_label: '工程',
         f_model: 'proId',
@@ -28,14 +28,14 @@ export const formLabel = [
         isShow: false, // 是否展示label
         f_selList: [], // 工程列表
     },
-    {
-        f_label: '工种',
-        f_model: 'postId',
-        f_type: 'sel',
-        f_width: '180px',
-        isShow: false, // 是否展示label
-        f_selList: [], // 工种列表
-    },
+    // {
+    //     f_label: '工种',
+    //     f_model: 'postId',
+    //     f_type: 'sel',
+    //     f_width: '180px',
+    //     isShow: false, // 是否展示label
+    //     f_selList: [], // 工种列表
+    // },
     {
         f_label: '分包',
         f_model: 'subId',
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue
index 71d3897..2eaf9af 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue
@@ -244,14 +244,17 @@ export default {
         },
 
         // 确定按钮
-        onHandleConfirmAddOrEdit: debounce(async () => {
-            try {
-                await this.$refs.addOrEditFormContentRef.onHandleConfirmAddOrEditFun()
-                this.$refs.personEntryTableRef.getTableList()
-                this.handleCloseDialogOuter()
-            } catch (error) {
-                // console.log('表单提交失败', error)
+        onHandleConfirmAddOrEdit: debounce(function () {
+            const handleAsync = async () => {
+                try {
+                    await this.$refs.addOrEditFormContentRef.onHandleConfirmAddOrEditFun()
+                    this.$refs.personEntryTableRef.getTableList()
+                    this.handleCloseDialogOuter()
+                } catch (error) {
+                    // console.log('表单提交失败', error)
+                }
             }
+            handleAsync()
         }, 1000),
 
         // 关闭弹框
diff --git a/src/views/construction-person/red-green-light-mange/contract-witness/index.vue b/src/views/construction-person/red-green-light-mange/contract-witness/index.vue
index 557220f..abfb403 100644
--- a/src/views/construction-person/red-green-light-mange/contract-witness/index.vue
+++ b/src/views/construction-person/red-green-light-mange/contract-witness/index.vue
@@ -233,17 +233,24 @@ export default {
         },
 
         // 确定按钮
-        onHandleConfirmAddOrEdit: debounce(async () => {
-            try {
-                const res =
-                    await this.$refs.uploadContractContentRef.onHandleConfirmAddOrEditFun()
-                if (res !== 'isClose') {
-                    this.$refs.contractWitnessTableRef.getTableList()
+        onHandleConfirmAddOrEdit: debounce(function () {
+            // 在这里定义异步操作
+            const handleAsync = async () => {
+                try {
+                    const res =
+                        await this.$refs.uploadContractContentRef.onHandleConfirmAddOrEditFun()
+                    if (res !== 'isClose') {
+                        this.$refs.contractWitnessTableRef.getTableList()
+                    }
+                    this.handleCloseDialogOuter()
+                } catch (error) {
+                    // 错误处理
+                    console.error('表单提交失败', error)
                 }
-                this.handleCloseDialogOuter()
-            } catch (error) {
-                // console.log('表单提交失败', error)
             }
+
+            // 执行异步函数
+            handleAsync()
         }, 1000),
 
         // 关闭弹框
diff --git a/src/views/construction-person/red-green-light-mange/wage-card-witness/index.vue b/src/views/construction-person/red-green-light-mange/wage-card-witness/index.vue
index 8cf6526..ebd1135 100644
--- a/src/views/construction-person/red-green-light-mange/wage-card-witness/index.vue
+++ b/src/views/construction-person/red-green-light-mange/wage-card-witness/index.vue
@@ -190,18 +190,21 @@ export default {
         },
 
         // 确定按钮
-        onHandleConfirmAddOrEdit: debounce(async () => {
-            try {
-                const res =
-                    await this.$refs.uploadContractContentRef.onHandleConfirmAddOrEditFun()
+        onHandleConfirmAddOrEdit: debounce(function () {
+            const handleAsync = async () => {
+                try {
+                    const res =
+                        await this.$refs.uploadContractContentRef.onHandleConfirmAddOrEditFun()
 
-                if (res !== 'isClose') {
-                    this.$refs.wageCardWitnessTableRef.getTableList()
+                    if (res !== 'isClose') {
+                        this.$refs.wageCardWitnessTableRef.getTableList()
+                    }
+                    this.handleCloseDialogOuter()
+                } catch (error) {
+                    // console.log('表单提交失败', error)
                 }
-                this.handleCloseDialogOuter()
-            } catch (error) {
-                // console.log('表单提交失败', error)
             }
+            handleAsync()
         }, 1000),
 
         // 关闭弹框
diff --git a/src/views/home-index/components/dataOverviewProject/components/person-list.vue b/src/views/home-index/components/dataOverviewProject/components/person-list.vue
index 2a5940e..d57a6ce 100644
--- a/src/views/home-index/components/dataOverviewProject/components/person-list.vue
+++ b/src/views/home-index/components/dataOverviewProject/components/person-list.vue
@@ -152,7 +152,7 @@ export default {
                 sex: this.sex,
                 isAtt: this.isAtt,
                 postId: this.postId,
-                mainProId: this.selectCompany,
+                subComId: this.selectCompany,
             },
             commonSlots: [
                 'onSiteCount',
diff --git a/src/views/home-index/components/personPresence/components/person-ratio.vue b/src/views/home-index/components/personPresence/components/person-ratio.vue
index 59657ee..dbe62aa 100644
--- a/src/views/home-index/components/personPresence/components/person-ratio.vue
+++ b/src/views/home-index/components/personPresence/components/person-ratio.vue
@@ -2,17 +2,13 @@
     <!-- 固定、临时人员 -->
     <div class="person-ratio">
         <div class="person-ratio-row">
-            <div>
+            <div @click="onHandleOpenDialog('fixed')">
                 <svg-icon icon-class="fixed-person" style="font-size: 32px" />
-                <span @click="onHandleOpenDialog('fixed')">
-                    {{ personAttendanceData.einNum }}</span
-                >
+                <span> {{ personAttendanceData.einNum }}</span>
             </div>
-            <div>
+            <div @click="onHandleOpenDialog('temp')">
                 <svg-icon icon-class="temp-person" style="font-size: 26px" />
-                <span @click="onHandleOpenDialog('temp')">
-                    {{ personAttendanceData.tempNum }}</span
-                >
+                <span> {{ personAttendanceData.tempNum }}</span>
             </div>
         </div>