diff --git a/public/dz_video.html b/public/dz_video.html
index 2f476e0..34e687c 100644
--- a/public/dz_video.html
+++ b/public/dz_video.html
@@ -81,11 +81,11 @@
 		}
 
 		function onServerOpen(time) {
-			alert("第" + time + "次连接上视频服务器");
+			// alert("第" + time + "次连接上视频服务器");
 		}
 
 		function onServerClose(time) {
-			alert("第" + time + "次断开视频服务器");
+			// alert("第" + time + "次断开视频服务器");
 		}
 
 		//视频================================================================================================
diff --git a/src/api/base/project.js b/src/api/base/project.js
index 5cf5ba7..fc3c739 100644
--- a/src/api/base/project.js
+++ b/src/api/base/project.js
@@ -37,8 +37,8 @@ export function updateProject(data) {
       'decrypt': 'decrypt',
       'Content-Type': 'multipart/form-data'
     },
-    url: '/bracelet/project',
-    method: 'put',
+    url: '/bracelet/project/update',
+    method: 'post',
     data: data
   })
 }
diff --git a/src/api/base/staff.js b/src/api/base/staff.js
index 7bcefe6..c8c442e 100644
--- a/src/api/base/staff.js
+++ b/src/api/base/staff.js
@@ -44,6 +44,15 @@ export function getPersonInfo(data) {
     })
 }
 
