From e7057217d3fb8744e4424bff61292e878181a7ad Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 13 Mar 2025 16:02:58 +0800
Subject: [PATCH] =?UTF-8?q?flx:=E6=8F=90=E4=BA=A4=E5=BC=B9=E5=BC=93?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/laborPerson.js              |   6 +-
 .../personModule/administration.vue           | 102 ++++++++++-------
 .../personModule/laborComponent.vue           | 103 +++++++++++-------
 3 files changed, 134 insertions(+), 77 deletions(-)

diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js
index 85ff1fe8..b842fc6d 100644
--- a/src/assets/js/api/laborPerson.js
+++ b/src/assets/js/api/laborPerson.js
@@ -26,6 +26,10 @@ export const pullMemberDataApi = data => post('xmgl/hikvision/getDoorEvents', da
 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); // 导入照片数据
+// 查找弹弓下发详情
+export const getDangongWorkerFaceStatusPageList = data => get('xmgl/dangongWorkerFaceStatus/page', data);
+
+
 
 
 //详情
@@ -275,4 +279,4 @@ export const getHikvisionManualCompareApi = data => post('xmgl/xzHikvisionCompar
 export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkFace', data);
 
 //人员管理批量删除
-export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data);
+export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data);
\ No newline at end of file
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 0a6ee102..953685fe 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -322,6 +322,7 @@
           >
           <!-- v-if="isIscDevice" -->
           <el-button
+            v-if="!isDangong"
             v-permission="{
               key: 'rygl_distributeAccessEquipment',
               menuPath: '/project/labor/personManage',
@@ -438,7 +439,7 @@
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="下发状态" v-if="isDangong">
+            <!-- <el-form-item label="下发状态" v-if="isDangong">
               <el-select
                 v-model="tableParameter.dangongStatus"
                 style="width: 120px"
@@ -450,7 +451,7 @@
                   :value="index"
                 ></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <!-- 查询 -->
               <el-button
@@ -611,12 +612,12 @@
                     }}</span
                   >
                 </div>
