Merge branch 'bjxz-lk' into bjxz-dev

src/assets/js/api/laborPerson.js

@@ -24,6 +24,7 @@ export const sendBatchWokerApi = data => post('xmgl/ufaceDev/sendBatchWokerDev',
 export const pullMemberDataApi = data => post('xmgl/hikvision/getDoorEvents', data);   // 拉取人员通行数据
 export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoImgs', data);   // 导入照片数据
 export const xmglXzHikvisionSyncGetNewestList = data => post('xmgl/xzHikvisionSync/getNewestList', data);   // 导入照片数据
+export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/retry', data);   // 导入照片数据
 
 
 //详情

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -434,6 +434,10 @@
                     }}</span
                   >
                 </div>
+                <div class="personItemBottom">
+                 所属企业：
+                  <span class="values">{{ row.enterpriseName }}</span>
+                </div>
               </template>
             </el-table-column>
             <el-table-column prop="address" width="400px">
@@ -2152,13 +2156,11 @@
               label="任务名称"
               align="center"
             ></el-table-column>
-            <el-table-column
+            <el-table-column prop="isSuccess" label="执行结果" align="center">
-              prop="isSuccess"
+              <template v-slot="{ row }">{{
-              label="执行结果"
+                row.isSuccess === 0 ? '成功' : '失败'
-              align="center"
+              }}</template>
-            >
+            </el-table-column>
-          <template v-slot="{row}">{{ row.isSuccess === 0 ? '成功' : '失败' }}</template>
-          </el-table-column>
 
             <el-table-column
               :label="
@@ -2168,9 +2170,10 @@
               width="150"
             >
               <template v-slot="{ row }">
-                  <div class="operationText" v-if="row.isSuccess !== 0">
+               
-                    <span style="color:#5381f6">重试</span>
+                <div class="operationText" @click="retryEvent(row.id)"  v-if="row.isSuccess === 0">
-                  </div>
+                  <span style="color: #5381f6">重试</span>
+                </div>
               </template>
             </el-table-column>
             <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
@@ -2197,7 +2200,7 @@
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="saveTeamFn('teamForm')"
+              @click="issueTeamDialog = false"
               size="medium"
               >{{ $t('message.laborMange.confirm') }}</el-button
             >
@@ -2240,7 +2243,8 @@ import {
   updateByIdWorkerInfo,
   sendBatchWokerApi,
   importImgDataApi,
-  xmglXzHikvisionSyncGetNewestList
+  xmglXzHikvisionSyncGetNewestList,
+  xmglXzHikvisionSyncRetryAPI
 } from '@/assets/js/api/laborPerson'
 import {
   selectUserDevAuthorityByUserIdApi,
@@ -2449,7 +2453,8 @@ export default {
       issuePage: {
         pageNo: 1,
         pageSize: 10
-      }
+      },
+      whoId:''
     }
   },
   created () {
@@ -4491,23 +4496,24 @@ export default {
     },
     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: id
+        whoId: this.whoId
       })
       console.log(res, '---------------------')
       this.issuePointList = res.result
     },
-         //切换每页显示数量
+   async retryEvent(id){
-         handleSizeChanges (val) {
+  const res = await xmglXzHikvisionSyncRetryAPI({
-      this.issuePage.pageSize= val
+  id:id
-    },
+})
-    //换页
+console.log(res);
-    handleCurrentChanges (val) {
+    }
-      this.issuePage.pageNo = val
-    },
   }
 }
 </script>