+// 文件地址详情
+export function getFileUrl(data) {
+    return request({
+        url: '/bracelet/person/getFileUrl',
+        method: 'post',
+        data: data
+    })
+}
+
 //证书详情
 export function getCertificate(memberId) {
     return request({
diff --git a/src/api/base/temporarilyPerson.js b/src/api/base/temporarilyPerson.js
new file mode 100644
index 0000000..cacc815
--- /dev/null
+++ b/src/api/base/temporarilyPerson.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function getTemporarilyPersons(query) {
+    return request({
+        url: '/bracelet/temporarilyPerson/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 删除
+export function delTemporarilyPerson(data) {
+    return request({
+        url: '/bracelet/temporarilyPerson/delTemporarilyPerson',
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/api/construction/index.js b/src/api/construction/index.js
new file mode 100644
index 0000000..290b283
--- /dev/null
+++ b/src/api/construction/index.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+/* 判断人员管控是否有告警 */
+export function getPersonControlIsWarn(query) {
+    return request({
+        url: '/bracelet/consControl/getPersonControlIsWarn',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/api/construction/manage/hoistManage.js b/src/api/construction/manage/hoistManage.js
index 5aeddd1..0782360 100644
--- a/src/api/construction/manage/hoistManage.js
+++ b/src/api/construction/manage/hoistManage.js
@@ -60,4 +60,13 @@ export function getJdWarnList(query) {
         method: 'get',
         params: query
     })
+}
+
+/* 关闭近电感应告警 */
+export function closeJdWarn(data) {
+    return request({
+        url: '/tcp/netty/closeWarn',
+        method: 'post',
+        data:data
+    })
 }
\ No newline at end of file
diff --git a/src/assets/gif/1.gif b/src/assets/gif/1.gif
new file mode 100644
index 0000000..c4c0c88
Binary files /dev/null and b/src/assets/gif/1.gif differ
diff --git a/src/assets/gif/12.gif b/src/assets/gif/12.gif
new file mode 100644
index 0000000..25f219e
Binary files /dev/null and b/src/assets/gif/12.gif differ
diff --git a/src/assets/gif/123.gif b/src/assets/gif/123.gif
new file mode 100644
index 0000000..9eebdd3
Binary files /dev/null and b/src/assets/gif/123.gif differ
diff --git a/src/assets/gif/1234.gif b/src/assets/gif/1234.gif
new file mode 100644
index 0000000..2fb4b85
Binary files /dev/null and b/src/assets/gif/1234.gif differ
diff --git a/src/assets/gif/124.gif b/src/assets/gif/124.gif
new file mode 100644
index 0000000..ea2c6c1
Binary files /dev/null and b/src/assets/gif/124.gif differ
diff --git a/src/assets/gif/13.gif b/src/assets/gif/13.gif
new file mode 100644
index 0000000..c04e821
Binary files /dev/null and b/src/assets/gif/13.gif differ
diff --git a/src/assets/gif/134.gif b/src/assets/gif/134.gif
new file mode 100644
index 0000000..e3bfba2
Binary files /dev/null and b/src/assets/gif/134.gif differ
diff --git a/src/assets/gif/14.gif b/src/assets/gif/14.gif
new file mode 100644
index 0000000..8393ea0
Binary files /dev/null and b/src/assets/gif/14.gif differ
diff --git a/src/assets/gif/2.gif b/src/assets/gif/2.gif
new file mode 100644
index 0000000..9649f66
Binary files /dev/null and b/src/assets/gif/2.gif differ
diff --git a/src/assets/gif/23.gif b/src/assets/gif/23.gif
new file mode 100644
index 0000000..59021cf
Binary files /dev/null and b/src/assets/gif/23.gif differ
diff --git a/src/assets/gif/234.gif b/src/assets/gif/234.gif
new file mode 100644
index 0000000..e04952d
Binary files /dev/null and b/src/assets/gif/234.gif differ
diff --git a/src/assets/gif/24.gif b/src/assets/gif/24.gif
new file mode 100644
index 0000000..867b42c
Binary files /dev/null and b/src/assets/gif/24.gif differ
diff --git a/src/assets/gif/3.gif b/src/assets/gif/3.gif
new file mode 100644
index 0000000..e5b74a6
Binary files /dev/null and b/src/assets/gif/3.gif differ
diff --git a/src/assets/gif/34.gif b/src/assets/gif/34.gif
new file mode 100644
index 0000000..5a8783f
Binary files /dev/null and b/src/assets/gif/34.gif differ
diff --git a/src/assets/gif/4.gif b/src/assets/gif/4.gif
new file mode 100644
index 0000000..55d6e60
Binary files /dev/null and b/src/assets/gif/4.gif differ
diff --git a/src/assets/images/close_img.png b/src/assets/images/close_img.png
new file mode 100644
index 0000000..6bfb718
Binary files /dev/null and b/src/assets/images/close_img.png differ
diff --git a/src/assets/images/test.jpg b/src/assets/images/test.jpg
index 21e3df9..ed3a550 100644
Binary files a/src/assets/images/test.jpg and b/src/assets/images/test.jpg differ
diff --git a/src/assets/images/warn_img.png b/src/assets/images/warn_img.png
new file mode 100644
index 0000000..ed140c6
Binary files /dev/null and b/src/assets/images/warn_img.png differ
diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 7c5cf03..bedd431 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -158,7 +158,7 @@
                 <el-input 
                 v-model="queryshCode.shCode" 
                 placeholder="请输入手环编码" 
-                maxlength="20"
+                maxlength="50"
                 />
             </el-form-item>         
         </el-form>
@@ -247,7 +247,7 @@
                 <el-input 
                 v-model="queryshEdit.shCode" 
                 placeholder="请输入手环编码" 
-                maxlength="20"
+                maxlength="50"
                 />
             </el-form-item>         
         </el-form>
@@ -590,7 +590,7 @@
             placeholder="请输入手环编码"
             clearable
             @keyup.enter.native="handleQueryShBind"
-            maxlength="20"
+            maxlength="50"
           />
         </el-form-item>
         <el-form-item  prop="shPersonName">
@@ -1382,6 +1382,13 @@
             const param = {
               shId:row.shId,
             }
+            if(row.shPersonName!=null && row.shPersonName!=''){
+              this.$alert('手环已绑定使用人，不可解绑', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
             this.$modal.confirm('确定把该手环与手环箱解除绑定吗？解绑后重新绑定才能继续使用！').then(function() {
               return delSh(param);
             }).then(() => {
@@ -1806,6 +1813,13 @@
               });
               return;
             }
+            if (row.teamId!=null && row.teamId!='' && row.teamId!=0) {
+              this.$alert('手环箱未归还，无法删除', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
             const  param = {
               shboxId:row.shboxId
             }
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 2090654..60a34b7 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -100,24 +100,25 @@
   
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="200px">
         <el-form-item label="项目部名称" prop="projectDepartName">
-          <el-input v-model="form.projectDepartName" maxlength="20" placeholder="请输入项目名称" />
+          <el-input v-model="form.projectDepartName" maxlength="20" placeholder="请输入项目部名称" style="width: 400px;"/>
         </el-form-item>
         <el-form-item label="负责人" prop="projectHeadName">
-          <el-input v-model="form.projectHeadName" maxlength="20" placeholder="请输入负责人名称" />
+          <el-input v-model="form.projectHeadName" maxlength="20" placeholder="请输入负责人名称" style="width: 400px;"/>
         </el-form-item>
         <el-form-item label="电话" prop="contactInformation">
-          <el-input v-model="form.contactInformation" maxlength="11" placeholder="请输入负责人电话号码"/>
+          <el-input v-model="form.contactInformation" maxlength="11" placeholder="请输入负责人电话号码" style="width: 400px;"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" maxlength="50" placeholder="请输入备注内容" />
+          <el-input v-model="form.remarks" maxlength="50" placeholder="请输入备注内容" style="width: 400px;"/>
         </el-form-item>
-        <el-form-item label="APP展示图片 " label-width="120px">
+        <el-form-item label="APP展示图片 " label-width="200px">
           <el-upload
                 action="#"
                 :limit="5"
                 :file-list="fileList"
+                :key="uploadKey"
                 :show-file-list="true"
                 :auto-upload="false"
                 list-type="picture-card"
@@ -168,6 +169,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      uploadKey: Date.now(),
       // 遮罩层
       loading: true,
       // 选中数组
@@ -214,7 +216,7 @@ export default {
       // 表单校验
       rules: {
         projectDepartName: [
-          { required: true, message: "项目名称不能为空", trigger: "blur" }
+          { required: true, message: "项目部名称不能为空", trigger: "blur" }
         ],
         // projectHeadName: [
         //   { required: true, message: "负责人名称不能为空", trigger: "blur" }
@@ -320,6 +322,7 @@ export default {
         },
     // 取消按钮
     cancel() {
+      this.uploadKey = Date.now();
       this.open = false;
       this.fileList=[];
       this.reset();
@@ -356,6 +359,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.uploadKey = Date.now();
       this.fileList = []
       this.reset();
       this.open = true;
@@ -364,6 +368,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.fileList = []
+      this.delFileIdList = []
       this.reset();
       const projectId = row.projectId 
       getProject(projectId).then(response => {
@@ -377,7 +382,7 @@ export default {
               // response.data.fileList = [];
                 this.open = true;
                 this.title = "修改项目";
-             
+                this.uploadKey = Date.now();
             });
     },
     // 图片上传
@@ -435,13 +440,13 @@ export default {
     },
     //提交时循环fileList 获取raw文件
     getFileData() {
-      const file = []
+      const fileTwo = []
       this.fileList.forEach(item => {
         if (item?.hasOwnProperty('raw')) {
-          file.push(item.raw)
+          fileTwo.push(item.raw)
         }
       })
-      return { file }
+      return { fileTwo }
     },
     /** 提交按钮 */
     submitForm() {
@@ -449,29 +454,40 @@ export default {
         if (valid) {
           if (this.form.projectId != undefined) {
             const reqData = new FormData();
-            this.form.delFileIdList = this.delFileIdList;
-            reqData.append('params', JSON.stringify(this.form))
-            const { file } = this.getFileData()
-            file.forEach(item => {
+            const forTemp = {'projectId': this.form.projectId,'projectDepartName': this.form.projectDepartName,'projectHeadName': this.form.projectHeadName,'contactInformation': this.form.contactInformation,'remarks': this.form.remarks};
+            reqData.append('params', JSON.stringify(forTemp));
+            // this.form.delFileIdList = this.delFileIdList;
+            this.delFileIdList.forEach(item => {
+            reqData.append('delFileIdList', item)
+          });
+            // reqData.append('params', JSON.stringify(this.form))
+            const { fileTwo } = this.getFileData()
+            fileTwo.forEach(item => {
               reqData.append('file', item)
             })
+            console.log(reqData)
             updateProject(reqData).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.delFileIdList = [];
               this.fileList=[];
+              this.uploadKey = Date.now();
               this.getList();
             });
           } else {
-            console.log(this.form)
             const reqData = new FormData()
-            reqData.append('params', JSON.stringify(this.form))
-            const { file } = this.getFileData()
-            file.forEach(item => {
+            const forTemp = {'projectId': this.form.projectId,'projectDepartName': this.form.projectDepartName,'projectHeadName': this.form.projectHeadName,'contactInformation': this.form.contactInformation,'remarks': this.form.remarks};
+            reqData.append('params', JSON.stringify(forTemp))
+            const { fileTwo } = this.getFileData()
+            fileTwo.forEach(item => {
               reqData.append('file', item)
             })
             addProject(reqData).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.fileList=[];
+              this.delFileIdList = [];
+              this.uploadKey = Date.now();
               this.getList();
             });
           }
diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue
index 7f1fcf3..734ee04 100644
--- a/src/views/base/staff/index.vue
+++ b/src/views/base/staff/index.vue
@@ -1,1205 +1,1224 @@
 <template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="姓名" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入姓名"
-            clearable
-            @keyup.enter.native="handleQuery"
-            maxlength="30"
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+          maxlength="30"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="性别" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="queryParams.sex" placeholder="性别" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['basic:person:add']"
-          >新增人员</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['basic:person:export']"
-          >导出</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="info"
-            plain
-            icon="el-icon-upload"
-            size="mini"
-            @click="handleImport"
-            v-hasPermi="['basic:person:excelUpload']"
-          >导入人员</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleFile"
-          >模板下载</el-button>
-        </el-col>
-        
-        <!-- <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['basic:person:edit']"
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['basic:person:del']"
-          >删除</el-button>
-        </el-col>
-         -->
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" width="80" type="index">
-            <template slot-scope="scope">
-              <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-        <el-table-column label="姓名" align="center" prop="name" sortable/>
-        <el-table-column label="性别" align="center" prop="sex" width="80" sortable>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['basic:person:add']"
+        >新增人员</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['basic:person:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['basic:person:excelUpload']"
+        >导入人员</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleFile"
+        >模板下载</el-button>
+      </el-col>
+      
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['basic:person:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['basic:person:del']"
+        >删除</el-button>
+      </el-col>
+       -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
-                <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="idCard" width="200" sortable/>
-        <el-table-column label="电话" align="center" prop="phone" sortable/>
-        <el-table-column label="岗位" align="center" prop="post" />
-        <el-table-column label="是否推送人脸库" align="center" prop="post">
-          <template slot-scope="scope">
-               <div v-if="scope.row.isPush==0">未推送</div> 
-               <div v-if="scope.row.isPush==1">已推送</div> 
+            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="安全帽编号" align="center" prop="aqmCode" />
-        <el-table-column label="马甲编号" align="center" prop="mjCode" />
-        <el-table-column label="人脸信息" align="center" prop="filePath">
-            <template slot-scope="scope">
-                <div @click="openImg(scope.row.base64Url)"
-                    style="color: #02a7f0; cursor: pointer"
-                    >
-                    <img :src="scope.row.base64Url" style="width: 100px;height: 100px;">
-                </div>
-            </template>
-        </el-table-column> 
-        <el-table-column label="证书" align="center" prop="certificateNum" sortable>
+      <el-table-column label="姓名" align="center" prop="name" sortable/>
+      <el-table-column label="性别" align="center" prop="sex" width="80" sortable>
+        <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          </template>
+      </el-table-column>
+      <el-table-column label="身份证号" align="center" prop="idCard" width="200" sortable/>
+      <el-table-column label="电话" align="center" prop="phone" sortable/>
+      <el-table-column label="岗位" align="center" prop="post" />
+      <el-table-column label="是否推送人脸库" align="center" prop="post">
+        <template slot-scope="scope">
+             <div v-if="scope.row.isPush==0">未推送</div> 
+             <div v-if="scope.row.isPush==1">已推送</div> 
+        </template>
+      </el-table-column>
+      <el-table-column label="安全帽编号" align="center" prop="aqmCode" />
+      <el-table-column label="马甲编号" align="center" prop="mjCode" />
+      <el-table-column label="人脸信息" align="center" prop="filePath">
           <template slot-scope="scope">
-              <div @click="openCertificate(scope.row)" style="color: #02a7f0; cursor: pointer">
-                {{ scope.row.certificateNum}}
+              <div @click="openImg(scope.row.base64Url)"
+                  style="color: #02a7f0; cursor: pointer"
+                  >
+                  <img :src="scope.row.base64Url" style="width: 100px;height: 100px;">
               </div>
           </template>
-        </el-table-column> 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['basic:person:edit']"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['basic:person:del']"
-            >删除</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              v-if="scope.row.isPush == 0"
-              @click="pushFace(scope.row)"
-              v-hasPermi="['basic:person:push']"
-            >推送</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-      
-      <!-- 证书弹窗 -->
-      <el-dialog :title="title" :visible.sync="showCertificate" width="70%" append-to-body>
-        <el-form ref="certificateForm" :model="certificateForm" label-width="100px">
+      </el-table-column> 
+      <el-table-column label="证书" align="center" prop="certificateNum" sortable>
+        <template slot-scope="scope">
+            <div @click="openCertificate(scope.row)" style="color: #02a7f0; cursor: pointer" >
+              {{ scope.row.certificateNum}}
+            </div>
+        </template>
+      </el-table-column> 
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['basic:person:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['basic:person:del']"
+          >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.isPush == 0"
+            @click="pushFace(scope.row)"
+            v-hasPermi="['basic:person:push']"
+          >推送</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+    <!-- 证书弹窗 -->
+    <el-dialog :title="title" :visible.sync="showCertificate" width="70%" append-to-body>
+      <el-form ref="certificateForm" :model="certificateForm" label-width="100px">
+        <!-- 文件格式下载，图片格式预览 -->
+        <el-form-item label="高处作业证">
+          <el-upload
+              class = "upload-demo"
+              action="#" 
+              :file-list="highImgList"
+              :key="uploadKey"
+              :show-file-list="true"
+              :auto-upload="false"
+              list-type="picture-card"
+              accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+              :on-change="handleChangeHighImgList"
+              :class="{ disabled: uploadDisabled }"
+              :on-preview="picturePreview"
+              :on-remove="handleRemoveHighImgList"
+          >
           <!-- 文件格式下载，图片格式预览 -->
-          <el-form-item label="高处作业证">
-            <el-upload
-                class = "upload-demo"
-                action="#" 
-                :file-list="highImgList"
-                :show-file-list="true"
-                :auto-upload="false"
-                list-type="picture-card"
-                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
-                :on-change="handleChangeHighImgList"
-                :class="{ disabled: uploadDisabled }"
-                :on-preview="picturePreview"
-                :on-remove="handleRemoveHighImgList"
-            >
-            <!-- 文件格式下载，图片格式预览 -->
-            <div slot="file" slot-scope="{file}">
-                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
-                <div v-else class="picture-card-container" >
-                  <img class="picture-card" :src="urlTemp" alt="">
-                  <p class="file-name">{{ file.name }}</p>
-                </div>
-                <!-- <img v-else class="el-upload-list__item-thumbnail" :src="urlTemp" alt="">
-                <p class=""file-name>{{ file.name }}</p> -->
-                <!-- <div class="file-overlay">
-                  <p class="file-name">{{ file.name }}</p>
-                </div> -->
-                <!-- <p>{{ file.name }}</p> -->
-                <span class="el-upload-list__item-actions">
-                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
-                  <i class="el-icon-download" />
-                  </span>
-                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
-                  <i class="el-icon-zoom-in" />
-                  </span>
-                  <span class="el-upload-list__item-delete" @click="handleRemoveHighImgList(file)">
-                  <i class="el-icon-delete" />
-                  </span>
+          <div slot="file" slot-scope="{file}">
+              <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+              <div v-else class="picture-card-container" >
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <!-- <img v-else class="el-upload-list__item-thumbnail" :src="urlTemp" alt="">
+              <p class=""file-name>{{ file.name }}</p> -->
+              <!-- <div class="file-overlay">
+                <p class="file-name">{{ file.name }}</p>
+              </div> -->
+              <!-- <p>{{ file.name }}</p> -->
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download" />
                 </span>
-               
-            </div>
-
-
-                <i class="el-icon-plus avatar-uploader-icon" ></i>
-                <!-- <div  slot="tip" class="el-upload__tip">只能上传jpg/png/jpeg/pdf/doc/docx文件，且不超过10Mb</div> -->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="电工作业证">
-            <el-upload
-                class = "upload-demo"
-                action="#"
-                :file-list="electricianImgList"
-                :show-file-list="true"
-                :auto-upload="false"
-                list-type="picture-card"
-                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
-                :on-change="handleChangeElectricianImgList"
-                :class="{ disabled: uploadDisabled }"
-                :on-preview="picturePreview"
-                :on-remove="handleRemoveElectricianImgList"
-            >
-
-             <!-- 文件格式下载，图片格式预览 -->
-             <div slot="file" slot-scope="{file}">
-                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
-                <div v-else class="picture-card-container" >
-                  <img class="picture-card" :src="urlTemp" alt="">
-                  <p class="file-name">{{ file.name }}</p>
-                </div>
-                <span class="el-upload-list__item-actions">
-                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
-                  <i class="el-icon-download" />
-                  </span>
-                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
-                  <i class="el-icon-zoom-in" />
-                  </span>
-                  <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
-                  <i class="el-icon-delete" />
-                  </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                <i class="el-icon-zoom-in" />
                 </span>
-            </div>
-
-                <i class="el-icon-plus avatar-uploader-icon" ></i>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="其他作业证">
-            <el-upload
-                class = "upload-demo"
-                action="#"
-                :file-list="elseImgList"
-                :show-file-list="true"
-                :auto-upload="false"
-                list-type="picture-card"
-                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
-                :on-change="handleChangeElseImgList"
-                :class="{ disabled: uploadDisabled }"
-                :on-preview="picturePreview"
-                :on-remove="handleRemoveElseImgList"
-            >
-             <!-- 文件格式下载，图片格式预览 -->
-             <div slot="file" slot-scope="{file}">
-                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
-                <div v-else class="picture-card-container" >
-                  <img class="picture-card" :src="urlTemp" alt="">
-                  <p class="file-name">{{ file.name }}</p>
-                </div>
-                <span class="el-upload-list__item-actions">
-                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
-                  <i class="el-icon-download" />
-                  </span>
-                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
-                  <i class="el-icon-zoom-in" />
-                  </span>
-                  <span class="el-upload-list__item-delete" @click="handleRemoveElseImgList(file)">
-                  <i class="el-icon-delete" />
-                  </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveHighImgList(file)">
+                <i class="el-icon-delete" />
                 </span>
-            </div>
-                <i  class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitCertificate">确 定</el-button>
-          <el-button @click="cancelCertificate">取 消</el-button>
-        </div>
-      </el-dialog>
-
-      <!-- 添加或修改人员对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body @close="cancel">
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-form-item label="人员姓名" prop="name">
-            <el-input v-model="form.name" placeholder="请输入人员名称" maxlength="20"/>
-          </el-form-item>
-          <el-form-item label="人员性别" prop="sex">
-            <el-select v-model="form.sex" placeholder="请选择人员性别" clearable style="width: 100%;">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label="身份证号" prop="idCard">
-            <el-input v-model="form.idCard" placeholder="请输入人员身份证号" maxlength="18"/>
-          </el-form-item>
-          <el-form-item label="手机号" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入人员手机号" maxlength="11"/>
-          </el-form-item>
-          <el-form-item label="安全帽编号" prop="aqmCode">
-            <el-input v-model="form.aqmCode" placeholder="请输入安全帽编号" maxlength="10"/>
-          </el-form-item>
-          <el-form-item label="马甲编号" prop="mjCode">
-            <el-input v-model="form.mjCode" placeholder="请输入马甲编号" maxlength="10"/>
-          </el-form-item>
-          <el-form-item label="人员岗位" prop="post">
-            <el-select v-model="form.post" placeholder="请选择人员岗位" clearable style="width: 100%;">
-            <el-option
-              v-for="dict in dict.type.post_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label="人脸照片" prop="fileName">
-            <el-upload
-                action="#"
-                :limit="1"
-                :file-list="fileList"
-                :show-file-list="true"
-                :auto-upload="false"
-                list-type="picture-card"
-                accept=".png, .jpg, .jpeg"
-                :on-change="handleChange"
-                :class="{ disabled: uploadDisabled }"
-                :on-preview="picturePreview"
-                :on-remove="handleRemove"
-            >
-                <i
-                    class="el-icon-plus avatar-uploader-icon"
-                ></i>
-            </el-upload>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm" :loading="isSubmit">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
-
-       <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-        <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-          :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-          :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-          <i class="el-icon-upload"></i>
-          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          <div class="el-upload__tip text-center" slot="tip">
-            <!-- <div class="el-upload__tip" slot="tip">
-              <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-            </div> -->
-            <span>仅允许导入xls、xlsx格式文件。</span>
-            <!-- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-              @click="importTemplate">下载模板</el-link> -->
-          </div>
-        </el-upload>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
-        </div>
-      </el-dialog>
-
-      <!-- 图片查看弹窗 -->
-      <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
-        <img width="100%" height="500px" :src="dialogImageUrl"  />
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { listPerson, addPerson, editPerson, getPersonInfo, delPerson, exportPerson, personFile,getCertificate,updateCertificate,pushFace} from "@/api/base/staff";
-  import { downloadFile,downloadFileData } from '@/utils/download'
-  import { getToken } from '@/utils/auth'
-  import uploadFile from '../../components/uploadFile.vue'
-  export default {
-    name: "Post",
-    dicts: ['sys_normal_disable','sys_user_sex','post_type'],
-    components: {
-			uploadFile
-		},
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        isSubmit: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 人员表格数据
-        postList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: undefined,
-          sex: undefined,
-          roleCode: this.$store.getters.roleCode,
-          departId: this.$store.getters.departId,
-          teamId: this.$store.getters.teamId,
-        },
-        showCertificate:false,
-        memberId:"",
-
-        accept:'.png, .jpg, .jpeg, .pdf, .doc, .docx',
-        highImgList: [],
-        electricianImgList: [],
-        elseImgList: [],
-        // 表单参数
-        form: {},
-        //图片上传
-        fileList: [],
-        //证书上传
-        certificateForm: {}, 
-        // 人员岗位
-        postTypeArr: [],
-        delHighFileIdList: [],
-        delElectFileIdList: [],
-        delElseFileIdList: [],
-        //图片查看弹窗
-        dialogImageUrl: '',
-        dialogVisible: false,
-        // 用户导入参数
-        upload: {
-          // 是否显示弹出层（用户导入）
-          open: false,
-          // 弹出层标题（用户导入）
-          title: "",
-          // 是否禁用上传
-          isUploading: false,
-          // 是否更新已经存在的用户数据
-          updateSupport: 0,
-          // 设置上传的请求头部
-          headers: { Authorization: "Bearer " + getToken() },
-          // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/bracelet/person/excelUpload"
-        },
-        // 表单校验
-        rules: {
-          name: [
-            { required: true, message: "人员姓名不能为空", trigger: "blur" }
-          ],
-          sex: [
-            { required: true, message: "人员性别不能为空", trigger: "blur" }
-          ],
-          idCard: [
-            { required: true, message: "身份证号码不能为空", trigger: "blur" },
-            {
-              pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-              message: "请输入正确的身份证号码",
-              trigger: "blur"
-            }
-          ],
-          phone: [
-            { required: true, message: "手机号不能为空", trigger: "blur" },
-            {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              message: "请输入正确的手机号码",
-              trigger: "blur"
-            }
-          ],
-          // aqmCode: [
-          //   { required: true, message: "安全帽编号不能为空", trigger: "blur" }
-          // ],
-          // mjCode: [
-          //   { required: true, message: "马甲编号不能为空", trigger: "blur" }
-          // ],
-          post: [
-            { required: true, message: "人员岗位不能为空", trigger: "blur" }
-          ],
-          // fileName: [
-          //   { required: true, message: "人脸图片不能为空", trigger: "change" }
-          // ],
-          fileName: [
-            {
-                  required: true,
-                  validator: this.fileMustUpload,
-                  trigger: "change",
-            },
-          ],
-        }
-      };
-    },
-    computed: {
-     
-        //图片上传1张后，隐藏上传框
-        uploadDisabled() {
-            return this.fileList.length > 0
-        },
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-        // base64转blob
-        base64ToBlob(code) {
-          let parts = code.split(";base64,");
-          let contentType = parts[0].split(":")[1];
-          let raw = window.atob(parts[1]);
-          let rawLength = raw.length;
-          let uInt8Array = new Uint8Array(rawLength);
-          for (let i = 0; i < rawLength; ++i) {
-            uInt8Array[i] = raw.charCodeAt(i);
-          }
-          return new Blob([uInt8Array], { type: contentType });
-        },
-
-        isImage(file){
-            this.urlTemp = require('@/assets/file.png');
-            if(this.updataIf(file)){
-                return false
-          }else{
-            return true
-          }
-        },
-      // 判断文件类型,图片预览，文件下载
-       updataIf(e) {
-                if (e.fileName) {
-                    if (e.fileName.split('.')[1] === 'png' || e.fileName.split('.')[1] === 'jpeg' || e.fileName.split('.')[1] === 'jpg') {
-                        return false
-                    } else {
-                    return true
-                    }
-                } else {
-                    if (e.name.split('.')[1] === 'png' || e.name.split('.')[1] === 'jpeg' || e.name.split('.')[1] === 'jpg') {
-                        return false
-                    } else {
-                        return true
-                    }
-                }
-            },
-      handleDownload(file) {
-        console.log(file.url)
-        if(file.status === 'ready'){
-                downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
-        }else if(file.status === 'success'){
-                downloadFileData({ fileName: file.name,fileUrl:file.url })
-        }
-      },
-      //上传组件-图片查看
-      picturePreview(file) {
-        this.dialogImageUrl = file.url;
-        if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
-          const windowName = file.name;
-          window.open(file.url,windowName)
-        }else{
-          this.dialogVisible = true
-        }
-      },
-       //自定义人脸图片必填校验
-       fileMustUpload(rule, value, callback) {
-          if (this.form.fileName == '') {
-            // 未上传文件
-            callback("请上传人脸图片");
-          }
-          callback();//不要忘记写这个callback
-        },
-        /** 查询人员列表 */
-        getList() {
-            this.loading = true;
-            listPerson(this.queryParams).then(response => {
-              this.postList = response.rows;
-              this.total = response.total;
-              this.loading = false;
-            });
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.fileList=[];
-            this.reset();
-        },
-        // 表单重置
-        reset() {
-            this.form = {};
-            this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length!=1
-            this.multiple = !selection.length
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.fileList = []
-            this.reset();
-            this.open = true;
-            this.title = "添加人员";
-        },
-        // 图片上传
-        handleChange(file, fileList) {
-            // console.log(file)
-            this.form.fileName = file.name;
-            this.$refs["form"].clearValidate()
-            this.fileList = fileList;
-        },
-        handleChangeHighImgList(file, fileList) {
-          console.log(fileList.length)
-          if(fileList.length > 5){
-            this.$message.warning('最多上传5张图片')
-            fileList = fileList.filter(item => {
-                return item.uid != file.uid
-            })
-          }
-            const fileListTemp = fileList.filter(item => {
-                        return item.uid != file.uid
-                    });
-                
-            if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){
-                this.$message.warning('文件格式不正确')
-                fileList = fileList.filter(item => {
-                    return item.uid != file.uid
-                })
-            }
-            if(file.size > 1024 * 1024 * 10){
-                    this.$message.warning('文件大小不能超过10Mb')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(file.name.length > 40){
-                    this.$message.warning('文件名长度不能超过40个字符')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(fileListTemp.some(item =>item.name === file.name)){
-                    this.$message.warning('文件名重复')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-                fileList.forEach(file=>{
-                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
-                        this.urlTemp = require('../../../assets/file.png');
-                    
-                    }
-                  }),
-            this.highImgList = fileList;
-        },
-        handleChangeElectricianImgList(file, fileList) {
-          const fileListTemp = fileList.filter(item => {
-                        return item.uid != file.uid
-                    });
-            if(fileList.length > 5){
-            this.$message.warning('最多上传5张图片')
-            fileList = fileList.filter(item => {
-                return item.uid != file.uid
-            })
-          }
-            if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){
-                this.$message.warning('文件格式不正确')
-                fileList = fileList.filter(item => {
-                    return item.uid != file.uid
-                })
-            }
-            if(file.size > 1024 * 1024 * 10){
-                    this.$message.warning('文件大小不能超过10Mb')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(file.name.length > 40){
-                    this.$message.warning('文件名长度不能超过40个字符')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(fileListTemp.some(item =>item.name === file.name)){
-                    this.$message.warning('文件名重复')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-                fileList.forEach(file=>{
-                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
-                        this.urlTemp = require('../../../assets/file.png');
-                    
-                    }
-                  }),
-            this.electricianImgList = fileList;
-        },
-        handleChangeElseImgList(file, fileList) {
-          const fileListTemp = fileList.filter(item => {
-                        return item.uid != file.uid
-                    });
-            if(fileList.length > 5){
-            this.$message.warning('最多上传5张图片')
-            fileList = fileList.filter(item => {
-                return item.uid != file.uid
-            })
-          }
-            if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){
-                this.$message.warning('文件格式不正确')
-                fileList = fileList.filter(item => {
-                    return item.uid != file.uid
-                })
-            }
-            if(file.size > 1024 * 1024 * 10){
-                    this.$message.warning('文件大小不能超过10Mb')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(file.name.length > 40){
-                    this.$message.warning('文件名长度不能超过40个字符')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-            if(fileListTemp.some(item =>item.name === file.name)){
-                    this.$message.warning('文件名重复')
-                    fileList = fileList.filter(item => {
-                        return item.uid != file.uid
-                    })
-                }
-                fileList.forEach(file=>{
-                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
-                        this.urlTemp = require('../../../assets/file.png');
-                    
-                    }
-                  }),
-            this.elseImgList = fileList;
-        },
-        //图片删除
-        handleRemove(file, fileList) {
-            let sum = 0
-            this.fileList.forEach((item, index) => {
-                if (item.uid == file.uid) {
-                  if(!item?.hasOwnProperty('raw')) {
-                    this.form.delFiles = this.form.filePath;
-                  }
-                  sum = index;
-                }
-            })
-            this.fileList.splice(sum, 1)
-            this.form.fileName = '';
-        },
-        handleRemoveHighImgList(file, fileList) {
-            let sum = 0
-            this.highImgList.forEach((item, index) => {
-                if (item.uid == file.uid) {
-                    sum = index
-                }
-            })
-            this.delHighFileIdList.push(this.highImgList[sum].fileId)
-            this.highImgList.splice(sum, 1)
-        },
-        handleRemoveElectricianImgList(file, fileList) {
-            let sum = 0
-            this.electricianImgList.forEach((item, index) => {
-                if (item.uid == file.uid) {
-                    sum = index
-                }
-            })
-            this.delElectFileIdList.push(this.electricianImgList[sum].fileId)
-            this.electricianImgList.splice(sum, 1)
-        },
-        handleRemoveElseImgList(file, fileList) {
-            let sum = 0
-            this.elseImgList.forEach((item, index) => {
-                if (item.uid == file.uid) {
-                    sum = index
-                }
-            })
-            this.delElseFileIdList.push(this.elseImgList[sum].fileId)
-            this.elseImgList.splice(sum, 1)
-        },
-        //列表-图片查看
-        openImg(url) {
-            this.dialogImageUrl = url
-            this.dialogVisible = true
-        },
-
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset();
-            const id = row.id
-            this.fileList=[];
-            getPersonInfo({id:id}).then(response => {
-              this.form = response.data;
-              this.$set(this.form,'sex',response.data.sex+'')
-              this.fileList.push({
-                name: response.data.fileId,
-                url: response.data.base64Url,
-              })
-              //触发校验
-              this.form.fileName = response.data.fileId;
-                this.open = true;
-                this.title = "修改人员";
+              </span>
              
-            });
-        },
-        /** 提交按钮 */
-        submitForm() { 
-            this.$refs["form"].validate(valid => {
-            if (valid) {
-                if (this.form.id != undefined) {
-                  //base64地址别传后台，过长
-                  this.form.base64Url = '';
-                  const reqData = new FormData()
-                  reqData.append('params', JSON.stringify(this.form))
-                  const { file } = this.getFileData()
-                  file.forEach(item => {
-                    reqData.append('file', item)
-                  })
-                  this.isSubmit=true;
-                  editPerson(reqData).then(response => {
-                    if(response.code==200){
-                      this.$modal.msgSuccess("修改成功");
-                      this.open = false;
-                      this.fileList=[];
-                      this.getList();
-                      this.isSubmit=false;
-                    }else{
-                      this.isSubmit=false;
-                    }
-                  }).catch(res=>{
-                    this.isSubmit=false;
+          </div>
+
+
+              <i class="el-icon-plus avatar-uploader-icon" ></i>
+              <!-- <div  slot="tip" class="el-upload__tip">只能上传jpg/png/jpeg/pdf/doc/docx文件，且不超过10Mb</div> -->
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="电工作业证">
+          <el-upload
+              class = "upload-demo"
+              action="#"
+              :file-list="electricianImgList"
+              :key="uploadKey"
+              :show-file-list="true"
+              :auto-upload="false"
+              list-type="picture-card"
+              accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+              :on-change="handleChangeElectricianImgList"
+              :class="{ disabled: uploadDisabled }"
+              :on-preview="picturePreview"
+              :on-remove="handleRemoveElectricianImgList"
+          >
+
+           <!-- 文件格式下载，图片格式预览 -->
+           <div slot="file" slot-scope="{file}">
+              <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+              <div v-else class="picture-card-container" >
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download" />
+                </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                <i class="el-icon-zoom-in" />
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                <i class="el-icon-delete" />
+                </span>
+              </span>
+          </div>
+
+              <i class="el-icon-plus avatar-uploader-icon" ></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="其他作业证">
+          <el-upload
+              class = "upload-demo"
+              action="#"
+              :file-list="elseImgList"
+              :key="uploadKey"
+              :show-file-list="true"
+              :auto-upload="false"
+              list-type="picture-card"
+              accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+              :on-change="handleChangeElseImgList"
+              :class="{ disabled: uploadDisabled }"
+              :on-preview="picturePreview"
+              :on-remove="handleRemoveElseImgList"
+          >
+           <!-- 文件格式下载，图片格式预览 -->
+           <div slot="file" slot-scope="{file}">
+              <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+              <div v-else class="picture-card-container" >
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download" />
+                </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                <i class="el-icon-zoom-in" />
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveElseImgList(file)">
+                <i class="el-icon-delete" />
+                </span>
+              </span>
+          </div>
+              <i  class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitCertificate">确 定</el-button>
+        <el-button @click="cancelCertificate">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改人员对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="人员姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入人员名称" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="人员性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择人员性别" clearable style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="form.idCard" placeholder="请输入人员身份证号" maxlength="18"/>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入人员手机号" maxlength="11"/>
+        </el-form-item>
+        <el-form-item label="安全帽编号" prop="aqmCode">
+          <el-input v-model="form.aqmCode" placeholder="请输入安全帽编号" maxlength="10"/>
+        </el-form-item>
+        <el-form-item label="马甲编号" prop="mjCode">
+          <el-input v-model="form.mjCode" placeholder="请输入马甲编号" maxlength="10"/>
+        </el-form-item>
+        <el-form-item label="人员岗位" prop="post">
+          <el-select v-model="form.post" placeholder="请选择人员岗位" clearable style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.post_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="人脸照片" prop="fileName">
+          <el-upload
+              action="#"
+              :limit="1"
+              :file-list="fileList"
+              :show-file-list="true"
+              :auto-upload="false"
+              list-type="picture-card"
+              accept=".png, .jpg, .jpeg"
+              :on-change="handleChange"
+              :class="{ disabled: uploadDisabled }"
+              :on-preview="picturePreview"
+              :on-remove="handleRemove"
+          >
+              <i
+                  class="el-icon-plus avatar-uploader-icon"
+              ></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :loading="isSubmit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+     <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!-- <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div> -->
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <!-- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link> -->
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl"  />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPerson, addPerson, editPerson, getPersonInfo, delPerson, exportPerson, personFile,getCertificate,updateCertificate,pushFace,getFileUrl} from "@/api/base/staff";
+import { downloadFile,downloadFileData } from '@/utils/download'
+import { getToken } from '@/utils/auth'
+import uploadFile from '../../components/uploadFile.vue'
+import _ from 'lodash';
+export default {
+  name: "Post",
+  dicts: ['sys_normal_disable','sys_user_sex','post_type'],
+  components: {
+    uploadFile
+  },
+  data() {
+    return {
+      uploadKey: Date.now(),
+      // 遮罩层
+      loading: true,
+      isSubmit: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 人员表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        sex: undefined,
+        roleCode: this.$store.getters.roleCode,
+        departId: this.$store.getters.departId,
+        teamId: this.$store.getters.teamId,
+      },
+      showCertificate:false,
+      memberId:"",
+
+      accept:'.png, .jpg, .jpeg, .pdf, .doc, .docx',
+      highImgList: [],
+      electricianImgList: [],
+      elseImgList: [],
+      // 表单参数
+      form: {},
+      //图片上传
+      fileList: [],
+      //证书上传
+      certificateForm: {}, 
+      // 人员岗位
+      postTypeArr: [],
+      delHighFileIdList: [],
+      delElectFileIdList: [],
+      delElseFileIdList: [],
+      //图片查看弹窗
+      dialogImageUrl: '',
+      dialogVisible: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/bracelet/person/excelUpload"
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "人员姓名不能为空", trigger: "blur" }
+        ],
+        sex: [
+          { required: true, message: "人员性别不能为空", trigger: "blur" }
+        ],
+        idCard: [
+          { required: true, message: "身份证号码不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "请输入正确的身份证号码",
+            trigger: "blur"
+          }
+        ],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        // aqmCode: [
+        //   { required: true, message: "安全帽编号不能为空", trigger: "blur" }
+        // ],
+        // mjCode: [
+        //   { required: true, message: "马甲编号不能为空", trigger: "blur" }
+        // ],
+        post: [
+          { required: true, message: "人员岗位不能为空", trigger: "blur" }
+        ],
+        // fileName: [
+        //   { required: true, message: "人脸图片不能为空", trigger: "change" }
+        // ],
+        fileName: [
+          {
+                required: true,
+                validator: this.fileMustUpload,
+                trigger: "change",
+          },
+        ],
+      }
+    };
+  },
+  computed: {
+   
+      //图片上传1张后，隐藏上传框
+      uploadDisabled() {
+          return this.fileList.length > 0
+      },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+      // base64转blob
+      base64ToBlob(code) {
+        let parts = code.split(";base64,");
+        let contentType = parts[0].split(":")[1];
+        let raw = window.atob(parts[1]);
+        let rawLength = raw.length;
+        let uInt8Array = new Uint8Array(rawLength);
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], { type: contentType });
+      },
+
+      isImage(file){
+          this.urlTemp = require('@/assets/file.png');
+          if(this.updataIf(file)){
+              return false
+        }else{
+          return true
+        }
+      },
+    // 判断文件类型,图片预览，文件下载
+     updataIf(e) {
+              if (e.fileName) {
+                const parts = e.fileName.split('.');
+                const extension = parts.pop();
+                  if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+                      return false
+                  } else {
+                  return true
+                  }
+              } else {
+                const parts = e.name.split('.');
+                const extension = parts.pop();
+                  if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+                      return false
+                  } else {
+                      return true
+                  }
+              }
+          },
+    handleDownload(file) {
+      console.log(file)
+      if(file.status === 'ready'){
+              downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+      }else if(file.status === 'success'){
+              getFileUrl({ filePath: file.fileId }).then(response => {
+                  downloadFileData({ fileName: file.name,fileUrl: URL.createObjectURL(this.base64ToBlob(response.data.bast64Image)) })
+              })
+              // downloadFileData({ fileName: file.name,fileUrl:file.url })
+      }
+    },
+    //上传组件-图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split('.');
+      const extension = parts.pop();
+      if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+        const windowName = file.name;
+        window.open(file.url,windowName)
+      }else{
+        this.dialogVisible = true
+      }
+    },
+     //自定义人脸图片必填校验
+     fileMustUpload(rule, value, callback) {
+        if (this.form.fileName == '') {
+          // 未上传文件
+          callback("请上传人脸图片");
+        }
+        callback();//不要忘记写这个callback
+      },
+      /** 查询人员列表 */
+      getList() {
+          this.loading = true;
+          listPerson(this.queryParams).then(response => {
+            this.postList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+      },
+      // 取消按钮
+      cancel() {
+          this.open = false;
+          this.fileList=[];
+          this.reset();
+      },
+      // 表单重置
+      reset() {
+          this.form = {};
+          this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+          this.queryParams.pageNum = 1;
+          this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+          this.resetForm("queryForm");
+          this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+          this.ids = selection.map(item => item.id)
+          this.single = selection.length!=1
+          this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+          this.fileList = []
+          this.reset();
+          this.open = true;
+          this.title = "添加人员";
+      },
+      // 图片上传
+      handleChange(file, fileList) {
+          // console.log(file)
+          this.form.fileName = file.name;
+          this.$refs["form"].clearValidate()
+          this.fileList = fileList;
+      },
+      handleChangeHighImgList(file, fileList) {
+        const fileListTemp = fileList.filter(item => {
+                      return item.uid != file.uid
                   });
-                } else {
-                  
-                  const reqData = new FormData()
-                  reqData.append('params', JSON.stringify(this.form))
-                  const { file } = this.getFileData()
-                  file.forEach(item => {
-                    reqData.append('file', item)
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+        if(fileList.length > 5){
+          this.$message.warning('最多上传5张证书')
+          fileList = fileList.filter(item => {
+              return item.uid != file.uid
+          })
+        }else if(!(extension === 'doc'||extension === 'docx'||extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')){
+              this.$message.warning('文件格式不正确')
+              fileList = fileList.filter(item => {
+                  return item.uid != file.uid
+              })
+        }else if(file.size > 1024 * 1024 * 10){
+                  this.$message.warning('文件大小不能超过10Mb')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
                   })
-                  this.isSubmit=true;
-                  addPerson(reqData).then(response => {
-                    if(response.code==200){
-                      this.$modal.msgSuccess("新增成功");
-                      this.open = false;
-                      this.fileList=[];
-                      this.getList();
-                      this.isSubmit=false;
-                    }else{
-                      this.isSubmit=false;
-                    }
-                  }).catch(res=>{
-                    this.isSubmit=false;
-                  });;
+        }else if(file.name.length > 40){
+                  this.$message.warning('文件名长度不能超过40个字符')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(fileListTemp.some(item =>item.name === file.name)){
+                  this.$message.warning('文件名重复')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }
+        fileList.forEach(file=>{
+                  if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                      this.urlTemp = require('../../../assets/file.png');
+                  
+                  }
+        }),
+        this.highImgList = fileList;
+      },
+      handleChangeElectricianImgList(file, fileList) {
+        const fileListTemp = fileList.filter(item => {
+                      return item.uid != file.uid
+                  });
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+          if(fileList.length > 5){
+          this.$message.warning('最多上传5张证书')
+          fileList = fileList.filter(item => {
+              return item.uid != file.uid
+          })
+        }else if(!(extension === 'doc'||extension === 'docx'||extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')){
+              this.$message.warning('文件格式不正确')
+              fileList = fileList.filter(item => {
+                  return item.uid != file.uid
+              })
+        }else if(file.size > 1024 * 1024 * 10){
+                  this.$message.warning('文件大小不能超过10Mb')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(file.name.length > 40){
+                  this.$message.warning('文件名长度不能超过40个字符')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(fileListTemp.some(item =>item.name === file.name)){
+                  this.$message.warning('文件名重复')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }
+        fileList.forEach(file=>{
+                  if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                      this.urlTemp = require('../../../assets/file.png');
+                  
+                  }
+        }),
+        this.electricianImgList = fileList;
+      },
+      handleChangeElseImgList(file, fileList) {
+        const fileListTemp = fileList.filter(item => {
+                      return item.uid != file.uid
+                  });
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+        if(fileList.length > 5){
+          this.$message.warning('最多上传5张证书')
+          fileList = fileList.filter(item => {
+              return item.uid != file.uid
+          })
+        }else if(!(extension === 'doc'||extension === 'docx'||extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')){
+              this.$message.warning('文件格式不正确')
+              fileList = fileList.filter(item => {
+                  return item.uid != file.uid
+              })
+        }else if(file.size > 1024 * 1024 * 10){
+                  this.$message.warning('文件大小不能超过10Mb')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(file.name.length > 40){
+                  this.$message.warning('文件名长度不能超过40个字符')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(fileListTemp.some(item =>item.name === file.name)){
+                  this.$message.warning('文件名重复')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }
+        fileList.forEach(file=>{
+                  if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                      this.urlTemp = require('../../../assets/file.png');
+                  
+                  }
+        }),
+        this.elseImgList = fileList;
+      },
+      //图片删除
+      handleRemove(file, fileList) {
+          let sum = 0
+          this.fileList.forEach((item, index) => {
+              if (item.uid == file.uid) {
+                if(!item?.hasOwnProperty('raw')) {
+                  this.form.delFiles = this.form.filePath;
                 }
-            }
-            });
-        },
-
-        //提交时循环fileList 获取raw文件
-        getFileData() {
-          const file = []
-          this.fileList.forEach(item => {
-            if (item?.hasOwnProperty('raw')) {
-              file.push(item.raw)
-            }
+                sum = index;
+              }
           })
-          return { file }
-        },
-
-        //提交时循环highImgList获取raw文件
-        getHighImgListFileData() {
-          const highfile = []
-          this.highImgList.forEach(item => {
-            if (item?.hasOwnProperty('size')) {
-              highfile.push(item.raw)
-            }
+          this.fileList.splice(sum, 1)
+          this.form.fileName = '';
+      },
+      handleRemoveHighImgList(file, fileList) {
+          let sum = 0
+          this.highImgList.forEach((item, index) => {
+              if (item.uid == file.uid) {
+                  sum = index
+              }
           })
-          console.log(highfile)
-          return { highfile }
-        },
-
-        //提交时循环electricianImgList获取raw文件
-        getElectricianImgListFileData() {
-          const electfile = []
-          this.electricianImgList.forEach(item => {
-            if (item?.hasOwnProperty('size')) {
-              electfile.push(item.raw)
-            }
+          this.delHighFileIdList.push(this.highImgList[sum].fileId)
+          console.log(this.delHighFileIdList)
+          this.highImgList.splice(sum, 1)
+      },
+      handleRemoveElectricianImgList(file, fileList) {
+          let sum = 0
+          this.electricianImgList.forEach((item, index) => {
+              if (item.uid == file.uid) {
+                  sum = index
+              }
           })
-          return { electfile }
-        },
+          this.delElectFileIdList.push(this.electricianImgList[sum].fileId)
+          this.electricianImgList.splice(sum, 1)
+      },
+      handleRemoveElseImgList(file, fileList) {
+          let sum = 0
+          this.elseImgList.forEach((item, index) => {
+              if (item.uid == file.uid) {
+                  sum = index
+              }
+          })
+          this.delElseFileIdList.push(this.elseImgList[sum].fileId)
+          this.elseImgList.splice(sum, 1)
+      },
+      //列表-图片查看
+      openImg(url) {
+          this.dialogImageUrl = url
+          this.dialogVisible = true
+      },
 
-        //提交时循环elseImgList获取raw文件
-        getElseImgListFileData() {
-        const elsefile = []
-        this.elseImgList.forEach(item => {
-          if (item?.hasOwnProperty('size')) {
-            elsefile.push(item.raw)
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+          this.reset();
+          const id = row.id
+          this.fileList=[];
+          getPersonInfo({id:id}).then(response => {
+            this.form = response.data;
+            this.$set(this.form,'sex',response.data.sex+'')
+            this.fileList.push({
+              name: response.data.fileId,
+              url: response.data.base64Url,
+            })
+            //触发校验
+            this.form.fileName = response.data.fileId;
+              this.open = true;
+              this.title = "修改人员";
+           
+          });
+      },
+      /** 提交按钮 */
+      submitForm() { 
+          this.$refs["form"].validate(valid => {
+          if (valid) {
+              if (this.form.id != undefined) {
+                //base64地址别传后台，过长
+                this.form.base64Url = '';
+                const reqData = new FormData()
+                reqData.append('params', JSON.stringify(this.form))
+                const { file } = this.getFileData()
+                file.forEach(item => {
+                  reqData.append('file', item)
+                })
+                this.isSubmit=true;
+                editPerson(reqData).then(response => {
+                  if(response.code==200){
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.fileList=[];
+                    this.getList();
+                    this.isSubmit=false;
+                  }else{
+                    this.isSubmit=false;
+                  }
+                }).catch(res=>{
+                  this.isSubmit=false;
+                });
+              } else {
+                
+                const reqData = new FormData()
+                reqData.append('params', JSON.stringify(this.form))
+                const { file } = this.getFileData()
+                file.forEach(item => {
+                  reqData.append('file', item)
+                })
+                this.isSubmit=true;
+                addPerson(reqData).then(response => {
+                  if(response.code==200){
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.fileList=[];
+                    this.getList();
+                    this.isSubmit=false;
+                  }else{
+                    this.isSubmit=false;
+                  }
+                }).catch(res=>{
+                  this.isSubmit=false;
+                });;
+              }
+          }
+          });
+      },
+
+      //提交时循环fileList 获取raw文件
+      getFileData() {
+        const file = []
+        this.fileList.forEach(item => {
+          if (item?.hasOwnProperty('raw')) {
+            file.push(item.raw)
           }
         })
-        return { elsefile }
+        return { file }
       },
 
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            console.log(row)
-            const param = {
-              id:row.id,
-              fileId:row.fileId,
-              filePath:row.filePath,
-              teamId:row.teamId,
-            }
-            this.$modal.confirm('是否确认删除人员编号为"' + row.id + '"的数据项？').then(function() {
-              return delPerson(param);
-            }).then(() => {
-              this.getList();
-              this.$modal.msgSuccess("删除成功");
-            }).catch(() => {});
-        },
-        // 推送人脸照片至人脸库
-        pushFace(row){
+      //提交时循环highImgList获取raw文件
+      getHighImgListFileData() {
+        const highfile = []
+        this.highImgList.forEach(item => {
+          if (item?.hasOwnProperty('size')) {
+            highfile.push(item.raw)
+          }
+        })
+        console.log(highfile)
+        return { highfile }
+      },
+
+      //提交时循环electricianImgList获取raw文件
+      getElectricianImgListFileData() {
+        const electfile = []
+        this.electricianImgList.forEach(item => {
+          if (item?.hasOwnProperty('size')) {
+            electfile.push(item.raw)
+          }
+        })
+        return { electfile }
+      },
+
+      //提交时循环elseImgList获取raw文件
+      getElseImgListFileData() {
+      const elsefile = []
+      this.elseImgList.forEach(item => {
+        if (item?.hasOwnProperty('size')) {
+          elsefile.push(item.raw)
+        }
+      })
+      return { elsefile }
+    },
+
+      /** 删除按钮操作 */
+      handleDelete(row) {
           console.log(row)
           const param = {
-              id:row.id,
-              filePath:row.filePath
-            }
-            this.$modal.confirm('是否确认推送姓名为"' + row.name + '"的数据项？').then(function() {
-              return pushFace(param);
-            }).then((res) => {
-              this.getList();
-              this.$modal.msgSuccess("推送成功");
-            });
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-          exportPerson(this.queryParams).then(res => {
-            downloadFile({ fileName: `人员_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
-          })
-        },
-        //模板下载
-        handleFile(){
-          personFile().then(res => {
-            downloadFile({ fileName: `人员模板.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
-          })
-        },
-        /** 导入按钮操作 */
-        handleImport() {
-          this.upload.title = "人员导入";
-          this.upload.open = true;
-        },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-        },
-        // 文件上传成功处理
-        handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-        },
-        // 提交上传文件
-        submitFileForm() {
-          this.$refs.upload.submit();
-        },
-        //打开证书上传
-        openCertificate(row){
-          this.title = "证书上传";
-          this.memberId = row.id;
-          this.highImgList = [];
-          this.electricianImgList = [];
-          this.elseImgList = [];
-          this.delHighFileIdList=[];
-          this.delElectFileIdList=[];
-          this.delElseFileIdList=[];
-          // this.showCertificate = true;
-          getCertificate(this.memberId).then(response => {
-            response.data.highImgList.forEach(item => {
-              if(item.fileType==0)
-            {
-              this.highImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
-                  name: item.fileName,
-                })
-                console.log(this.highImgList)
-            }else{
-              this.highImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: item.bast64Image,
-                  name: item.fileName,               
-                })
-            }
-              });
-            response.data.electricianImgList.forEach(item => {
-              if(item.fileType==0)
-              {
-                this.electricianImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
-                  name: item.fileName
-                })
-              }else{
-                this.electricianImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: item.bast64Image,
-                  name: item.fileName
-                })
-              }
-
-              });
-            response.data.elseImgList.forEach(item => {
-              if(item.fileType==0)
-              {
-                this.elseImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
-                  name: item.fileName
-                })
-              }else{
-                this.elseImgList.push({
-                  fileId: item.filePath,
-                  raw:item.bast64Image,
-                  url: item.bast64Image,
-                  name: item.fileName
-                })
-              }
-              });
-                this.showCertificate = true;
-
+            id:row.id,
+            fileId:row.fileId,
+            filePath:row.filePath,
+            teamId:row.teamId,
+          }
+          this.$modal.confirm('是否确认删除人员姓名为"' + row.name + '"的数据项？').then(function() {
+            return delPerson(param);
+          }).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("删除成功");
+          }).catch(() => {});
+      },
+      // 推送人脸照片至人脸库
+      pushFace(row){
+        console.log(row)
+        const param = {
+            id:row.id,
+            filePath:row.filePath
+          }
+          this.$modal.confirm('是否确认推送姓名为"' + row.name + '"的数据项？').then(function() {
+            return pushFace(param);
+          }).then((res) => {
+            this.getList();
+            this.$modal.msgSuccess("推送成功");
           });
-        },
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        exportPerson(this.queryParams).then(res => {
+          downloadFile({ fileName: `人员_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        })
+      },
+      //模板下载
+      handleFile(){
+        personFile().then(res => {
+          downloadFile({ fileName: `人员模板.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        })
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.title = "人员导入";
+        this.upload.open = true;
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+        this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      //打开证书上传
+      openCertificate:_.debounce(function(row){
+        let loading = this.$loading({
+          lock: true,
+          text: "数据加载中，请稍候...",
+          background: 'rgba(0,0,0,0.2)'
+        })
+        this.title = "证书上传";
+        this.memberId = row.id;
+        this.highImgList = [];
+        this.electricianImgList = [];
+        this.elseImgList = [];
+        this.delHighFileIdList=[];
+        this.delElectFileIdList=[];
+        this.delElseFileIdList=[];
+        this.uploadKey = Date.now();
+        // this.showCertificate = true;
+        getCertificate(this.memberId).then(response => {
+          response.data.highImgList.forEach(item => {
+            if(item.fileType==0)
+          {
+            this.highImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image == null ? '' : URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                name: item.fileName,
+              })
+              console.log(this.highImgList)
+          }else{
+            this.highImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image,
+                name: item.fileName,               
+              })
+          }
+            });
+          response.data.electricianImgList.forEach(item => {
+            if(item.fileType==0)
+            {
+              this.electricianImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image == null ? '' : URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                name: item.fileName
+              })
+            }else{
+              this.electricianImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image,
+                name: item.fileName
+              })
+            }
 
-        //关闭证书上传
-        cancelCertificate(){
-          this.highImgList = []
-          this.electricianImgList = []
-          this.elseImgList = []
-          this.showCertificate = false;
-        },
-        //提交证书上传
-        submitCertificate(){
-          this.$refs["certificateForm"].validate(valid => {
-        if (valid) {
-            const reqData = new FormData();
-            this.certificateForm.delHighFileIdList = this.delHighFileIdList;
-            this.certificateForm.delElectFileIdList = this.delElectFileIdList;
-            this.certificateForm.delElseFileIdList = this.delElseFileIdList;
-            this.delHighFileIdList.forEach(item => {
-              reqData.append('delHighFileIdList', item)
             });
-            this.delElectFileIdList.forEach(item => {
-              reqData.append('delElectFileIdList', item)
+          response.data.elseImgList.forEach(item => {
+            if(item.fileType==0)
+            {
+              this.elseImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image == null ? '' : URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                name: item.fileName
+              })
+            }else{
+              this.elseImgList.push({
+                fileId: item.filePath,
+                raw:item.bast64Image,
+                url: item.bast64Image,
+                name: item.fileName
+              })
+            }
             });
-            this.delElseFileIdList.forEach(item => {
-              reqData.append('delElseFileIdList', item)
-            });
-            const { highfile } = this.getHighImgListFileData();
-            const { electfile } = this.getElectricianImgListFileData();
-            const { elsefile } = this.getElseImgListFileData();
-            reqData.append('id', this.memberId);
-            highfile.forEach(item => {
-              reqData.append('highfile', item)
-            })
-            electfile.forEach(item => {
-              reqData.append('electfile', item)
-            })
-            elsefile.forEach(item => {
-              reqData.append('elsefile', item)
-            })
-            updateCertificate(reqData).then(response => {
-              this.$modal.msgSuccess("修改证书成功");
-              this.showCertificate = false;
-              this.highImgList=[];
-              this.electricianImgList=[];
-              this.elseImgList=[];
-              this.delHighFileIdList=[];
-              this.delElectFileIdList=[];
-              this.delElseFileIdList=[];
-              this.getList();
-            });
-        }
-      });
+            loading.close();
+              this.showCertificate = true;
 
-          this.showCertificate = false;
-        },
-  
-    }
-  };
-  </script>
+        });
+      },300),
 
-  <style lang="scss" scoped>
-  ::v-deep.el-table .fixed-width .el-button--mini {
-      width: 60px !important;
-      margin-bottom: 10px;
-  }
-  //隐藏图片上传框的css
-  ::v-deep.disabled {
-      .el-upload--picture-card {
-          display: none;
+      //关闭证书上传
+      cancelCertificate(){
+        this.highImgList = []
+        this.electricianImgList = []
+        this.elseImgList = []
+        this.showCertificate = false;
+        this.uploadKey = Date.now();
+      },
+      //提交证书上传
+      submitCertificate(){
+        this.$refs["certificateForm"].validate(valid => {
+      if (valid) {
+          const reqData = new FormData();
+          this.certificateForm.delHighFileIdList = this.delHighFileIdList;
+          this.certificateForm.delElectFileIdList = this.delElectFileIdList;
+          this.certificateForm.delElseFileIdList = this.delElseFileIdList;
+          this.delHighFileIdList.forEach(item => {
+            reqData.append('delHighFileIdList', item)
+          });
+          this.delElectFileIdList.forEach(item => {
+            reqData.append('delElectFileIdList', item)
+          });
+          this.delElseFileIdList.forEach(item => {
+            reqData.append('delElseFileIdList', item)
+          });
+          const { highfile } = this.getHighImgListFileData();
+          const { electfile } = this.getElectricianImgListFileData();
+          const { elsefile } = this.getElseImgListFileData();
+          reqData.append('id', this.memberId);
+          highfile.forEach(item => {
+            reqData.append('highfile', item)
+          })
+          electfile.forEach(item => {
+            reqData.append('electfile', item)
+          })
+          elsefile.forEach(item => {
+            reqData.append('elsefile', item)
+          })
+          updateCertificate(reqData).then(response => {
+            this.$modal.msgSuccess("修改证书成功");
+            this.showCertificate = false;
+            this.highImgList=[];
+            this.electricianImgList=[];
+            this.elseImgList=[];
+            this.delHighFileIdList=[];
+            this.delElectFileIdList=[];
+            this.delElseFileIdList=[];
+            this.getList();
+          });
       }
-  }
-  ::v-deep .el-upload-list--picture-card{
-    display: flex;
-  }
-  ::v-deep .el-upload-list__item {
-    margin-bottom: 20px;
-    overflow: revert;
-  }
-  ::v-deep .el-upload-list__item-actions{
-    overflow:hidden; 
-  }
-  .upload-demo{
-    display: flex;
-  }
-  .el-upload-list__item-thumbnail{
-    height: 145px!important;
-  }
-  .picture-card-container{
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-  }
-  .picture-card{
-    width: 100%;
-    height: 100%;
-    object-fit:cover;
-    justify-content: center;
-    // border: 1px solid  #ddd;
-    // border-radius: 4px;
-  }
-  .file-name{
-    width: 90%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    position: absolute;
-    bottom: -35px;
-    margin-top: 8px;
-    text-align: center;
-    font-size: 12px;
-    color:#333;
-    z-index: 999999;
-  }
-  .file-overlay{
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.5);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    font-size: 20px;
-  }
+    });
 
-  
-  </style>
\ No newline at end of file
+        this.showCertificate = false;
+        this.uploadKey = Date.now();
+      },
+
+  },
+  // mounted(){
+  //   this.uploadKey = Date.now();
+  // }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+}
+//隐藏图片上传框的css
+::v-deep.disabled {
+    .el-upload--picture-card {
+        display: none;
+    }
+}
+::v-deep .el-upload-list--picture-card{
+  display: flex;
+}
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: revert;
+}
+::v-deep .el-upload-list__item-actions{
+  overflow:hidden; 
+}
+.upload-demo{
+  display: flex;
+}
+.el-upload-list__item-thumbnail{
+  height: 145px!important;
+}
+.picture-card-container{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+.picture-card{
+  width: 100%;
+  height: 100%;
+  object-fit:cover;
+  justify-content: center;
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+.file-name{
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px;
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color:#333;
+  z-index: 999999;
+}
+.file-overlay{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src/views/base/temporarily/index.vue b/src/views/base/temporarily/index.vue
new file mode 100644
index 0000000..f4fa0ef
--- /dev/null
+++ b/src/views/base/temporarily/index.vue
@@ -0,0 +1,206 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+            label-width="68px">
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input v-model="queryParams.keyWord" placeholder="请输入关键字（姓名/班组）" clearable maxlength="20"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="lsList">
+            <el-table-column label="序号" align="center" width="80" type="index">
+                <template slot-scope="scope">
+                    <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="姓名" align="center" prop="name" sortable />
+            <el-table-column label="身份证号 " align="center" prop="idCard" sortable />
+            <el-table-column label="手机号" align="center" prop="phone" sortable />
+            <el-table-column label="所属班组" align="center" prop="teamName" sortable />
+            <el-table-column label="人脸信息" align="center" prop="filePath">
+                <template slot-scope="scope">
+                    <div @click="openImg(scope.row.base64Url)" style="color: #02a7f0; cursor: pointer">
+                        <img :src="scope.row.base64Url" style="width: 100px;height: 100px;">
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-delete"
+                        @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <!-- 图片查看弹窗 -->
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" height="650px" :src="dialogImageUrl" />
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getTemporarilyPersons, delTemporarilyPerson } from "@/api/base/temporarilyPerson";
+export default {
+    name: "TemporarilyPersons",
+    dicts: ['sys_normal_disable', 'sys_user_sex', 'post_type'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 临时人员表格数据
+            lsList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            formQuery: {
+                teamId: '',
+                pageNum: 1,
+                pageSize: 10,
+                name: undefined,
+                sex: undefined,
+            },
+            memberTotal: 0, // 总条数
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+            },
+            // 表单参数
+            form: {},
+            openPeople: false,
+            //图片查看弹窗
+            dialogImageUrl: '',
+            dialogVisible: false,
+        };
+    },
+
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 查询临时人员列表 */
+        getList() {
+            this.loading = true;
+            getTemporarilyPersons(this.queryParams).then(response => {
+                this.lsList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        //列表-图片查看
+        openImg(url) {
+            this.dialogImageUrl = url
+            this.dialogVisible = true
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const obj = {
+                id:row.id,
+                filePath:row.filePath,
+                fileId:row.fileId
+            }
+            this.$modal.confirm('是否确认删除姓名为"' + row.name + '"的数据项？').then(function () {
+                return delTemporarilyPerson(obj);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.el-table::before {
+    display: none !important;
+}
+
+.people-dialog {
+    width: 100%;
+    height: 500px;
+    display: flex;
+    justify-content: space-between;
+}
+
+.people-list-box {
+    width: 55%;
+    height: 98%;
+    border: 1px solid #e0e0e0;
+}
+
+.chosen-list-box {
+    width: 40%;
+    height: 98%;
+    border: 1px solid #e0e0e0;
+}
+
+.chosen-list {
+    height: 85%;
+    overflow-y: auto;
+}
+
+.chosen-list-item {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.dialog-header {
+    width: 100%;
+    height: 60px;
+    background-color: #F2F2F2;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.teamLeaderBox {
+    width: 40px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    display: inline-block;
+    font-size: 10px;
+    background: #E7F4EE;
+    border: 1px solid #19BE6B;
+    border-radius: 20px;
+    margin-left: 5px;
+    color: #19BE6B;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/construction/manage/hoistManage/hoistManage.vue b/src/views/construction/manage/hoistManage/hoistManage.vue
index 007f2ee..886e257 100644
--- a/src/views/construction/manage/hoistManage/hoistManage.vue
+++ b/src/views/construction/manage/hoistManage/hoistManage.vue
@@ -7,10 +7,10 @@
         <el-button type="primary" plain @click="searchData">查询</el-button>
       </div>
       <div class="dev-box" v-if="isShow">
-        <div :class="getStyle(item)" @click="sendParams(item.devCode, index)" v-for="(item, index) in devArr"
-          :key="item.id">
+        <div :class="getStyle(item)" @click="sendParams(item.devCode, item.warnPosition, index)"
+          v-for="(item, index) in devArr" :key="item.id">
           <img :src="dz_dev_img">
-          <div class="layout dev-info">
+          <div class="layout dev-info" :style="{ color: (item.isWarn === 0 ? '#000' : '#ff0000') }">
             <div>{{ item.proName }}</div>
             <div>班组：{{ item.teamName }}</div>
             <div>班组长：{{ item.teamLeader }}-{{ item.leaderPhone }}</div>
@@ -25,7 +25,7 @@
     </div>
     <div class="center">
       <div class="center-1">
-        <img :src="dz_dev_warn_img" />
+        <img :src="dz_dev_warn_img" style="width: 100%;height: 100%;object-fit: contain;" />
       </div>
       <div class="center-2 layout">
         <!-- 吊装视频播放 -->
@@ -46,7 +46,9 @@
             <img :src="battery3" alt="电量" v-if="parseFloat(item.electricQuantity) < 20">
             <span style="margin-left: 5px;">{{ item.electricQuantity }}%</span>
           </div>
-          <div class="jd-dev-img layout"><img :src="config" alt="配置" @click.stop="clickJdDev(item.devId, item.devCode)">
+          <div class="jd-dev-img layout">
+            <img :src="config" alt="配置" title="配置" @click.stop="clickJdDev(item.devId, item.devCode)">
+            <img :src="close" alt="关闭报警" title="关闭报警" @click.stop="closeWarn(item.devId, item.devCode)">
           </div>
         </div>
       </div>
@@ -59,7 +61,7 @@
         </div>
         <div class="infinite-list-wrapper" v-if="isShow3">
           <ul class="list" v-infinite-scroll="loadWarnInfoData" infinite-scroll-disabled="busy"
-            infinite-scroll-distance="50">
+            infinite-scroll-distance="0">
             <li v-for="(item, index) in tableData" :key="index" class="warn-li layout">
               <span class="layout">{{ item.devName }}</span>
               <span class="layout">{{ item.warnTime }}</span>
@@ -110,6 +112,18 @@
                   @click.prevent="removeConfig(data)"><i class="el-icon-delete"></i></el-button>
                 </el-col> -->
             </el-form-item>
+            <el-form-item style="margin-left: 10px;" label="距离等级" :prop="'configItems.' + index + '.nearelectric'">
+              <el-col :span="20">
+                <el-select v-model="data.nearelectric" placeholder="请选择距离等级" class="filter-item" style="width: 101%"
+                  clearable>
+                  <el-option v-for="item in nearelectricArr" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-col>
+              <!-- <el-col :span="5" style="margin-left: 10px;">
+                <el-button type="danger" plain
+                  @click.prevent="removeConfig(data)"><i class="el-icon-delete"></i></el-button>
+                </el-col> -->
+            </el-form-item>
             <!-- <hr> -->
           </div>
         </div>
@@ -124,14 +138,49 @@
   </div>
 </template>
 <script>
-import { getDzWarnList, getJdList, getLineStats, getVoltageLevelByLineStats, configJdDevice, getConfigJdDevice, getJdWarnList } from "@/api/construction/manage/hoistManage.js";
+import { getDzWarnList, getJdList, getLineStats, getVoltageLevelByLineStats, configJdDevice, getConfigJdDevice, getJdWarnList,closeJdWarn } from "@/api/construction/manage/hoistManage.js";
 import dz_dev_img from "@/assets/images/dz_dev.png";
 import dz_dev_warn_img from "@/assets/images/test.jpg";
 import jd_dev_img from "@/assets/images/jd_dev.png";
+const nearelectricArr = [
+  {
+    id: '0',
+    name: '<10KV'
+  },
+  {
+    id: '1',
+    name: '20-35KV'
+  },
+  {
+    id: '2',
+    name: '66-110KV'
+  },
+  {
+    id: '3',
+    name: '220KV'
+  },
+  {
+    id: '4',
+    name: '330KV'
+  },
+  {
+    id: '5',
+    name: '500KV'
+  },
+  {
+    id: '6',
+    name: '750KV'
+  },
+  {
+    id: '7',
+    name: '1000KV'
+  }
+]
 export default {
   name: 'hoistManage',
   data() {
     return {
+      nearelectricArr: nearelectricArr,
       keyWord: '',
       dz_dev_img: dz_dev_img,
       dz_dev_warn_img: dz_dev_warn_img,
@@ -158,6 +207,7 @@ export default {
       battery2: require('../../../../assets/images/battery2.png'),
       battery3: require('../../../../assets/images/battery3.png'),
       config: require('../../../../assets/images/config.png'),
+      close: require('../../../../assets/images/close_img.png'),
       //右侧表格数据
       tableData: [],
       //对话框开关
@@ -184,6 +234,10 @@ export default {
         pageNum: 0,
         pageSize: 10
       },
+      // 定时刷新
+      intervalId: null,
+      // 选中的吊装设备
+      checkDevCode: null
     };
   },
   created() {
@@ -195,8 +249,33 @@ export default {
       this.$refs.iframePage.src = this.htmlContent;
       this.busy = false;
     })
+    this.startRefresh();
+  },
+  destroyed() {
+    this.stopRefresh();
   },
   methods: {
+    startRefresh() {
+      // 每3分钟刷新一次
+      this.intervalId = setInterval(this.refreshData, 1000 * 60 * 3);
+    },
+    stopRefresh() {
+      if (this.intervalId) {
+        clearInterval(this.intervalId);
+        this.intervalId = null;
+      }
+    },
+    refreshData() {
+      // 预警信息定时刷新
+      this.tableData.splice(0);
+      this.queryParams.pageNum = 0;
+      this.isHasData = true;
+      this.loadWarnInfoData();
+      // 吊装设备定时刷新
+      this.devArr.splice(0);
+      this.isShow = false;
+      this.laodDzWarnList();
+    },
     /* 吊装设备点击赋值 */
     getStyle(item) {
       if (item.status === "check") {
@@ -208,11 +287,18 @@ export default {
       }
     },
     /* 向吊装视频传递参数 */
-    sendParams(devCode, index) {
+    sendParams(devCode, warnPosition, index) {
+      this.checkDevCode = devCode;
       this.devArr.forEach(item => {
         item.status = 'nocheck'
       })
       this.devArr[index].status = 'check'
+      // 设置吊装预警设备动图
+      if (warnPosition) {
+        this.dz_dev_warn_img = require('../../../../assets/gif/' + warnPosition + '.gif');
+      } else {
+        this.dz_dev_warn_img = dz_dev_warn_img;
+      }
       // 刷新dom
       this.$forceUpdate();
       this.$refs.iframePage.contentWindow.postMessage({ devCode: devCode }, '*');
@@ -230,6 +316,21 @@ export default {
         } else {
           this.isShow = false;
         }
+        if (this.checkDevCode) {
+          this.devArr.forEach((item, index) => {
+            if (item.devCode === this.checkDevCode) {
+              this.devArr[index].status = 'check'
+              // 设置吊装预警设备动图
+              if (warnPosition) {
+                this.dz_dev_warn_img = require('../../../../assets/gif/' + warnPosition + '.gif');
+              } else {
+                this.dz_dev_warn_img = dz_dev_warn_img;
+              }
+            }
+          })
+          // 刷新dom
+          this.$forceUpdate();
+        }
       }).catch(() => { })
     },
     /* 加载近电感应设备 */
@@ -262,8 +363,8 @@ export default {
           })
         } else {
           this.isHasData = false;
-          if(this.queryParams.pageNum === 1){
-              this.isShow3 = false;
+          if (this.queryParams.pageNum === 1) {
+            this.isShow3 = false;
           }
         }
         this.loading = false;
@@ -299,7 +400,7 @@ export default {
       if (this.form.configItems.length === 0) {
         this.form.configItems.push({
           configType: this.configTypeArr[0].id,
-          voltageLevel: this.jlArr[0].id,
+          voltageLevel: null,
           distance: 1,
           key: Date.now()
         });
@@ -332,7 +433,7 @@ export default {
         data.forEach((item, index) => {
           this.form.configItems.push({
             configType: item.configType,
-            voltageLevel: item.voltageLevel,
+            nearelectric: item.voltageLevel,
             distance: item.distance,
             key: Date.now()
           })
@@ -463,7 +564,19 @@ export default {
     //验证对话框确认按钮
     provingDialogConfirm() {
       this.dialogVisible = false;
-    }
+    },
+    // 关闭近电感应告警
+    closeWarn(devId, devCode) {
+      let obj = {
+        devCode: devCode,
+      }
+      this.$modal.confirm('是否确认关闭报警？').then(function () {
+        return closeJdWarn(obj);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("关闭成功");
+      }).catch(() => { });
+    },
   }
 };
 </script>
@@ -623,17 +736,17 @@ export default {
 }
 
 .jd-dev-elec {
-  width: 100px;
+  width: 70px;
   height: 100%;
   align-items: center;
   justify-content: flex-start;
 }
 
 .jd-dev-img {
-  width: 30px;
+  width: 60px;
   height: 100%;
   align-items: center;
-  justify-content: center;
+  justify-content: space-evenly;
   cursor: pointer;
 }
 
diff --git a/src/views/construction/manage/index.vue b/src/views/construction/manage/index.vue
index 105e13b..cfb85c6 100644
--- a/src/views/construction/manage/index.vue
+++ b/src/views/construction/manage/index.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="app-container" style="background-color: #F9F9F9;">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane v-for="(item, index) in tabs" :key="index" :label="item.label" :name="item.name" lazy>
+      <!-- <el-tab-pane v-for="(item, index) in tabs" :key="index" :label="item.label" :name="item.name" lazy> -->
+      <el-tab-pane v-for="(item, index) in tabs" :key="index" :name="item.name" lazy>
+        <span slot="label"><img v-if="item.label === '人员管控' && item.isWarn === 1"
+            src="../../../assets/images/warn_img.png">{{ item.label }}</span>
         <component :is=item.content v-if="item.flag"></component>
       </el-tab-pane>
     </el-tabs>
@@ -13,6 +16,7 @@
 import realTimeManage from './realTimeManage/realTimeManage.vue';
 import personManage from './personManage/personManage.vue';
 import hoistManage from './hoistManage/hoistManage.vue';
+import { getPersonControlIsWarn } from "@/api/construction/index.js";
 export default {
   name: "manage",
   components: {
@@ -25,15 +29,35 @@ export default {
       activeName: 'realTimeManage',
       currentTab: 'realTimeManage', // 默认显示的标签页组件
       tabs: [
-        { name: 'realTimeManage', label: '实时监控', content: 'realTimeManage', flag: true },
-        { name: 'personManage', label: '人员管控', content: 'personManage', flag: false },
-        { name: 'hoistManage', label: '吊装管控', content: 'hoistManage', flag: false },
+        { name: 'realTimeManage', label: '实时监控', isWarn: 0, content: 'realTimeManage', flag: true },
+        { name: 'personManage', label: '人员管控', isWarn: 1, content: 'personManage', flag: false },
+        { name: 'hoistManage', label: '吊装管控', isWarn: 0, content: 'hoistManage', flag: false },
       ],
     };
   },
   created() {
+    this.loadPersonControlIsWarn();
+  },
+  mounted() {
+    this.startRefresh();
+  },
+  destroyed() {
+    this.stopRefresh();
   },
   methods: {
+    startRefresh() {
+      // 每2分钟刷新一次
+      this.intervalId = setInterval(this.refreshData, 1000 * 60 * 2);
+    },
+    stopRefresh() {
+      if (this.intervalId) {
+        clearInterval(this.intervalId);
+        this.intervalId = null;
+      }
+    },
+    refreshData() {
+      this.loadPersonControlIsWarn();
+    },
     handleClick(tab, event) {
       const arr = this.tabs
       for (var i = 0; i < arr.length; i++) {
@@ -44,7 +68,16 @@ export default {
         }
       }
       this.tabs = arr
-    }
+    },
+    // 获取人员管控是否有告警
+    loadPersonControlIsWarn() {
+      getPersonControlIsWarn().then(res => {
+        this.tabs[1].isWarn = res.data;
+        this.$forceUpdate();
+      }).catch(res => {
+
+      });
+    },
   }
 };
 </script>
diff --git a/src/views/construction/manage/personManage/personManage.vue b/src/views/construction/manage/personManage/personManage.vue
index f07a572..b815c3b 100644
--- a/src/views/construction/manage/personManage/personManage.vue
+++ b/src/views/construction/manage/personManage/personManage.vue
@@ -16,7 +16,7 @@
       </div>
       <div class="content">
         <div id="searchBox" class="layout" v-if="isShowHistoryGj">
-          <el-button type="primary" plain @click="clsoeHistoryGj" style="margin-right: 10px;">返回</el-button>
+          <el-button type="primary" plain @click="closeHistoryGj" style="margin-right: 10px;">返回</el-button>
           <el-date-picker v-model="chooseDate" @change="loadHistoryGj" :editable="false" :clearable="false" type="date"
             format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期">
           </el-date-picker>
@@ -32,7 +32,7 @@
       </div>
       <!-- 班组 -->
       <div id="team-box" v-if="isTeam">
-        <h4>智能安全帽</h4>
+        <!-- <h4>智能安全帽</h4>
         <el-table :data="hatTable" style="width: 100%" max-height="400">
           <el-table-column prop="name" label="姓名" align="center">
           </el-table-column>
@@ -43,8 +43,8 @@
               <img style="cursor: pointer;margin-right: 10px;" title="对讲" src="../../../../assets/person_img/talk.png">
               <img style="cursor: pointer;" title="视频" src="../../../../assets/person_img/video.png">
             </template>
-          </el-table-column>
-        </el-table>
+</el-table-column>
+</el-table> -->
       </div>
       <!-- 人员 -->
       <div id="person-box" v-if="isPerson">
@@ -59,7 +59,11 @@
         </div>
         <div id="sh-info" class="layout">
           <div class="layout">
-            <div class="layout"><img src="../../../../assets/person_img/sh.png">{{ person.sh.name }}</div>
+            <div class="layout"><img src="../../../../assets/person_img/sh.png">
+              <el-tooltip class="item" effect="dark" :content="person.sh.name" placement="top-start">
+                <span>{{ person.sh.name.substr(0,16) }}...</span>
+              </el-tooltip>
+            </div>
             <div class="layout info" v-if="person.sh.elec == 100">
               <img width="30px" height="16px" src="../../../../assets/person_img/elec.png">
               {{ person.sh.elec }}%
@@ -78,7 +82,7 @@
                 src="../../../../assets/person_img/position_nowarn.png">正常
             </div>
             <div class="layout" v-if="person.sh.isWarn == 1"><img
-                src="../../../../assets/person_img/position_warn.png">异常
+                src="../../../../assets/person_img/position_warn.png"><span style="color: red;">异常</span>
             </div>
             <div class="layout info"><img src="../../../../assets/person_img/temp.png">{{ person.sh.temp }}</div>
           </div>
@@ -88,12 +92,12 @@
             <div class="layout info"><img src="../../../../assets/person_img/bloodPressure.png">{{
               person.sh.bloodPressure }}</div>
           </div>
-          <div class="layout" v-if="person.hasSafetyHat">
+          <!-- <div class="layout" v-if="person.hasSafetyHat">
             <div class="layout"><img src="../../../../assets/person_img/hat.png">{{ person.hat.name }}
             </div>
             <div class="layout info2"><img src="../../../../assets/person_img/talk.png" title="对讲"></div>
             <div class="layout info2"><img src="../../../../assets/person_img/video.png" title="播放"></div>
-          </div>
+          </div> -->
           <div class="layout">
             <div class="layout"><img src="../../../../assets/person_img/mj.png">{{ person.sh.mjCode }}</div>
           </div>
@@ -182,6 +186,7 @@ import no_warn2 from "@/assets/svg/no_warn2.svg";
 import warn from "@/assets/svg/warn.svg";
 import start from "@/assets/person_img/start.png";
 import end from "@/assets/person_img/end.png";
+import { number } from "echarts";
 export default {
   name: 'personManage',
   /* 人员树前端筛选 */
@@ -288,17 +293,7 @@ export default {
       // 预警表格
       warnTable: [],
       //保存表格数据
-      hatTable: [
-        {
-          name: '张三',
-          devName: '1号智能安全帽'
-        },
-        {
-          name: '张三',
-          devName: '1号智能安全帽'
-        }
-      ],
-
+      hatTable: [],
       //保存对话框隐藏展示
       dialogVisible1: false,
       dialogVisible2: false,
@@ -307,13 +302,77 @@ export default {
       //保存抽检树形数据
       teamTreeData: [],
       // 查看班组施工定位前，是否选中了班组
-      checkTeamId: null
+      checkTeamId: null,
+      // 定时刷新
+      intervalId: null,
+      // 选中树节点ID
+      checkNodeId: null,
+      // 选中树节点层级
+      checkNodeLevel: null,
+      // 选中树节点父节点的ID
+      checkNodeTowerId: null,
+      // 选中班组人员存的数据
+      checkPersonObj: {}
     };
   },
   created() {
     this.getPersonsTree();
   },
+  mounted() {
+    this.startRefresh();
+  },
+  destroyed() {
+    this.stopRefresh();
+  },
   methods: {
+    startRefresh() {
+      // 每3分钟刷新一次
+      this.intervalId = setInterval(this.refreshData, 1000 * 60 * 3);
+    },
+    stopRefresh() {
+      if (this.intervalId) {
+        clearInterval(this.intervalId);
+        this.intervalId = null;
+      }
+    },
+    async refreshData() {
+      // this.$message('页面刷新了');
+      // 定时刷新球机树数据
+      this.treeData.splice(0);
+      this.idArr.splice(0);
+      await this.getPersonsTree();
+      if (this.filterText) {
+        this.$refs.tree.filter(this.filterText);
+      }
+      if (this.checkNodeId) {
+        this.$refs.tree.setCurrentKey(this.checkNodeId);
+        if (this.checkNodeLevel === 4) {
+          this.idArr.push(this.checkNodeId);
+        }
+        if (this.checkNodeLevel === 2) { // 杆塔
+          this.loadWorkInfo();
+        } else if (this.checkNodeLevel === 3) { // 班组
+          this.removeOverlay();
+          const obj = {
+            'id': this.checkNodeTowerId,
+            'teamId': this.checkTeamId
+          }
+          this.loadPersonsInfo(obj, null);
+        } else if (this.checkNodeLevel === 4) { // 班组人员
+          if (!this.isShowHistoryGj) {
+            this.removeOverlay();
+            const obj = {
+              'id': this.checkNodeTowerId,
+              'teamId': this.checkTeamId
+            }
+            this.loadPersonsInfo(obj, this.checkPersonObj);
+          } else {
+            this.removeOverlay();
+            this.loadHistoryGj();
+          }
+        }
+      }
+    },
     // 当前日期
     getTodayDate() {
       const today = new Date();
@@ -332,8 +391,8 @@ export default {
       }).catch((res) => { })
     },
     /* 加载人员树 */
-    getPersonsTree() {
-      personsTree().then(res => {
+    async getPersonsTree() {
+      await personsTree().then(res => {
         const treeData = res.data;
         if (treeData && treeData.length > 0) {
           this.treeData = treeData
@@ -352,14 +411,6 @@ export default {
     },
     /* 人员树过滤 */
     filterNode(value, data, node) {
-      if (!value) {
-        if (node.level == 1 || node.level == 2) {
-          node.expanded = true
-        } else {
-          node.expanded = false
-        }
-        return true
-      }
       // 查询列表是否有匹配数据
       let val = value.toLowerCase()
       return this.chooseNode(val, data, node)
@@ -407,7 +458,6 @@ export default {
     /* 加载抽检班组人员树 */
     getTeamPersonByTower(params) {
       teamPersonByTower(params).then(res => {
-        console.log(res);
         const teamTreeData = res.data;
         if (teamTreeData && teamTreeData.length > 0) {
           this.teamTreeData = teamTreeData
@@ -416,6 +466,7 @@ export default {
             this.idArr2.push(item.id);
           })
         }
+        this.dialogVisible1 = true;
       }).catch(res => {
 
       });
@@ -430,18 +481,22 @@ export default {
       } else {
         this.filterText2 = '';
         this.getTeamPersonByTower({ 'id': this.towerId });
-        this.dialogVisible1 = true;
       }
     },
     // 自动验证配置详情
-    getCheckConfigDetail() {
-      getCheckConfig().then((res) => {
+    async getCheckConfigDetail() {
+      let loading = this.$loading({
+        lock: true,
+        text: "数据加载中，请稍候...",
+        background: 'rgba(0,0,0,0.2)'
+      })
+      await getCheckConfig().then((res) => {
         if (res.data && res.data.length > 0) {
           const data = res.data;
           const configType = data[0].configType + '';
           if (configType === '1') {
             data.forEach((item, index) => {
-              this.form.times.push({ value: item.time, key: Date.now() })
+              this.form.times.push({ value: item.time, key: Date.now() + index })
             })
           } else if (configType === '2') {
             this.form.timeNum = parseInt(res.data[0].time);
@@ -450,9 +505,11 @@ export default {
         } else {
           this.form.configType = '1';
         }
+
       }).catch((res) => {
 
       })
+      loading.close();
       this.dialogVisible2 = true;
     },
     // 模式选择为固定时间-添加多个时间
@@ -532,8 +589,8 @@ export default {
       }).catch((res) => { })
     },
     // 人员树选中人员加载的数据
-    loadPersonDetail(params) {
-      getPersonDetail(params).then((res) => {
+    async loadPersonDetail(params) {
+      await getPersonDetail(params).then((res) => {
         const data = res.data;
         if (data && data.vo) {
           const obj = data.vo;
@@ -558,13 +615,13 @@ export default {
       }).catch((res) => { })
     },
     // 人员历史轨迹
-    loadHistoryGj() {
+    async loadHistoryGj() {
       // 手环设备ID和开始时间
       let obj = {
         'id': this.person.sh.devId,
         'startTime': this.chooseDate
       };
-      getHistoryGj(obj).then((res) => {
+      await getHistoryGj(obj).then((res) => {
         const data = res.data;
         if (data && data.length > 0) {
           this.gjArr = data;
@@ -590,7 +647,12 @@ export default {
     },
     //人员树组件节点点击
     handleNodeClick(data, node, item) {
+      this.checkNodeId = data.id;
+      this.checkNodeLevel = data.level;
       this.towerId = undefined;
+      this.checkTeamId = null;
+      this.checkNodeTowerId = null;
+      this.checkPersonObj = {};
       if (node.level === 2) {
         this.removeOverlay();
         // 选中杆塔赋值towerId,用于手环人员验证抽检
@@ -614,6 +676,7 @@ export default {
           'teamId': teamId
         }
         this.checkTeamId = teamId;
+        this.checkNodeTowerId = towerId;
         this.loadPersonsInfo(obj, null);
       } else if (node.level === 4) {
         this.isTower = false;
@@ -628,7 +691,18 @@ export default {
             'teamId': teamId
           }
           this.checkTeamId = teamId;
-          this.loadPersonsInfo(obj, data);
+          this.checkNodeTowerId = towerId;
+          this.checkPersonObj = _.cloneDeep(data);
+          if (this.isShowHistoryGj) {
+            // 历史轨迹打开，只切换历史轨迹数据
+            const obj = {
+              'id': data.type === 0 ? parseInt(data.id.replace('zs-', '')) : parseInt(data.id.replace('ls-', '')),
+              'type': data.type
+            }
+            this.relaodHistoryGj(obj);
+          } else {
+            this.loadPersonsInfo(obj, data);
+          }
         } else {
           // 选中班组人员 触发事件
           this.clickMarker(data);
@@ -640,6 +714,11 @@ export default {
         this.removeOverlay();
       }
     },
+    async relaodHistoryGj(obj){
+      this.removeOverlay();
+      await this.loadPersonDetail(obj);
+      await this.loadHistoryGj();
+    },
     // 清除百度地图覆盖物
     removeOverlay() {
       this.map.clearOverlays();
@@ -650,6 +729,17 @@ export default {
     },
     // 点击地图人员覆盖物触发的事件
     clickMarker(item) {
+      this.checkNodeLevel = 4;
+      this.checkPersonObj = item;
+      let userId = null;
+      if (new RegExp(/^[0-9]*$/).test(item.id)) {
+        userId = item.id;
+        this.$refs.tree.setCurrentKey(item.type === 0 ? 'zs-' + item.id : 'ls-' + item.id);
+        this.checkNodeId = item.type === 0 ? 'zs-' + item.id : 'ls-' + item.id;
+      } else {
+        userId = item.type === 0 ? parseInt(item.id.replace('zs-', '')) : parseInt(item.id.replace('ls-', ''))
+        this.checkNodeId = item.id;
+      }
       const allOverlay = this.map.getOverlays();
       for (let index = 0; index < allOverlay.length; index++) {
         let overlay = allOverlay[index];
@@ -666,7 +756,7 @@ export default {
         let overlay = allOverlay[index];
         // 判断是否是点的覆盖物
         const flag = this.isOverlayPoint(overlay);
-        if (flag && ("marker-" + item.type + '-' + item.id === overlay.id)) {
+        if (flag && ("marker-" + item.type + '-' + userId === overlay.id)) {
           if (item.isWarn === 0) {
             let myIcon = new BMap.Icon(no_warn2, new BMap.Size(50, 50))
             myIcon.setImageSize(new BMap.Size(50, 50));
@@ -680,7 +770,7 @@ export default {
       this.isPerson = true;
       // id：人员ID type: 0 班组成员 1 临时人员
       const obj = {
-        'id': item.id,
+        'id': userId,
         'type': item.type
       }
       this.loadPersonDetail(obj);
@@ -693,7 +783,6 @@ export default {
     },
     /* 添加人员定位的覆盖物 */
     addPersonMarker(item) {
-      console.log(item);
       let point = new BMap.Point(item.lon, item.lat)
       let marker = "", myIcon = "";
       if (item.isWarn === 0) {
@@ -711,23 +800,30 @@ export default {
       marker.isWarn = item.isWarn;
       this.map.addOverlay(marker);
       // 添加监听事件
+
       marker.addEventListener("click", () => { this.clickMarker(item) });
     },
     // 人员绑定手环历史轨迹
     openHistoryGj() {
-      this.removeOverlay();
-      this.loadHistoryGj();
-      this.isShowHistoryGj = true;
+      if (!this.isShowHistoryGj) {
+        this.removeOverlay();
+        this.loadHistoryGj();
+        this.isShowHistoryGj = true;
+      }
     },
     // 关闭历史轨迹
-    clsoeHistoryGj() {
+    closeHistoryGj() {
       this.removeOverlay();
       this.isShowHistoryGj = false;
       const obj = {
-        'id': this.id,
-        'teamId': this.teamId
+        'id': this.checkNodeTowerId,
+        'teamId': this.checkTeamId
+      }
+      if (Object.keys(this.checkPersonObj).length === 0) {
+        this.loadPersonsInfo(obj, null);
+      } else {
+        this.loadPersonsInfo(obj, this.checkPersonObj);
       }
-      this.loadPersonsInfo(obj, null);
     },
     // 获取人员运动轨迹
     loadGj() {
@@ -760,8 +856,12 @@ export default {
     },
     //给人员树不同层级设置不同的icon
     renderContent(h, { node, data }) {
+      let isTeamLeader = data.isTeamLeader, type = data.type, isWarn = data.isWarn, style = '';
+      if (isWarn === 1) {
+        style = 'warnColor'
+      }
       // 根据层级使用不同的图标
-      let icon, span = <span>{node.label}</span>, isTeamLeader = data.isTeamLeader, type = data.type;
+      let icon, span = <span class={style}>{node.label}</span>;
       if (node.level === 1) {
         icon = 'pro_icon';
       } else if (node.level === 2) {
@@ -770,10 +870,13 @@ export default {
         icon = 'team_nocheck_icon';
       } else if (node.level === 4 && isTeamLeader === 1) {
         icon = '';
-        span = <span>{node.label} <el-tag size="mini">班组长</el-tag></span>;
+        span = <span class={style}>{node.label}<el-tag size="mini">班组长</el-tag></span>;
       } else if (node.level === 4 && type === 1) {
         icon = '';
-        span = <span>{node.label} <el-tag size="mini">临时人员</el-tag></span>;
+        span = <span class={style}>{node.label} <el-tag size="mini">临时人员</el-tag></span>;
+      } else if (node.level === 4 && isTeamLeader === 0 && type === 0) {
+        icon = '';
+        span = <span class={style}>{node.label}</span>;
       }
       return (
         <span class="custom-tree-node">
@@ -820,7 +923,7 @@ export default {
       checkedNodes.forEach(item => {
         console.error(item.parentId);
         if (item.parentId !== -1 && item.parentId !== 0) {
-          checkArr.push({ "userId": item.id, "userType": item.userType, "devCode": item.devCode, "shCode": item.shCode })
+          checkArr.push({ "userId": parseInt(item.id.replace('team-', '')), "userType": item.userType, "devCode": item.devCode, "shCode": item.shCode })
         }
       });
       if (checkArr.length == 0) {
@@ -832,6 +935,8 @@ export default {
       const obj = {
         'spotCheckList': checkArr
       }
+      console.log(obj);
+
       spotCheck(obj).then((res) => {
         this.$modal.msgSuccess(res.msg);
         this.dialogVisible1 = false;
@@ -1088,4 +1193,8 @@ export default {
 ::v-deep .team_nocheck_icon {
   background-image: url("../../../../assets/images/team_nocheck_icon.png") !important;
 }
+
+::v-deep .warnColor {
+  color: red;
+}
 </style>
diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue
index 1d37a32..10dbf55 100644
--- a/src/views/construction/manage/realTimeManage/realTimeManage.vue
+++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue
@@ -76,7 +76,7 @@
       </div>
       <!-- 违章识别 -->
       <div class="vio-box">
-        <el-carousel height="200px" indicator-position="outside" :interval="100000" @change="loadVioInfos"
+        <el-carousel height="200px" indicator-position="outside" :interval="10000" @change="loadVioInfos"
           v-if="vioArr.length > 0">
           <el-carousel-item v-for="(itemArr, arrIndex) in vioArr" :key="arrIndex">
             <div class="vio-box-info layout">
@@ -108,7 +108,7 @@
       <h4>预警信息</h4>
       <div class="infinite-list-wrapper" v-if="isShow3">
         <ul class="list" v-infinite-scroll="loadWarnInfoData" infinite-scroll-disabled="busy"
-          infinite-scroll-distance="50">
+          infinite-scroll-distance="0">
           <li v-for="(item, index) in warnInfoArr" :key="index" class="warn-li layout">
             <span class="layout">{{ item.devTypeName }}</span>
             <span class="layout">{{ item.devName }}</span>
@@ -164,7 +164,11 @@ export default {
       // 窗口数量
       boxNum: 1,//1窗口或4窗口
       boxIndex:1,//视频下标
-      classStyle: 'ball-content'
+      classStyle: 'ball-content',
+      // 定时刷新
+      intervalId: null,
+      // 选中树节点ID
+      checkNodeId:null
     };
   },
   created() {
@@ -175,11 +179,45 @@ export default {
     this.$nextTick(() => {
       this.busy = false;
     });
+    this.startRefresh();
+  },
+  destroyed() {
+    this.stopRefresh();
   },
   methods: {
+    startRefresh() {
+      // 每5分钟刷新一次
+      this.intervalId = setInterval(this.refreshData, 1000 * 60 * 5);
+    },
+    stopRefresh() {
+      if (this.intervalId) {
+        clearInterval(this.intervalId);
+        this.intervalId = null;
+      }
+    },
+    async refreshData() {
+      // 定时刷新球机树数据
+      this.treeData.splice(0);
+      this.idArr.splice(0);
+      await this.laodBallDeviceLists();
+      if(this.filterText){
+        this.$refs.tree.filter(this.filterText);
+      }
+      if(this.checkNodeId){
+        this.$refs.tree.setCurrentKey(this.checkNodeId);
+      }
+      // 定时刷新预警信息
+      this.warnInfoArr.splice(0);
+      this.queryParams.pageNum = 0;
+      this.isHasData = true;
+      this.loadWarnInfoData();
+      // 刷新球机违章识别
+      this.vioArr.splice(0);
+      this.loadBallWarnLists();
+    },
     /* 加载球机树 */
-    laodBallDeviceLists() {
-      getBallDeviceLists().then(res => {
+   async laodBallDeviceLists() {
+     await getBallDeviceLists().then(res => {
         const treeData = res.data;
         if (treeData && treeData.length > 0) {
           this.treeData = treeData
@@ -293,7 +331,7 @@ export default {
     },
     //球机树节点点击
     handleNodeClick(data, node, item) {// 点击球机时触发的事件
-      console.log(node)
+      this.checkNodeId = data.id;
       if (node.level === 2) {
         if(this.boxNum==1){
           this.$refs[`monitor`+1].closeVideo()