-                <div v-else-if="isDangong">
+                <!-- <div v-else-if="isDangong">
                   下发状态：
                   <span
                     :class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}"
                   >{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
-                </div>
+                </div> -->
                 <div class="personItemBottom">
                   所属企业：
                   <span class="values">{{ row.enterpriseName }}</span>
@@ -2135,34 +2136,45 @@
               align="center"
               :label="$t('message.personnelPosition.beaconManage.table.index')"
             ></el-table-column>
-            <el-table-column
-              prop="detail"
-              label="任务名称"
-              align="center"
-            ></el-table-column>
-            <el-table-column prop="isSuccess" label="执行结果" align="center">
-              <template v-slot="{ row }">{{
-                row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
-              }}</template>
-            </el-table-column>
-
-            <el-table-column
-              :label="
-                $t('message.personnelPosition.beaconManage.table.operation')
-              "
-              align="center"
-              width="150"
-            >
-              <template v-slot="{ row }">
-                <div
-                  class="operationText"
-                  @click="retryEvent(row.id)"
-                  v-if="row.isSuccess === 0"
-                >
-                  <span style="color: #5381f6">重试</span>
-                </div>
-              </template>
-            </el-table-column>
+            <template v-if="!isDangong">
+              <el-table-column
+                prop="detail"
+                label="任务名称"
+                align="center"
+              ></el-table-column>
+              <el-table-column prop="isSuccess" label="执行结果" align="center">
+                <template v-slot="{ row }">{{
+                  row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
+                }}</template>
+              </el-table-column>
+              <el-table-column
+                :label="
+                  $t('message.personnelPosition.beaconManage.table.operation')
+                "
+                align="center"
+                width="150"
+              >
+                <template v-slot="{ row }">
+                  <div
+                    class="operationText"
+                    @click="retryEvent(row.id)"
+                    v-if="row.isSuccess === 0"
+                  >
+                    <span style="color: #5381f6">重试</span>
+                  </div>
+                </template>
+              </el-table-column>
+            </template>
+            <template v-else>
+              <el-table-column prop="dangongStatus" label="执行结果" align="center">
+                <template v-slot="{ row }">{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</template>
+              </el-table-column>
+              <el-table-column prop="dangongStatus" label="消息详情" align="center">
+                <template v-slot="{ row }">
+                  {{row.msg}}
+                </template>
+              </el-table-column>
+            </template>
             <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
           </el-table>
           <!-- <el-pagination
@@ -2231,6 +2243,7 @@ import {
   sendBatchWokerApi,
   importImgDataApi,
   xmglXzHikvisionSyncGetNewestList,
+  getDangongWorkerFaceStatusPageList,
   xmglXzHikvisionSyncRetryAPI,
   checkfaceHikvisionApi,
 } from "@/assets/js/api/laborPerson";
@@ -2948,7 +2961,7 @@ export default {
         if (result.success) {
           if (result.result) {
             this.isUploadToHouse = result.result.housing ? true : false;
-            this.isIscDevice = result.result.supplierType == 9 ? true : false;
+            this.isIscDevice = result.result.supplierType == 9 || result.result.supplierType == 8 ? true : false;
             this.isDangong = result.result.supplierType == 8 ? true : false;
           }
         }
@@ -4259,13 +4272,26 @@ export default {
       this.getNewestList();
     },
     async getNewestList() {
-      const res = await xmglXzHikvisionSyncGetNewestList({
-        // pageNo:this.issuePage.pageNo,
+      const isDangongFn = this.isDangong ?  getDangongWorkerFaceStatusPageList : xmglXzHikvisionSyncGetNewestList;
+      const params = {
+         // pageNo:this.issuePage.pageNo,
         // pageSize:this.issuePage.pageSize,
-        whoId: this.whoId,
-      });
+        // whoId: this.whoId,
+      }
+      if(this.isDangong) {
+        params.pageNo = -1;
+        params.pageSize = 10;
+        params.workerId = this.whoId;
+      } else {
+        params.whoId = this.whoId;
+      }
+      const res = await isDangongFn(params);
       console.log(res, "---------------------");
-      this.issuePointList = res.result;
+      if(this.isDangong) {
+        this.issuePointList = res.result.records;
+      } else {
+        this.issuePointList = res.result;
+      }
     },
     async retryEvent(id) {
       this.$notify({
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index c7c59fce..465e5a0d 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -283,6 +283,7 @@
           >
           <!-- v-if="isIscDevice" -->
           <el-button
+          v-if="!isDangong"
             v-permission="{
               key: 'rygl_distributeAccessEquipment',
               menuPath: '/project/labor/personManage',
@@ -399,7 +400,7 @@
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="下发状态" v-if="isDangong">
+            <!-- <el-form-item label="下发状态" v-if="isDangong">
               <el-select
                 v-model="tableParameter.dangongStatus"
                 style="width: 120px"
@@ -411,7 +412,7 @@
                   :value="index"
                 ></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <!-- 查询 -->
               <el-button
@@ -577,12 +578,12 @@
                     }}</span
                   >
                 </div>
-                <div v-else-if="isDangong">
+                <!-- <div v-else-if="isDangong">
                   下发状态：
                   <span
                     :class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}"
                   >{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
-                </div>
+                </div> -->
                 <div class="personItemBottom">
                   所属企业：
                   <span class="values">{{ row.enterpriseName }}</span>
@@ -2384,34 +2385,46 @@
               align="center"
               :label="$t('message.personnelPosition.beaconManage.table.index')"
             ></el-table-column>
-            <el-table-column
-              prop="detail"
-              label="任务名称"
-              align="center"
-            ></el-table-column>
-            <el-table-column prop="isSuccess" label="执行结果" align="center">
-              <template v-slot="{ row }">{{
-                row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
-              }}</template>
-            </el-table-column>
-
-            <el-table-column
-              :label="
-                $t('message.personnelPosition.beaconManage.table.operation')
-              "
-              align="center"
-              width="150"
-            >
-              <template v-slot="{ row }">
-                <div
-                  class="operationText"
-                  @click="retryEvent(row.id)"
-                  v-if="row.isSuccess === 0"
-                >
-                  <span style="color: #5381f6">重试</span>
-                </div>
-              </template>
-            </el-table-column>
+            <template v-if="!isDangong">
+              <el-table-column
+                prop="detail"
+                label="任务名称"
+                align="center"
+              ></el-table-column>
+              <el-table-column prop="isSuccess" label="执行结果" align="center">
+                <template v-slot="{ row }">{{
+                  row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
+                }}</template>
+              </el-table-column>
+              <el-table-column
+                :label="
+                  $t('message.personnelPosition.beaconManage.table.operation')
+                "
+                align="center"
+                width="150"
+              >
+                <template v-slot="{ row }">
+                  <div
+                    class="operationText"
+                    @click="retryEvent(row.id)"
+                    v-if="row.isSuccess === 0"
+                  >
+                    <span style="color: #5381f6">重试</span>
+                  </div>
+                </template>
+              </el-table-column>
+            </template>
+            <template v-else>
+              <el-table-column prop="dangongStatus" label="执行结果" align="center">
+                <template v-slot="{ row }">{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</template>
+              </el-table-column>
+              <el-table-column prop="dangongStatus" label="消息详情" align="center">
+                <template v-slot="{ row }">
+                  {{row.msg}}
+                </template>
+              </el-table-column>
+            </template>
+            
             <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
           </el-table>
           <!-- <el-pagination
@@ -2481,6 +2494,7 @@ import {
   importImgDataApi,
   xmglXzHikvisionSyncGetNewestList,
   xmglXzHikvisionSyncRetryAPI,
+  getDangongWorkerFaceStatusPageList,
   checkfaceHikvisionApi,
   onBatchDeletionApi,
 } from "@/assets/js/api/laborPerson";
@@ -3247,7 +3261,7 @@ export default {
         if (result.success) {
           if (result.result) {
             this.isUploadToHouse = result.result.housing ? true : false;
-            this.isIscDevice = result.result.supplierType == 9 ? true : false;
+            this.isIscDevice = result.result.supplierType == 9 || result.result.supplierType == 8 ? true : false;
             this.isDangong = result.result.supplierType == 8 ? true : false;
           }
         }
@@ -5005,13 +5019,26 @@ export default {
       this.getNewestList();
     },
     async getNewestList() {
-      const res = await xmglXzHikvisionSyncGetNewestList({
-        // pageNo:this.issuePage.pageNo,
+      const isDangongFn = this.isDangong ?  getDangongWorkerFaceStatusPageList : xmglXzHikvisionSyncGetNewestList;
+      const params = {
+         // pageNo:this.issuePage.pageNo,
         // pageSize:this.issuePage.pageSize,
-        whoId: this.whoId,
-      });
+        // whoId: this.whoId,
+      }
+      if(this.isDangong) {
+        params.pageNo = -1;
+        params.pageSize = 10;
+        params.workerId = this.whoId;
+      } else {
+        params.whoId = this.whoId;
+      }
+      const res = await isDangongFn(params);
       console.log(res, "---------------------");
-      this.issuePointList = res.result;
+      if(this.isDangong) {
+        this.issuePointList = res.result.records;
+      } else {
+        this.issuePointList = res.result;
+      }
     },
     async retryEvent(id) {
       this.$notify({