人员管理修改

src/api/base/staff.js

@@ -60,6 +60,14 @@ export function delPerson(data) {
         data: data
     })
 }
+// 推送人脸照片到人脸库
+export function pushFace(data) {
+    return request({
+        url: '/bracelet/person/pushFace',
+        method: 'post',
+        data: data
+    })
+}
 
 // 修改证书
 export function updateCertificate(data) {

src/views/base/staff/index.vue

@@ -100,8 +100,15 @@
                 <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
             </template>
         </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="idCard" />
+        <el-table-column label="身份证号" align="center" prop="idCard" width="200" />
         <el-table-column label="电话" align="center" prop="phone" />
+        <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">
@@ -120,7 +127,7 @@
               </div>
           </template>
         </el-table-column> 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -136,6 +143,14 @@
               @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>
@@ -244,6 +259,16 @@
           <el-form-item label="马甲编号" prop="mjCode">
             <el-input v-model="form.mjCode" placeholder="请输入马甲编号" maxlength="20"/>
           </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="#"
@@ -300,13 +325,13 @@
   </template>
   
   <script>
-  import { listPerson, addPerson, editPerson, getPersonInfo, delPerson, exportPerson, personFile,getCertificate,updateCertificate} from "@/api/base/staff";
+  import { listPerson, addPerson, editPerson, getPersonInfo, delPerson, exportPerson, personFile,getCertificate,updateCertificate,pushFace} from "@/api/base/staff";
   import { downloadFile } 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'],
+    dicts: ['sys_normal_disable','sys_user_sex','post_type'],
     components: {
 			uploadFile
 		},
@@ -353,7 +378,8 @@
         fileList: [],
         //证书上传
         certificateForm: {}, 
-
+        // 人员岗位
+        postTypeArr: [],
         delHighFileIdList: [],
         delElectFileIdList: [],
         delElseFileIdList: [],
@@ -399,11 +425,14 @@
               trigger: "blur"
             }
           ],
-          aqmCode: [
+          // aqmCode: [
-            { required: true, message: "安全帽编号不能为空", trigger: "blur" }
+          //   { required: true, message: "安全帽编号不能为空", trigger: "blur" }
-          ],
+          // ],
-          mjCode: [
+          // mjCode: [
-            { required: true, message: "马甲编号不能为空", trigger: "blur" }
+          //   { required: true, message: "马甲编号不能为空", trigger: "blur" }
+          // ],
+          post: [
+            { required: true, message: "人员岗位不能为空", trigger: "blur" }
           ],
           // fileName: [
           //   { required: true, message: "人脸图片不能为空", trigger: "change" }
@@ -682,6 +711,20 @@
               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 => {

src/views/base/team/index.vue

@@ -424,7 +424,7 @@
         // 获取人员列表
         getPersonList(){
             let param = {
-                type:1,//1.全部人员 2.未分配人员 3.已分配人员
+                type:1,//1.全部人员 2.未分配人员 3.已分配人员 4.班组长
                 roleCode: this.$store.getters.roleCode,
                 departId: this.$store.getters.departId,
                 teamId: this.$store.getters.teamId,