diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 9ee15df5..328e633e 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -444,14 +444,8 @@
                 </div>
               </template>
             </el-table-column>
-<<<<<<< HEAD
-
-             <!-- 测试 -->
-             <el-table-column prop="sendSuccessStatus">
-=======
             <!-- 测试 -->
             <el-table-column prop="sendSuccessStatus">
->>>>>>> bjxz-dev
               <template v-slot="{ row }">
                 <div>
                   下发状态：
@@ -464,39 +458,22 @@
                         ? 'red'
                         : row.sendSuccessStatus === 3
                         ? 'yellow'
-<<<<<<< HEAD
-                        : ''
-=======
                         : '',
->>>>>>> bjxz-dev
                     ]"
                   >
                     {{
                       row.sendSuccessStatus === 1
-<<<<<<< HEAD
-                        ? '成功'
-                        : row.sendSuccessStatus === 2
-                        ? '失败'
-                        : row.sendSuccessStatus === 3
-                        ? '部分成功'
-                        : ''
-=======
                         ? "成功"
                         : row.sendSuccessStatus === 2
                         ? "失败"
                         : row.sendSuccessStatus === 3
                         ? "部分成功"
                         : ""
->>>>>>> bjxz-dev
                     }}</span
                   >
                 </div>
                 <div class="personItemBottom">
-<<<<<<< HEAD
-                 所属企业：
-=======
                   所属企业：
->>>>>>> bjxz-dev
                   <span class="values">{{ row.enterpriseName }}</span>
                 </div>
               </template>
@@ -1918,13 +1895,8 @@
         </div>
       </div>
     </el-dialog>
-<<<<<<< HEAD
-     <!-- 下发详情 -->
-     <el-dialog
-=======
     <!-- 下发详情 -->
     <el-dialog
->>>>>>> bjxz-dev
       :modal-append-to-body="false"
       title="下发详情"
       :close-on-click-modal="false"
@@ -1947,11 +1919,7 @@
             ></el-table-column>
             <el-table-column prop="isSuccess" label="执行结果" align="center">
               <template v-slot="{ row }">{{
-<<<<<<< HEAD
-                row.isSuccess === 0 ? '成功' : '失败'
-=======
                 row.isSuccess === 0 ? "成功" : "失败"
->>>>>>> bjxz-dev
               }}</template>
             </el-table-column>
 
@@ -1963,16 +1931,11 @@
               width="150"
             >
               <template v-slot="{ row }">
-<<<<<<< HEAD
-               
-                <div class="operationText" @click="retryEvent(row.id)"  v-if="row.isSuccess === 0">
-=======
                 <div
                   class="operationText"
                   @click="retryEvent(row.id)"
                   v-if="row.isSuccess === 0"
                 >
->>>>>>> bjxz-dev
                   <span style="color: #5381f6">重试</span>
                 </div>
               </template>
@@ -1990,36 +1953,22 @@
             :total="Number(total)"
             background
           ></el-pagination> -->
-<<<<<<< HEAD
-          <div class="dialog-footer">
-=======
           <!-- <div class="dialog-footer">
->>>>>>> bjxz-dev
             <el-button
               class="cancleBtn"
               @click="issueTeamDialog = false"
               icon="el-icon-circle-close"
               size="medium"
-<<<<<<< HEAD
-              >{{ $t('message.laborMange.cancel') }}</el-button
-=======
               >{{ $t("message.laborMange.cancel") }}</el-button
->>>>>>> bjxz-dev
             >
             <el-button
               type="primary"
               icon="el-icon-circle-check"
               @click="issueTeamDialog = false"
               size="medium"
-<<<<<<< HEAD
-              >{{ $t('message.laborMange.confirm') }}</el-button
-            >
-          </div>
-=======
               >{{ $t("message.laborMange.confirm") }}</el-button
             >
           </div> -->
->>>>>>> bjxz-dev
         </div>
       </div>
     </el-dialog>
@@ -2059,17 +2008,10 @@ import {
   sendBatchWokerApi,
   importImgDataApi,
   xmglXzHikvisionSyncGetNewestList,
-<<<<<<< HEAD
-  xmglXzHikvisionSyncRetryAPI
-} from '@/assets/js/api/laborPerson'
-import { selectUserDevAuthorityByUserIdApi } from '@/assets/js/api/configManage'
-import { getProjectConfigListApi } from '@/assets/js/api/project.js'
-=======
   xmglXzHikvisionSyncRetryAPI,
 } from "@/assets/js/api/laborPerson";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
 import { getProjectConfigListApi } from "@/assets/js/api/project.js";
->>>>>>> bjxz-dev
 import {
   checkPhone,
   CheckSocialCreditCode,
@@ -2086,11 +2028,6 @@ export default {
   data() {
     return {
       issuePointList: [],
-<<<<<<< HEAD
-      issueTeamDialog:false,
-      whoId:'',
-=======
->>>>>>> bjxz-dev
       typeRadio: 1,
       refreshPage: true,
       key: false,
@@ -3856,43 +3793,6 @@ export default {
         } else {
           this.$message.error(this.$t("message.laborMange.hint10")); //身份证信息识别失败
         }
-<<<<<<< HEAD
-      })
-    },
-    tableRowClassName ({ row, rowIndex }) {
-      if (row.sendSuccessStatus === 1) {
-        return 'green2'
-      }
-      if (row.sendSuccessStatus === 2) {
-        return 'red2'
-      }
-      if (row.sendSuccessStatus === 3) {
-        return 'yellow2'
-      }
-    },
-    async issueTeamEvent (id) {
-      this.issueTeamDialog = true
-this.whoId = id
-      this.getNewestList()
-    },
-   async getNewestList(){
-      const res = await xmglXzHikvisionSyncGetNewestList({
-        // pageNo:this.issuePage.pageNo,
-        // pageSize:this.issuePage.pageSize,
-        whoId: this.whoId
-      })
-      console.log(res, '---------------------')
-      this.issuePointList = res.result
-    },
-   async retryEvent(id){
-  const res = await xmglXzHikvisionSyncRetryAPI({
-  id:id
-})
-console.log(res);
-    }
-  }
-}
-=======
       });
     },
     tableRowClassName({ row, rowIndex }) {
@@ -3928,7 +3828,6 @@ console.log(res);
     },
   },
 };
->>>>>>> bjxz-dev
 </script>
 <style lang="less" scoped>
 @import "./laborPersonCommon.less";
@@ -4217,51 +4116,12 @@ console.log(res);
     line-height: 16px;
   }
 }
-<<<<<<< HEAD
-
-.valuesColor {
-  color: #fff;
-  padding: 3px;
-}
-
-.yellow {
-  background-color: #fbe000;
-}
-.green {
-  background-color: #72cb40;
-}
-.red {
-  background-color: #ec373e;
-}
-
-::v-deep {
-  .el-table .yellow2 {
-    background-color: #fffce6;
-  }
-  .el-table .green2 {
-    background-color: #f1faec;
-  }
-  .el-table .red2 {
-    background-color: #feebed;
-  }
-
-  .dialog-footer {
-    margin-top: 20px;
-  }
-  .pagerBox {
-    margin-top: 0;
-  }
-
-  .tableBtns .operationText {
-    margin-right:0
-=======
 .tableBtns .operationText{
     margin-right: 0px !important;
 }
 .tablesBtns {
   .el-button + .el-button {
     margin-left: 0px;
->>>>>>> bjxz-dev
   }
 }
 </style>