From 0712473161e4d90b9e88388348ea07312e312e72 Mon Sep 17 00:00:00 2001
From: xiaokangsix <2539509415@qq.com>
Date: Sun, 28 Apr 2024 10:15:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personModule/administration.vue           | 193 +++++++++++++++++-
 .../personModule/laborComponent.vue           |   4 +
 .../projectFront/laborManage/visitRecord.vue  |   6 +-
 3 files changed, 201 insertions(+), 2 deletions(-)

diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 16e92605..306ec096 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -368,6 +368,7 @@
             style="width: 100%; color: #737996"
             @selection-change="handleCheckedCitiesChange"
             :show-header="false"
+            :row-class-name="tableRowClassName"
           >
             <el-table-column
               type="selection"
@@ -443,9 +444,51 @@
                 </div>
               </template>
             </el-table-column>
+
+             <!-- 测试 -->
+             <el-table-column prop="sendSuccessStatus">
+              <template v-slot="{ row }">
+                <div>
+                  下发状态：
+                  <span
+                    :class="[
+                      'valuesColor',
+                      row.sendSuccessStatus === 1
+                        ? 'green'
+                        : row.sendSuccessStatus === 2
+                        ? 'red'
+                        : row.sendSuccessStatus === 3
+                        ? 'yellow'
+                        : ''
+                    ]"
+                  >
+                    {{
+                      row.sendSuccessStatus === 1
+                        ? '成功'
+                        : row.sendSuccessStatus === 2
+                        ? '失败'
+                        : row.sendSuccessStatus === 3
+                        ? '部分成功'
+                        : ''
+                    }}</span
+                  >
+                </div>
+                <div class="personItemBottom">
+                 所属企业：
+                  <span class="values">{{ row.enterpriseName }}</span>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column prop="address" width="300px">
               <template slot-scope="scope">
                 <div class="tableBtns">
+                  <el-button
+                    size="medium"
+                    type="text"
+                    class="operationText"
+                    @click="issueTeamEvent(scope.row.id)"
+                    >查看下发详情</el-button
+                  >
                   <el-button
                     class="operationText"
                     type="text"
@@ -1845,6 +1888,80 @@
         </div>
       </div>
     </el-dialog>
+     <!-- 下发详情 -->
+     <el-dialog
+      :modal-append-to-body="false"
+      title="下发详情"
+      :close-on-click-modal="false"
+      :visible.sync="issueTeamDialog"
+      width="740px"
+    >
+      <div class="dialog_content">
+        <div class="table_wrap whiteBlock">
+          <el-table class="tables" :data="issuePointList">
+            <el-table-column
+              type="index"
+              width="50"
+              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 === 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>
+            <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
+          </el-table>
+          <!-- <el-pagination
+            class="pagerBox"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="issuePage.pageNo"
+            :page-sizes="$store.state.PAGESIZRS"
+            :page-size="issuePage.pageSize"
+            layout="total, sizes, prev, pager, next"
+            :total="Number(total)"
+            background
+          ></el-pagination> -->
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="issueTeamDialog = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.laborMange.cancel') }}</el-button
+            >
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="issueTeamDialog = false"
+              size="medium"
+              >{{ $t('message.laborMange.confirm') }}</el-button
+            >
+          </div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1879,7 +1996,9 @@ import {
   sendWorkerInfoByIdApi,
   updateByIdWorkerInfo,
   sendBatchWokerApi,
-  importImgDataApi
+  importImgDataApi,
+  xmglXzHikvisionSyncGetNewestList,
+  xmglXzHikvisionSyncRetryAPI
 } from '@/assets/js/api/laborPerson'
 import { selectUserDevAuthorityByUserIdApi } from '@/assets/js/api/configManage'
 import { getProjectConfigListApi } from '@/assets/js/api/project.js'
@@ -1898,6 +2017,9 @@ export default {
   },
   data() {
     return {
+      issuePointList: [],
+      issueTeamDialog:false,
+      whoId:'',
       typeRadio: 1,
       refreshPage: true,
       key: false,
@@ -3644,6 +3766,37 @@ export default {
           this.$message.error(this.$t('message.laborMange.hint10')) //身份证信息识别失败
         }
       })
+    },
+    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);
     }
   }
 }
@@ -3903,4 +4056,42 @@ export default {
     line-height: 16px;
   }
 }
+
+.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
+  }
+}
 </style>
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 42bd4406..b0862a9e 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -4810,5 +4810,9 @@ console.log(res);
   .pagerBox {
     margin-top: 0;
   }
+
+  .tableBtns .operationText {
+    margin-right:0
+  }
 }
 </style>
diff --git a/src/views/projectFront/laborManage/visitRecord.vue b/src/views/projectFront/laborManage/visitRecord.vue
index 7c3bc54e..21f68df4 100644
--- a/src/views/projectFront/laborManage/visitRecord.vue
+++ b/src/views/projectFront/laborManage/visitRecord.vue
@@ -7,7 +7,7 @@
         :model="searchForm"
         ref="searchForm"
       >
-        <div style="display: flex; justify-content: space-between">
+        <div style="display: flex; justify-content: space-between;margin-top:15px">
           <div>
             <el-form-item label="访客姓名" prop="visitName">
               <el-input
@@ -469,5 +469,9 @@ export default {
   .el-form-item {
     margin-bottom: 5px;
   }
+
+  .searchBox{
+    height:auto;
+  }
 }
 </style>

From f88537870753abab28636349ba75dde6a7a7e140 Mon Sep 17 00:00:00 2001
From: xiaokangsix <2539509415@qq.com>
Date: Sun, 28 Apr 2024 10:21:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personModule/administration.vue           | 140 ------------------
 1 file changed, 140 deletions(-)

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>