From dc9d85c7abf2f940f086ad5e3dcf89e46da7cefd Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 9 Jul 2024 15:44:12 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=20-=20=E5=AE=8C=E5=96=84=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=E6=9C=BA=E5=88=B6=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8F=8B=E5=A5=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 01ec759..ac30511 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -292,7 +292,11 @@ export default {
           }
           upload('/xgf/user/approveMax', formData)
             .then((data) => {
-              this.$message.success('推送成功')
+              if (data.errorMessage == ''){
+                this.$message.success('推送成功')
+              }else {
+                this.$message.error(data.errorMessage)
+              }
               this.visible = false
               this.$emit('refresh', '')
               this.handleClose()

From 2183c0f914517a8d9c15a8cae16797b2a27c63eb Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 12 Jul 2024 14:21:34 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E8=B5=84=E8=B4=A8=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/qualifications/components/edit.vue   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/corpInfo/information/qualifications/components/edit.vue b/src/views/corpInfo/information/qualifications/components/edit.vue
index 8ec6e4c..f17ae67 100644
--- a/src/views/corpInfo/information/qualifications/components/edit.vue
+++ b/src/views/corpInfo/information/qualifications/components/edit.vue
@@ -86,7 +86,15 @@ export default {
         NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
         VALIDITYTIME: [{ required: true, message: '证书有效期不能为空', trigger: 'blur' }],
         NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-        FILE: [{ required: true, message: '图片不能为空', trigger: 'blur' }]
+        FILE: [
+          { validator: (rule, value, callback) => {
+            if (this.certificate_files.length > 0) {
+              callback()
+            } else {
+              callback(new Error('图片不能为空'))
+            }
+          }, trigger: 'blur' }
+        ]
       }
     }
   },
@@ -191,6 +199,8 @@ export default {
       if (!isImage) {
         this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
         fileList.pop()
+      } else {
+        this.beforeFileUpload(file)
       }
     },
     handlePictureCardPreview(file) {

From aa8d744fcfb9b106ef3eeba2a7ab4e913b23b6a2 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Mon, 15 Jul 2024 16:12:21 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=20-=20?=
 =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0=E8=B4=A6=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hiddenApi/publicMethod/list.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue
index 6d1ab62..76168b7 100644
--- a/src/views/hiddenApi/publicMethod/list.vue
+++ b/src/views/hiddenApi/publicMethod/list.vue
@@ -101,6 +101,14 @@
             />
           </el-form-item>
         </el-col>
+        <el-col v-if="hiddenVueType !='ignore'" :span="4">
+          <el-form-item label="是否相关方">
+            <el-select v-model="condform.isrelevant" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="item in isrelevantList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
@@ -271,7 +279,8 @@ export default {
         state: '', // 隐患状态
         hiddenpart: '', // 隐患部位
         hiddenType: '', // 隐患类型
-        creatorUserDept: ''// 隐患发现部门
+        creatorUserDept: '', // 隐患发现部门
+        isrelevant: '' // 是否相关方
       },
       /** 条件中的字段,没有放在form表单中,是因为怕动态加载中出现问题 **/
       sourceList: [
@@ -281,6 +290,10 @@ export default {
         { ID: '5', NAME: '安全环保检查(企业端)' },
         { ID: '6', NAME: '消防检查' }
       ],
+      isrelevantList: [
+        { ID: '1', NAME: '是' },
+        { ID: '2', NAME: '否' }
+      ],
       statusList: [
         { ID: '1', NAME: '未整改' },
         { ID: '2', NAME: '已整改' },

From 06a234831966419c41f09a3b64c29e45e1c5c2ad Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 17 Jul 2024 19:32:07 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E8=B5=84=E8=B4=A8=E5=8E=BB=E6=8E=89=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/qualifications/components/edit.vue    | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/views/corpInfo/information/qualifications/components/edit.vue b/src/views/corpInfo/information/qualifications/components/edit.vue
index f17ae67..ecd971b 100644
--- a/src/views/corpInfo/information/qualifications/components/edit.vue
+++ b/src/views/corpInfo/information/qualifications/components/edit.vue
@@ -85,16 +85,7 @@ export default {
       rules: {
         NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
         VALIDITYTIME: [{ required: true, message: '证书有效期不能为空', trigger: 'blur' }],
-        NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-        FILE: [
-          { validator: (rule, value, callback) => {
-            if (this.certificate_files.length > 0) {
-              callback()
-            } else {
-              callback(new Error('图片不能为空'))
-            }
-          }, trigger: 'blur' }
-        ]
+        NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }]
       }
     }
   },

From 5505de7f301a88693e95b8e377d322076cb60b41 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 22 Jul 2024 14:03:40 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E9=98=B2=E7=82=B9=E4=BD=8D=E6=89=AB=E7=A0=81=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=82=B9=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFH5bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firefighting/points/components/list.vue   | 15 +++++----
 .../meteorologicalMonitoringDisplay/index.vue | 32 +++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue

diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index a16744e..d28bce7 100644
--- a/src/views/firefighting/points/components/list.vue
+++ b/src/views/firefighting/points/components/list.vue
@@ -246,13 +246,14 @@ export default {
     handleShowQr(ROW) {
       this.dialogFormShow = true
       this.qrInfo = ROW
-      // this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
-      const json = {
-        MANAGER_TYPE: 'fireListManager',
-        FIRE_POINT_ID: ROW.FIRE_POINT_ID
-      }
-      const jsonStr = JSON.stringify(json)
-      this.qrcodeStr = jsonStr
+      // 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun
+      this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
+      // const json = {
+      //   MANAGER_TYPE: 'fireListManager',
+      //   FIRE_POINT_ID: ROW.FIRE_POINT_ID
+      // }
+      // const jsonStr = JSON.stringify(json)
+      // this.qrcodeStr = jsonStr
     },
     handleEdit(FIRE_POINT_ID) {
       this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
diff --git a/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
new file mode 100644
index 0000000..efcee40
--- /dev/null
+++ b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-container">
+    <iframe
+      :src="'http://192.168.42.57:8080/QinHuangDao'"
+      width="100%"
+      height="100%"
+      allowfullscreen
+      style="overflow-y:hidden;overflow-x:hidden;"/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  components: {
+  },
+  data() {
+    return {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.iframe-container {
+  position: fixed;
+  top: 10;
+  left: 10;
+  width: 90%;
+  height: 90%;
+}
+</style>

From bfb78fcb9069682ae45e73d5ce74b34716cb8d0e Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 24 Jul 2024 08:44:58 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/corpInfo/user/components/edit.vue   |  375 ++-
 src/views/corpInfo/user/components/list.vue   |   79 +-
 .../corpInfo/userCenter/components/edit.vue   | 2085 +++++++++++++++++
 .../corpInfo/userCenter/components/list.vue   | 1315 +++++++++++
 src/views/corpInfo/userCenter/index.vue       |   34 +
 src/views/hiddenApi/publicMethod/list.vue     |    1 -
 6 files changed, 3779 insertions(+), 110 deletions(-)
 create mode 100644 src/views/corpInfo/userCenter/components/edit.vue
 create mode 100644 src/views/corpInfo/userCenter/components/list.vue
 create mode 100644 src/views/corpInfo/userCenter/index.vue

diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index ffe26cf..eda6399 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -42,7 +42,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="用户名" prop="USERNAME">
-                <el-input v-model="form.USERNAME" placeholder="默认用户手机号码..."/>
+                <el-input v-model="form.USERNAME" placeholder="默认用户手机号码..." @change="goCheck()"/>
                 <a style="color: red">
                 <span>如果修改手机号，登录密码则会变成初始密码“Aa@123456789”</span></a>
               </el-form-item>
@@ -63,18 +63,90 @@
                   <el-button v-if="form.PERSON_TYPE == '主要负责人' || form.PERSON_TYPE == '安全管理人员' || form.PERSON_TYPE == '特种作业人员'" plain type="success" @click="changePersonType">补充证照信息</el-button>
                 </div>
               </el-form-item>
-              <el-form-item label="定位卡号" prop="CARDNO">
-                <el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>
-              </el-form-item>
-              <el-form-item label="门口门禁卡号" prop="MKMJCARD">
-                <el-input v-model="form.MKMJCARD" placeholder="这里输入门口门禁卡号..."/>
+              <el-form-item label="身份证号" prop="USER_ID_CARD">
+                <el-input v-model="form.USER_ID_CARD" placeholder="这里输入身份证号..." @change="goCheck()"/>
               </el-form-item>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="民族" prop="NATION">
+                    <el-select v-model="form.NATION" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in uesrInfoDic.minzuList"
+                        :key="item.DICTIONARIES_ID"
+                        :label="item.NAME"
+                        :value="item.DICTIONARIES_ID"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="性别" prop="SEX">
+                    <el-select v-model="form.SEX" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in uesrInfoDic.xingbieList"
+                        :key="item.DICTIONARIES_ID"
+                        :label="item.NAME"
+                        :value="item.DICTIONARIES_ID"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!--              <el-form-item label="定位卡号" prop="CARDNO">-->
+              <!--                <el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>-->
+              <!--              </el-form-item>-->
+              <!--              <el-form-item label="门口门禁卡号" prop="MKMJCARD">-->
+              <!--                <el-input v-model="form.MKMJCARD" placeholder="这里输入门口门禁卡号..."/>-->
+              <!--              </el-form-item>-->
               <el-form-item label="是否为隐患确认人" prop="IS_HAZARDCONFIRMER">
                 <el-radio-group v-model="form.IS_HAZARDCONFIRMER">
                   <el-radio :label="0" value="0">否</el-radio>
                   <el-radio :label="1" value="1">是</el-radio>
                 </el-radio-group>
               </el-form-item>
+              <el-form-item v-if="form.face_file.length > 0" label="旧人脸信息">
+                <div class="slideshow">
+                  <div class="disContent">
+                    <div v-for="(item, index) in form.face_file" :key="index" class="img-div">
+                      <img :src="config.fileUrl + item.FILEPATH" alt="">
+                      <div class="disContent-hide">
+                        <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                          <span class="el-icon-zoom-in yuLan">
+                            <viewer :images="form.face_file">
+                              <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                            </viewer>
+                          </span>
+                        </el-tooltip>
+                        <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                          <span class="Delete" @click="deleteCertificate(index)"><i class="el-icon-delete"/></span>
+                        </el-tooltip>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+              <el-form-item label="上传人脸照片">
+                <div style="display: flex;align-items: center">
+                  <el-upload
+                    ref="uploadUserAvatar"
+                    :on-preview="handlePictureCardPreview"
+                    :before-upload="beforeFileUploadByFace"
+                    :on-change="handleChangeIMGFace"
+                    :auto-upload="false"
+                    :limit="1"
+                    class="avatar-uploader"
+                    action="#"
+                    accept=".jpg,.jpeg,.png"
+                    list-type="picture-card">
+                    <i class="el-icon-plus"/>
+                  </el-upload>
+                  <div style="margin-left:20px;line-height:1.6">
+                    <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
+                    <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
+                    <div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
+                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
+                    <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
+                  </div>
+                </div>
+              </el-form-item>
               <el-form-item label="部门排序" prop="SORT">
                 <el-input v-model="form.SORT" placeholder="这里输入部门排序..." @keyup.native="number"/>
               </el-form-item>
@@ -151,33 +223,6 @@
           <el-col :span="12">
             <div class="left_border_super">
               <template v-if="form.ISSTUDENT">
-                <el-form-item label="身份证号" prop="USER_ID_CARD">
-                  <el-input v-model="form.USER_ID_CARD" placeholder="这里输入身份证号..."/>
-                </el-form-item>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="民族" prop="NATION">
-                      <el-select v-model="form.NATION" placeholder="请选择" style="width: 100%;">
-                        <el-option
-                          v-for="item in uesrInfoDic.minzuList"
-                          :key="item.DICTIONARIES_ID"
-                          :label="item.NAME"
-                          :value="item.DICTIONARIES_ID"/>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="性别" prop="SEX">
-                      <el-select v-model="form.SEX" placeholder="请选择" style="width: 100%;">
-                        <el-option
-                          v-for="item in uesrInfoDic.xingbieList"
-                          :key="item.DICTIONARIES_ID"
-                          :label="item.NAME"
-                          :value="item.DICTIONARIES_ID"/>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
                 <el-row :gutter="20">
                   <el-col :span="12">
                     <el-form-item label="政治面貌" prop="POLITICAL_OUTLOOK">
@@ -366,30 +411,6 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="上传人脸照片">
-                  <div style="display: flex;align-items: center">
-                    <el-upload
-                      ref="uploadUserAvatar"
-                      :on-preview="handlePictureCardPreview"
-                      :on-change="handleChangeIMG"
-                      :on-exceed="handleExceed"
-                      :on-remove="handlePictureCardRemove"
-                      :auto-upload="false"
-                      :limit="1"
-                      class="avatar-uploader"
-                      action="#"
-                      accept=".jpg,.jpeg,.png"
-                      list-type="picture-card">
-                      <i class="el-icon-plus"/>
-                    </el-upload>
-                    <div style="margin-left:20px;line-height:1.6">
-                      <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
-                      <div style="color: red;font-size: 12px">* 图像大小：不超过3M。</div>
-                      <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
-                      <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆秦港APP中进行人脸照片采集）</div>
-                    </div>
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.userCerList.length > 0" label="已上传证书">
                   <div class="slideshow">
                     <div class="disContent">
@@ -441,7 +462,8 @@
     </div>
     <div class="ui-height"/>
     <div class="ui-foot">
-      <el-button type="success" @click="confirm">保 存</el-button>
+      <el-button v-show="ISCHECK" type="success" @click="confirm">保 存</el-button>
+      <el-button v-show="!ISCHECK" type="success" @click="goCheck">校 验</el-button>
       <el-button plain type="info" @click="goBack">返 回</el-button>
     </div>
     <el-dialog :visible.sync="dialogFormLicenseInformation" title="证照信息" width="600px">
@@ -732,6 +754,7 @@ export default {
       }
     }
     return {
+      ISCHECK: false,
       dayTime: [],
       LevelsData: [],
       dialogFormEditDate: false,
@@ -775,7 +798,7 @@ export default {
           { validator: hasUser, trigger: 'blur' }
         ],
         EMAIL: [
-          { required: false, message: '请输入邮箱', trigger: 'blur' },
+          { required: true, message: '请输入邮箱', trigger: 'blur' },
           {
             pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
             message: '请输入正确的邮箱'
@@ -878,8 +901,11 @@ export default {
         letTypeOfWorkType: 'select',
         USER_ID_CARD: '',
         PERSONNEL_TYPE: '',
-        userCerList: []
+        userCerList: [],
+        face_file: [],
+        CORPINFO_NAME: ''
       },
+      IMGFILES_ID: '',
       uesrInfoDic: {
         minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd
         zhengzhimianmaoList: [], // 政治面貌 6351efdd12dc4730952e5d195718e252
@@ -988,6 +1014,9 @@ export default {
     this.getScheduleAll()
     this.getDict()
     // this.getLearnerCategory() // 学员类型已取消
+    if (this.$parent.IMGFILES_ID != '') {
+      this.IMGFILES_ID = this.$parent.IMGFILES_ID
+    }
     if (this.$parent.USER_ID == '') {
       this.handleAdd()
     } else {
@@ -995,6 +1024,41 @@ export default {
     }
   },
   methods: {
+    goCheck() {
+      if (this.form.USER_ID_CARD && this.form.USERNAME) {
+        const phoneJudge = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[0-9])\d{8}$/
+        const phoneResult = phoneJudge.test(this.form.USERNAME)
+        const cardJudge = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+        const cardResult = cardJudge.test(this.form.USER_ID_CARD)
+        if (phoneResult && cardResult) {
+          console.log('格式校验通过')
+          requestFN(
+            'user/goCheck',
+            {
+              CARD_NO: this.form.USER_ID_CARD,
+              USER_ID: this.form.USER_ID,
+              USERNAME: this.form.USERNAME
+            }
+          ).then((data) => {
+            if (data.result === 'success') {
+              this.$message.success('验证通过')
+              this.ISCHECK = true
+            } else {
+              this.$message.error('验证失败，请确认身份证号与手机号是否正确')
+              this.ISCHECK = false
+            }
+          }).catch((e) => {
+            this.listLoading = false
+            this.ISCHECK = false
+          })
+        } else {
+          this.ISCHECK = false
+        }
+      } else {
+        this.$message.warning('请确认身份证号与手机号后进行校验')
+        this.ISCHECK = false
+      }
+    },
     getScheduleAll() {
       requestFN(
         'schedule/getData',
@@ -1260,6 +1324,7 @@ export default {
         this.form = { ...this.form, ...data.pd, ...data.licenseinfor }
         // this.form = Object.assign({}, this.form, data.pd, data.licenseinfor) // copy obj
         this.form.userCerList = data.userCerList
+        this.form.face_file = data.face_file
         if (this.form.ROLE_ID != null && this.form.ROLE_ID != '') {
           // 将字符串转换成数组，此时是字符串数组
           console.log(typeof (this.form.ROLE_ID), '00000000')
@@ -1275,7 +1340,7 @@ export default {
         }
         this.form.ROLE_ID = arrString
         // this.form.PASSWORD = 'Aa@123456789'
-        if (this.form.USER_ID_CARD || this.form.IS_ONLINELEARNING == '1') {
+        if (this.form.IS_ONLINELEARNING == '1') {
           this.$set(this.form, 'ISSTUDENT', true)
         }
         this.form.USERAVATARURL = this.form.USERAVATARURL_CONVERT
@@ -1309,10 +1374,84 @@ export default {
       this.$forceUpdate()
       return false
     },
+    goPush(row) {
+      requestFN(
+        'user/goPush',
+        {
+          USER_ID: row.USER_ID,
+          STATUS: row.STATUS,
+          BZ: row.BZ,
+          SKIN: row.SKIN,
+          PHONE: row.PHONE,
+          NUMBER: row.NUMBER,
+          ISMAIN: row.ISMAIN,
+          OPENID: row.APPID,
+          SORT: row.SORT,
+          LEARNERCATEGORY: row.LEARNERCATEGORY,
+          USERAVATARPREFIX: row.USERAVATARPREFIX,
+          USERAVATARURL: row.USERAVATARURL,
+          SHIFTDUTYONE: row.SHIFTDUTYONE,
+          SHIFTDUTYTWO: row.SHIFTDUTYTWO,
+          DURATION: row.DURATION,
+          WORKSTATUS: row.WORKSTATUS,
+          WORKPERIOD: row.WORKPERIOD,
+          PERSONNEL_TYPE: row.PERSONNEL_TYPE,
+          TITLE: row.TITLE,
+          ISSTATE: row.ISSTATE,
+          INCUMBENCY: row.INCUMBENCY,
+          WORKING_DATE: row.WORKING_DATE,
+          ENTRY_DATE: row.ENTRY_DATE,
+          TYPE_OF_WORK: row.TYPE_OF_WORK,
+          DUTIES: row.DUTIES,
+          DEGREE_OF_EDUCATION: row.DEGREE_OF_EDUCATION,
+          DATE_OF_BIRTH: row.DATE_OF_BIRTH,
+          POLITICAL_OUTLOOK: row.POLITICAL_OUTLOOK,
+          CARD_NO: row.CARD_NO,
+          USERNAME: row.USERNAME,
+          NAME: row.NAME,
+          CORPINFO_ID: row.CORPINFO_ID,
+          CORPINFO_NAME: row.CORPINFO_NAME || '',
+          DEPARTMENT_ID: row.DEPARTMENT_ID,
+          DEPARTMENT_NAME: row.DEPARTMENT_NAME,
+          IMGFILES_ID: row.IMGFILES_ID,
+          FOREIGN_KEY: row.FOREIGN_KEY,
+          FILEPATH: row.FILEPATH,
+          EMAIL: row.EMAIL || '',
+          CARD_TYPE: '111',
+          CARD_TYPE_NAME: '身份证',
+          NATION: row.NATION || '',
+          SEX: row.SEX || '',
+          USER_TYPE: '1',
+          ISDELETE: row.ISDELETE
+        }
+      ).then((data) => {
+        if (data.result === 'success') {
+          this.$message.success('推送成功')
+          this.$parent.activeName = 'List'
+        } else {
+          this.$message.error('推送失败，' + data.msg)
+          this.$parent.activeName = 'List'
+        }
+      }).catch((e) => {
+        this.listLoading = false
+        this.$parent.activeName = 'List'
+      })
+    },
     confirm() {
       // debugger
       // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息
       this.$refs.form.validate(valid => {
+        if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) {
+          this.$message({
+            message: '请上传人脸照片',
+            type: 'error'
+          })
+          return false
+        }
+        let isUpdateFace = '0'
+        if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) {
+          isUpdateFace = '1'
+        }
         if (this.form.SHIFTDUTYONE) {
           // var
           if (!this.form.SHIFTDUTYTWO || this.selectPeriod.DURATION == undefined) {
@@ -1331,11 +1470,10 @@ export default {
         //   return false
         // }
         if (valid) {
-          console.log(this.selectPeriod.WORKSTATUS)
-          console.log(this.form.WORKSTATUS)
           this.form.WORKSTATUS = this.selectPeriod.WORKSTATUS
           this.form.DURATION = this.selectPeriod.DURATION
           this.form.WORKPERIOD = this.selectPeriod.WORKPERIOD
+          console.log(this.form)
           if (this.dialogType == 'saveUser') {
             this.form.ROLE_ID = this.form.ROLE_ID.join(',')
             this.listLoading = true
@@ -1346,11 +1484,10 @@ export default {
               this.listLoading = false
               if (this.form.ISSTUDENT) {
                 this.uploadImgByZhengshu(data.USER_ID)
+                this.uploadImgByFace(data.USER_ID)
+                this.$parent.activeName = 'List'
               } else {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success'
-                })
+                this.uploadImgByFace(data.USER_ID)
                 this.$parent.activeName = 'List'
               }
             }).catch((e) => {
@@ -1370,17 +1507,20 @@ export default {
                 this.listLoading = true
                 requestFN(
                   '/user/' + this.dialogType,
-                  this.form
+                  {
+                    IMGFILES_ID: this.IMGFILES_ID, // 旧人脸图片
+                    isUpdateFace: isUpdateFace,
+                    ...this.form
+                  }
                 ).then((data) => {
                   this.listLoading = false
                   if (this.form.ISSTUDENT) {
                     this.uploadImgByZhengshu(this.form.USER_ID)
+                    this.uploadImgByFace(this.form.USER_ID)
+                    this.goPush(this.form)
                   } else {
-                    this.$message({
-                      message: '操作成功',
-                      type: 'success'
-                    })
-                    this.$parent.activeName = 'List'
+                    this.uploadImgByFace(this.form.USER_ID)
+                    this.goPush(this.form)
                   }
                 }).catch((e) => {
                   this.listLoading = false
@@ -1391,17 +1531,20 @@ export default {
               this.listLoading = true
               requestFN(
                 '/user/' + this.dialogType,
-                this.form
+                {
+                  IMGFILES_ID: this.IMGFILES_ID, // 旧人脸图片
+                  isUpdateFace: isUpdateFace,
+                  ...this.form
+                }
               ).then((data) => {
                 this.listLoading = false
                 if (this.form.ISSTUDENT) {
                   this.uploadImgByZhengshu(this.form.USER_ID)
+                  this.uploadImgByFace(this.form.USER_ID)
+                  this.goPush(this.form)
                 } else {
-                  this.$message({
-                    message: '操作成功',
-                    type: 'success'
-                  })
-                  this.$parent.activeName = 'List'
+                  this.uploadImgByFace(this.form.USER_ID)
+                  this.goPush(this.form)
                 }
               }).catch((e) => {
                 this.listLoading = false
@@ -1413,21 +1556,6 @@ export default {
         }
       })
     },
-    /* 用户头像处理 Begin */
-    handleChangeIMG(file, fileList) {
-      const types = ['image/jpeg', 'image/jpg', 'image/png']
-      const isImage = types.includes(file.raw.type)
-      if (!isImage) {
-        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
-        fileList.splice(0, fileList.length)
-      } else {
-        this.getBase64(file.raw).then(res => {
-          this.form.USERAVATARPREFIX = res.substring(0, res.indexOf('base64,') + 7)
-          this.form.USERAVATARURL = res.substring(res.indexOf('base64,') + 7)
-          this.form.USERAVATARURL_CONVERT = res.substring(res.indexOf('base64,') + 7)
-        })
-      }
-    },
     getBase64(file) {
       return new Promise(function(resolve, reject) {
         const reader = new FileReader()
@@ -1513,6 +1641,12 @@ export default {
       }
     },
     getDict: function() {
+      if (this.uesrInfoDic.minzuList.length == 0) {
+        this.getDicListByPID('0a0e406f27f74ee698fe9979d25f62dd', '', 'minzuList')
+      }
+      if (this.uesrInfoDic.xingbieList.length == 0) {
+        this.getDicListByPID('21501808bbc344d593fbf9ccfe6c4531', '', 'xingbieList')
+      }
       requestFN(
         '/shiftworkrules/listAll',
         {
@@ -1542,9 +1676,6 @@ export default {
     },
     ISSTUDENTCK() {
       if (this.form.ISSTUDENT || this.dialogFormLicenseInformation) {
-        if (this.uesrInfoDic.minzuList.length == 0) {
-          this.getDicListByPID('0a0e406f27f74ee698fe9979d25f62dd', '', 'minzuList')
-        }
         if (this.uesrInfoDic.zhengzhimianmaoList.length == 0) {
           this.getDicListByPID('6351efdd12dc4730952e5d195718e252', '', 'zhengzhimianmaoList')
         }
@@ -1557,9 +1688,6 @@ export default {
         if (this.uesrInfoDic.zaizhiqingkuangList.length == 0) {
           this.getDicListByPID('548764b5d4bf4bd7a18ef88274ef49e4', '', 'zaizhiqingkuangList')
         }
-        if (this.uesrInfoDic.xingbieList.length == 0) {
-          this.getDicListByPID('21501808bbc344d593fbf9ccfe6c4531', '', 'xingbieList')
-        }
         this.getDicListByPID('09e36ac01e9540f8bc84eab1c1a78754', '', 'zhiwuList')
         this.getDicListByPID('945a6b10e59946078b500f0fbafa8679', '', 'zhichengList')
         this.getDicListByPID('55484e491a5e442d839c4595380713ec', '', 'gongzhongList')
@@ -1637,6 +1765,21 @@ export default {
       this.dialogImageUrl = file.url
       this.dialogVisible = true
     },
+    /* 用户头像处理 Begin */
+    handleChangeIMG(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.splice(0, fileList.length)
+      } else {
+        this.getBase64(file.raw).then(res => {
+          this.form.USERAVATARPREFIX = res.substring(0, res.indexOf('base64,') + 7)
+          this.form.USERAVATARURL = res.substring(res.indexOf('base64,') + 7)
+          this.form.USERAVATARURL_CONVERT = res.substring(res.indexOf('base64,') + 7)
+        })
+      }
+    },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
     },
@@ -1645,6 +1788,14 @@ export default {
       this.form.USERAVATARURL = ''
       this.form.USERAVATARURL_CONVERT = ''
     },
+    handleChangeIMGFace(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.pop()
+      }
+    },
     handleChangeIMGZhengshu(file, fileList) {
       const types = ['image/jpeg', 'image/jpg', 'image/png']
       const isImage = types.includes(file.raw.type)
@@ -1656,6 +1807,9 @@ export default {
     beforeFileUploadByZhengshu(file) {
       this.certificate_files.push(file)
     },
+    beforeFileUploadByFace(file) {
+      this.form.face_file.push(file)
+    },
     uploadImgByZhengshu(userId) {
       this.$refs.upload.submit()
       if (this.certificate_files.length > 0) {
@@ -1667,6 +1821,25 @@ export default {
         }
         formData.append('FOREIGN_KEY', userId)
         formData.append('TYPE', 18)
+        upload(
+          '/imgfiles/add',
+          formData
+        ).then((data) => {
+        }).catch((e) => {
+        })
+      }
+    },
+    uploadImgByFace(userId) {
+      this.$refs.uploadUserAvatar.submit()
+      if (this.form.face_file.length > 0) {
+        const formData = new FormData()
+        for (var i = 0; i < this.form.face_file.length; i++) {
+          if (this.form.face_file[i]) {
+            formData.append('FFILE', this.form.face_file[i])
+          }
+        }
+        formData.append('FOREIGN_KEY', userId)
+        formData.append('TYPE', 30)
         upload(
           '/imgfiles/add',
           formData
@@ -1675,7 +1848,6 @@ export default {
             message: '操作成功',
             type: 'success'
           })
-          this.$parent.activeName = 'List'
         }).catch((e) => {
         })
       } else {
@@ -1683,7 +1855,6 @@ export default {
           message: '操作成功',
           type: 'success'
         })
-        this.$parent.activeName = 'List'
       }
     },
     deleteCertificate(index) {
diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue
index c96686f..059f7ea 100644
--- a/src/views/corpInfo/user/components/list.vue
+++ b/src/views/corpInfo/user/components/list.vue
@@ -92,8 +92,9 @@
                 <el-button v-show="edit" type="info" icon="el-icon-message" size="mini" @click="Scheduling(row,row.USER_ID,row.SHIFTDUTYTWO)">排班</el-button>
                 <el-button v-show="edit" type="info" icon="el-icon-message" size="mini" @click="pageShowDate(row,row.USER_ID,row.SHIFTDUTYTWO)">排班表</el-button>
               </template>
-              <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.USER_ID)">编辑</el-button>
-              <el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME)">删除</el-button>
+              <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
+              <el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
+              <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -441,6 +442,67 @@ export default {
     // this.getLearnerCategory() // 学员类型已取消
   },
   methods: {
+    goPush(row) {
+      requestFN(
+        'user/goPush',
+        {
+          USER_ID: row.USER_ID,
+          STATUS: row.STATUS,
+          BZ: row.BZ,
+          SKIN: row.SKIN,
+          PHONE: row.PHONE,
+          NUMBER: row.NUMBER,
+          ISMAIN: row.ISMAIN,
+          OPENID: row.APPID,
+          SORT: row.SORT,
+          LEARNERCATEGORY: row.LEARNERCATEGORY,
+          USERAVATARPREFIX: row.USERAVATARPREFIX,
+          USERAVATARURL: row.USERAVATARURL,
+          SHIFTDUTYONE: row.SHIFTDUTYONE,
+          SHIFTDUTYTWO: row.SHIFTDUTYTWO,
+          DURATION: row.DURATION,
+          WORKSTATUS: row.WORKSTATUS,
+          WORKPERIOD: row.WORKPERIOD,
+          PERSONNEL_TYPE: row.PERSONNEL_TYPE,
+          TITLE: row.TITLE,
+          ISSTATE: row.ISSTATE,
+          INCUMBENCY: row.INCUMBENCY,
+          WORKING_DATE: row.WORKING_DATE,
+          ENTRY_DATE: row.ENTRY_DATE,
+          TYPE_OF_WORK: row.TYPE_OF_WORK,
+          DUTIES: row.DUTIES,
+          DEGREE_OF_EDUCATION: row.DEGREE_OF_EDUCATION,
+          DATE_OF_BIRTH: row.DATE_OF_BIRTH,
+          POLITICAL_OUTLOOK: row.POLITICAL_OUTLOOK,
+          CARD_NO: row.CARD_NO,
+          USERNAME: row.USERNAME,
+          NAME: row.NAME,
+          CORPINFO_ID: row.CORPINFO_ID,
+          CORPINFO_NAME: row.CORPINFO_NAME || '',
+          DEPARTMENT_ID: row.DEPARTMENT_ID,
+          DEPARTMENT_NAME: row.DEPARTMENT_NAME,
+          IMGFILES_ID: row.IMGFILES_ID,
+          FOREIGN_KEY: row.FOREIGN_KEY,
+          FILEPATH: row.FILEPATH,
+          EMAIL: row.EMAIL || '',
+          CARD_TYPE: '111',
+          CARD_TYPE_NAME: '身份证',
+          NATION: row.NATION || '',
+          SEX: row.SEX || '',
+          USER_TYPE: '1',
+          ISDELETE: row.ISDELETE
+        }
+      ).then((data) => {
+        if (data.result === 'success') {
+          this.$message.success('推送成功')
+          this.getList()
+        } else {
+          this.$message.error('推送失败，' + data.msg)
+        }
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
     // schedulingChange(e) {
     //   // console.log(e)
     //   // this.PARENTID = e
@@ -669,8 +731,9 @@ export default {
       this.$parent.activeName = 'Edit'
       this.$parent.USER_ID = ''
     },
-    handleEdit(USER_ID) {
-      this.$parent.USER_ID = USER_ID
+    handleEdit(row) {
+      this.$parent.USER_ID = row.USER_ID
+      this.$parent.IMGFILES_ID = row.IMGFILES_ID
       this.$parent.activeName = 'Edit'
     },
     getQuery() {
@@ -732,7 +795,8 @@ export default {
           SHIFTDUTYONE: this.SHIFTDUTYONE,
           SHIFTDUTYTWO: this.SHIFTDUTYTWO,
           IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
-          USER_ID: this.USER_ID
+          USER_ID: this.USER_ID,
+          ISPUSH: '1'
         }
       ).then((data) => {
         this.listLoading = false
@@ -862,7 +926,7 @@ export default {
       }).catch(() => {
       })
     },
-    handleDelete(id, name) {
+    handleDelete(id, name, ispush) {
       this.$confirm('确定要删除[' + name + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -872,7 +936,8 @@ export default {
         requestFN(
           '/user/deleteUser',
           {
-            USER_ID: id
+            USER_ID: id,
+            ISPUSH: ispush
           }
         ).then(() => {
           this.$message({
diff --git a/src/views/corpInfo/userCenter/components/edit.vue b/src/views/corpInfo/userCenter/components/edit.vue
new file mode 100644
index 0000000..eda6399
--- /dev/null
+++ b/src/views/corpInfo/userCenter/components/edit.vue
@@ -0,0 +1,2085 @@
+<template>
+  <div>
+    <div style="padding:10px 20px 20px 20px">
+      <div class="title_super">
+        <div>{{ this.$parent.USER_ID == '' ? '新增用户' : '编辑用户' }}</div>
+      </div>
+      <el-form ref="form" :rules="rules" :model="form" label-width="140px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <div class="left_super">
+              <el-form-item label="角色" prop="ROLE_ID">
+                <el-select v-model="form.ROLE_ID" multiple placeholder="请选择" class="filter-item" style="width: 100%;">
+                  <el-option
+                    v-for="item in roleList"
+                    :key="item.role_ID"
+                    :label="item.role_NAME"
+                    :value="item.role_ID"/>
+                </el-select>
+              </el-form-item>
+              <!--              <el-form-item label="选择角色组" prop="ROLE_NAME">-->
+              <!--                <el-select v-model="form.ROLE_NAME" placeholder="请选择" class="filter-item">-->
+              <!--                  <el-option-->
+              <!--                    v-for="item in roleList_z"-->
+              <!--                    :key="item.role_ID"-->
+              <!--                    :label="item.role_NAME"-->
+              <!--                    :value="item.role_ID"/>-->
+              <!--                </el-select>-->
+              <!--              </el-form-item>-->
+              <el-form-item label="部门" prop="DEPARTMENT_ID">
+                <SelectTree
+                  ref="deptTree"
+                  :clearable="false"
+                  :options="treeData"
+                  :props="defaultProps"
+                  v-model="form.DEPARTMENT_ID"
+                  style="width: 100%;"
+                  placeholder="请选择部门"/>
+              </el-form-item>
+              <el-form-item label="岗位" prop="POST_ID">
+                <el-select v-model="form.POST_ID" placeholder="请选择" class="filter-item" style="width: 100%;">
+                  <el-option v-for="item in postList" :key="item.POST_ID" :label="item.NAME" :value="item.POST_ID"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="用户名" prop="USERNAME">
+                <el-input v-model="form.USERNAME" placeholder="默认用户手机号码..." @change="goCheck()"/>
+                <a style="color: red">
+                <span>如果修改手机号，登录密码则会变成初始密码“Aa@123456789”</span></a>
+              </el-form-item>
+              <el-form-item label="姓名" prop="NAME">
+                <el-input v-model="form.NAME" placeholder="这里输入姓名..."/>
+              </el-form-item>
+              <el-form-item label="人员类型" prop="PERSON_TYPE">
+                <div>
+                  <el-select
+                    v-model="form.PERSON_TYPE"
+                    filterable
+                    placeholder="请选择"
+                    class="filter-item"
+                    style="width: 100%;"
+                  >
+                    <el-option v-for="item in LevelsData" :key="item.NAME" :label="item.NAME" :value="item.NAME"/>
+                  </el-select>
+                  <el-button v-if="form.PERSON_TYPE == '主要负责人' || form.PERSON_TYPE == '安全管理人员' || form.PERSON_TYPE == '特种作业人员'" plain type="success" @click="changePersonType">补充证照信息</el-button>
+                </div>
+              </el-form-item>
+              <el-form-item label="身份证号" prop="USER_ID_CARD">
+                <el-input v-model="form.USER_ID_CARD" placeholder="这里输入身份证号..." @change="goCheck()"/>
+              </el-form-item>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="民族" prop="NATION">
+                    <el-select v-model="form.NATION" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in uesrInfoDic.minzuList"
+                        :key="item.DICTIONARIES_ID"
+                        :label="item.NAME"
+                        :value="item.DICTIONARIES_ID"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="性别" prop="SEX">
+                    <el-select v-model="form.SEX" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in uesrInfoDic.xingbieList"
+                        :key="item.DICTIONARIES_ID"
+                        :label="item.NAME"
+                        :value="item.DICTIONARIES_ID"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!--              <el-form-item label="定位卡号" prop="CARDNO">-->
+              <!--                <el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>-->
+              <!--              </el-form-item>-->
+              <!--              <el-form-item label="门口门禁卡号" prop="MKMJCARD">-->
+              <!--                <el-input v-model="form.MKMJCARD" placeholder="这里输入门口门禁卡号..."/>-->
+              <!--              </el-form-item>-->
+              <el-form-item label="是否为隐患确认人" prop="IS_HAZARDCONFIRMER">
+                <el-radio-group v-model="form.IS_HAZARDCONFIRMER">
+                  <el-radio :label="0" value="0">否</el-radio>
+                  <el-radio :label="1" value="1">是</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-if="form.face_file.length > 0" label="旧人脸信息">
+                <div class="slideshow">
+                  <div class="disContent">
+                    <div v-for="(item, index) in form.face_file" :key="index" class="img-div">
+                      <img :src="config.fileUrl + item.FILEPATH" alt="">
+                      <div class="disContent-hide">
+                        <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                          <span class="el-icon-zoom-in yuLan">
+                            <viewer :images="form.face_file">
+                              <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                            </viewer>
+                          </span>
+                        </el-tooltip>
+                        <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                          <span class="Delete" @click="deleteCertificate(index)"><i class="el-icon-delete"/></span>
+                        </el-tooltip>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+              <el-form-item label="上传人脸照片">
+                <div style="display: flex;align-items: center">
+                  <el-upload
+                    ref="uploadUserAvatar"
+                    :on-preview="handlePictureCardPreview"
+                    :before-upload="beforeFileUploadByFace"
+                    :on-change="handleChangeIMGFace"
+                    :auto-upload="false"
+                    :limit="1"
+                    class="avatar-uploader"
+                    action="#"
+                    accept=".jpg,.jpeg,.png"
+                    list-type="picture-card">
+                    <i class="el-icon-plus"/>
+                  </el-upload>
+                  <div style="margin-left:20px;line-height:1.6">
+                    <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
+                    <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
+                    <div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
+                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
+                    <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
+                  </div>
+                </div>
+              </el-form-item>
+              <el-form-item label="部门排序" prop="SORT">
+                <el-input v-model="form.SORT" placeholder="这里输入部门排序..." @keyup.native="number"/>
+              </el-form-item>
+              <el-form-item label="邮箱" prop="EMAIL">
+                <el-input v-model="form.EMAIL" placeholder="这里输入邮箱..."/>
+              </el-form-item>
+
+              <!--<el-form-item label="排班" prop="SHIFTDUTYONE">
+                  <el-select
+                    v-model="form.SHIFTDUTYONE"
+                    placeholder="请选择"
+                    class="filter-item"
+                    style="margin-right:10px">
+                    <el-option
+                      v-for="item in shiftDutyListOne"
+                      :key="item.SHIFTWORKRULES_ID"
+                      :label="item.NAME"
+                      :value="item.SHIFTWORKRULES_ID"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label-width="0px" prop="SHIFTDUTYTWO">
+                  <el-select
+                    v-model="form.SHIFTDUTYTWO"
+                    placeholder="请选择"
+                    class="filter-item"
+                    style="margin-right:10px">
+                    <el-option
+                      v-for="item in shiftDutyListTwo"
+                      :key="item.SHIFTWORKRULES_ID"
+                      :label="item.NAME"
+                      :value="item.SHIFTWORKRULES_ID"/>
+                  </el-select>
+                  <el-button @click="detailShowDate">当前班状</el-button>
+                </el-form-item>-->
+              <el-form-item label="排班">
+                <div style="display:flex;">
+                  <el-select v-model="form.SHIFTDUTYONE" placeholder="请选择" class="filter-item" style="margin-right:10px;width: 45%;">
+                    <el-option v-for="item in shiftDutyListOne" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                  </el-select>
+                  <el-select v-model="form.SHIFTDUTYTWO" placeholder="请选择" class="filter-item" style="margin-right:10px;width: 45%;">
+                    <el-option v-for="item in shiftDutyListTwo" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                  </el-select>
+                  <el-button @click="detailShowDate">当前班状</el-button>
+                </div>
+              </el-form-item>
+              <el-form-item v-show="periodList.length > 0" label="当前班次">
+                <el-radio-group v-model="selectPeriod">
+                  <el-radio-button v-for="(item,i) in periodList" :class="item.isBr?'isBr':''" :key="i" :label="item.period">{{ item.period.WORKSTATUS=='1'?'上班':'休班' }}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="emis编码">
+                <el-input v-model="form.JCR" placeholder="这里输入emis编码..." />
+              </el-form-item>
+              <el-form-item label="备注">
+                <el-input :rows="3" v-model="form.BZ" type="textarea" placeholder="这里输入备注..."/>
+              </el-form-item>
+              <!--              <el-form-item label="在线学习人员类别" prop="LEARNERCATEGORY">-->
+              <!--                <div class="uo-flex">-->
+              <!--                  <el-select id="LEARNERCATEGORY1" v-model="form.LEARNERCATEGORY" :disabled="disabledLCSelect" :style="displayLCSelect" placeholder="请选择" class="filter-item" @change="forceUpdate">-->
+              <!--                    <el-option v-for="(item,index) in LearnerCategoryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID">-->
+              <!--                      <span style="float: left">{{ item.NAME }}</span>-->
+              <!--                      <div style="float: right;" @click.stop="removeDuties(index,'APPLICABLE_PERSONNEL')"><i class="el-icon-circle-close" /></div>-->
+              <!--                    </el-option>-->
+              <!--                  </el-select>-->
+              <!--                  <el-input id="LEARNERCATEGORY2" v-model="form.LEARNERCATEGORY" :disabled="disabledLCInput" :style="displayLCInput" placeholder="这里输入新的类别名称..." />-->
+              <!--                  <el-button @click="changeLearnerCategory">{{ form.LEARNERCATEGORYSTATUS === 'select' ? '输入' : '选择' }}</el-button>-->
+              <!--                </div>-->
+              <!--              </el-form-item>-->
+              <el-form-item label="是否在线学习人员">
+                <el-switch v-model="form.ISSTUDENT" active-color="#13ce66" inactive-color="#ff4949"/>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="left_border_super">
+              <template v-if="form.ISSTUDENT">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="政治面貌" prop="POLITICAL_OUTLOOK">
+                      <el-select v-model="form.POLITICAL_OUTLOOK" placeholder="请选择" style="width: 100%;">
+                        <el-option
+                          v-for="item in uesrInfoDic.zhengzhimianmaoList"
+                          :key="item.DICTIONARIES_ID"
+                          :label="item.NAME"
+                          :value="item.DICTIONARIES_ID"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="出生年月" prop="DATE_OF_BIRTH">
+                      <el-date-picker
+                        v-model="form.DATE_OF_BIRTH"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd"
+                        style="width: 100%;"/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="文化程度" prop="DEGREE_OF_EDUCATION">
+                      <el-select v-model="form.DEGREE_OF_EDUCATION" placeholder="请选择" style="width: 100%;">
+                        <el-option
+                          v-for="item in uesrInfoDic.wenhuachengduList"
+                          :key="item.DICTIONARIES_ID"
+                          :label="item.NAME"
+                          :value="item.DICTIONARIES_ID"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="在职情况" prop="INCUMBENCY">
+                      <el-select v-model="form.INCUMBENCY" placeholder="请选择" style="width: 100%;">
+                        <el-option
+                          v-for="item in uesrInfoDic.zaizhiqingkuangList"
+                          :key="item.DICTIONARIES_ID"
+                          :label="item.NAME"
+                          :value="item.DICTIONARIES_ID"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <!--                  <el-col :span="12">-->
+                  <!--                    <el-form-item label="人员类型" prop="PERSONNEL_TYPE">-->
+                  <!--                      <el-select v-model="form.PERSONNEL_TYPE" placeholder="请选择">-->
+                  <!--                        <el-option-->
+                  <!--                          v-for="item in uesrInfoDic.renyuanleixingList"-->
+                  <!--                          :key="item.DICTIONARIES_ID"-->
+                  <!--                          :label="item.NAME"-->
+                  <!--                          :value="item.DICTIONARIES_ID"/>-->
+                  <!--                      </el-select>-->
+                  <!--                    </el-form-item>-->
+                  <!--                  </el-col>-->
+                </el-row>
+
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="职务" prop="DUTIES">
+                      <div class="uo-flex">
+                        <el-select
+                          v-if="form.letDutiesType =='select'"
+                          id="leaPostSel"
+                          v-model="form.DUTIES"
+                          placeholder="请选择"
+                          class="filter-item"
+                          @change="forceUpdate">
+                          <el-option
+                            v-for="(item,index) in uesrInfoDic.zhiwuList"
+                            :key="item.DICTIONARIES_ID"
+                            :label="item.NAME"
+                            :value="item.DICTIONARIES_ID">
+                            <span style="float: left">{{ item.NAME }}</span>
+                            <div style="float: right;" @click.stop="removeDuties(index,'POSITION')"><i
+                              class="el-icon-circle-close"/></div>
+                          </el-option>
+                        </el-select>
+                        <el-input
+                          v-if="form.letDutiesType =='value'"
+                          id="leaPostVal"
+                          :disabled="form.letDutiesType =='select'"
+                          v-model="form.DUTIESValue"
+                          placeholder="这里输入新的职务名称..."/>
+                        <el-button
+                          class="ml5"
+                          @click="form.letDutiesType = (form.letDutiesType =='select') ? 'value' : 'select'">
+                          {{ form.letDutiesType === 'select' ? '输入' : '选择' }}
+                        </el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="职称" prop="TITLE">
+                      <div class="uo-flex">
+                        <el-select
+                          v-if="form.letTitleType =='select'"
+                          id="letTitleSel"
+                          v-model="form.TITLE"
+                          placeholder="请选择"
+                          class="filter-item"
+                          @change="forceUpdate">
+                          <el-option
+                            v-for="(item,index) in uesrInfoDic.zhichengList"
+                            :key="item.DICTIONARIES_ID"
+                            :label="item.NAME"
+                            :value="item.DICTIONARIES_ID">
+                            <span style="float: left">{{ item.NAME }}</span>
+                            <div style="float: right;" @click.stop="removeDuties(index,'JOB_TITLE')"><i
+                              class="el-icon-circle-close"/></div>
+                          </el-option>
+                        </el-select>
+                        <el-input
+                          v-show="form.letTitleType =='value'"
+                          id="letTitleVal"
+                          v-model="form.letTitleValue"
+                          placeholder="这里输入新的职称名称..."/>
+                        <el-button
+                          class="ml5"
+                          @click="form.letTitleType = (form.letTitleType =='select') ? 'value' : 'select'">
+                          {{ form.letTitleType === 'select' ? '输入' : '选择' }}
+                        </el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="工种" prop="TYPE_OF_WORK">
+                      <div class="uo-flex">
+                        <el-select
+                          v-if="form.letTypeOfWorkType =='select'"
+                          id="letTypeOfWorkSel"
+                          v-model="form.TYPE_OF_WORK"
+                          placeholder="请选择"
+                          class="filter-item"
+                          @change="forceUpdate">
+                          <el-option
+                            v-for="(item,index) in uesrInfoDic.gongzhongList"
+                            :key="item.DICTIONARIES_ID"
+                            :label="item.NAME"
+                            :value="item.DICTIONARIES_ID">
+                            <span style="float: left">{{ item.NAME }}</span>
+                            <div style="float: right;" @click.stop="removeDuties(index,'WORK_TYPE')"><i
+                              class="el-icon-circle-close"/></div>
+                          </el-option>
+                        </el-select>
+                        <el-input
+                          v-show="form.letTypeOfWorkType =='value'"
+                          id="letTypeOfWorkVal"
+                          v-model="form.letTypeOfWorkValue"
+                          placeholder="这里输入新的工种名称..."/>
+                        <el-button
+                          class="ml5"
+                          @click="form.letTypeOfWorkType = (form.letTypeOfWorkType =='select') ? 'value' : 'select'">
+                          {{ form.letTypeOfWorkType === 'select' ? '输入' : '选择' }}
+                        </el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="入职日期" prop="ENTRY_DATE">
+                      <el-date-picker
+                        v-model="form.ENTRY_DATE"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd"
+                        style="width: 100%;"/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="参加工作日期" prop="WORKING_DATE">
+                      <el-date-picker
+                        v-model="form.WORKING_DATE"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd"
+                        style="width: 100%;"/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item v-if="form.userCerList.length > 0" label="已上传证书">
+                  <div class="slideshow">
+                    <div class="disContent">
+                      <div v-for="(item, index) in form.userCerList" :key="index" class="img-div">
+                        <img :src="config.fileUrl + item.FILEPATH" alt="">
+                        <div class="disContent-hide">
+                          <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                            <span class="el-icon-zoom-in yuLan">
+                              <viewer :images="form.userCerLis">
+                                <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                              </viewer>
+                            </span>
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                            <span class="Delete" @click="deleteCertificate(index)"><i class="el-icon-delete"/></span>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </el-form-item>
+                <el-form-item label="证书信息" prop="CERTIFICATE_INFORMATION">
+                  <!--          <el-input id="CERTIFICATE_INFORMATION" ref="CERTIFICATE_INFORMATION" v-model="form.CERTIFICATE_INFORMATION" maxlength="255" placeholder="这里输入证书信息..." title="证书信息"/>-->
+                  <el-upload
+                    ref="upload"
+                    :on-preview="handlePictureCardPreview"
+                    :before-upload="beforeFileUploadByZhengshu"
+                    :on-change="handleChangeIMGZhengshu"
+                    :auto-upload="false"
+                    class="avatar-uploader"
+                    action="#"
+                    accept=".jpg,.jpeg,.png"
+                    list-type="picture-card">
+                    <i class="el-icon-plus"/>
+                  </el-upload>
+                  <span style="color: red;font-size: 12px">
+                    * 图像格式：JPG、JPEG、PNG。
+                  </span>
+                  <el-dialog :visible.sync="dialogVisible">
+                    <img :src="dialogImageUrl" width="100%" alt="">
+                  </el-dialog>
+                </el-form-item>
+              </template>
+            </div>
+          </el-col>
+        </el-row>
+
+      </el-form>
+    </div>
+    <div class="ui-height"/>
+    <div class="ui-foot">
+      <el-button v-show="ISCHECK" type="success" @click="confirm">保 存</el-button>
+      <el-button v-show="!ISCHECK" type="success" @click="goCheck">校 验</el-button>
+      <el-button plain type="info" @click="goBack">返 回</el-button>
+    </div>
+    <el-dialog :visible.sync="dialogFormLicenseInformation" title="证照信息" width="600px">
+      <template>
+        <div class="app-container">
+          <el-form ref="form" :model="form" label-width="110px" class="in-uploader">
+            <el-form-item label="姓名" prop="INFOR_NAME">
+              <el-input :row="3" v-model="form.INFOR_NAME" placeholder="这里输入姓名..."/>
+            </el-form-item>
+            <el-form-item label="性别" style="display: flex;align-items: center">
+              <el-radio-group v-model="form.INFORSEX" style="margin-left: -110px;">
+                <el-radio :label="0" value="0">男</el-radio>
+                <el-radio :label="1" value="1">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="职务" prop="TITLE">
+              <div class="uo-flex">
+                <el-select
+                  v-if="form.inforpostType =='select'"
+                  id="inforpostSel"
+                  v-model="form.INFORPOST"
+                  placeholder="请选择"
+                  class="filter-item"
+                  @change="forceUpdate">
+                  <el-option
+                    v-for="(item,index) in uesrInfoDic.zhiwuList"
+                    :key="item.DICTIONARIES_ID"
+                    :label="item.NAME"
+                    :value="item.DICTIONARIES_ID">
+                    <span style="float: left">{{ item.NAME }}</span>
+                    <div style="float: right;" @click.stop="removeDuties(index,'JOB_TITLE')"><i
+                      class="el-icon-circle-close"/></div>
+                  </el-option>
+                </el-select>
+                <el-input
+                  v-show="form.inforpostType =='value'"
+                  id="inforpostVal"
+                  v-model="form.INFORPOSTValue"
+                  placeholder="这里输入新的职务名称..."/>
+                <el-button
+                  class="ml5"
+                  @click="form.inforpostType = (form.inforpostType =='select') ? 'value' : 'select'">
+                  {{ form.inforpostType === 'select' ? '输入' : '选择' }}
+                </el-button>
+              </div>
+            </el-form-item>
+            <el-form-item label="职称" prop="INFORTITLE">
+              <div class="uo-flex">
+                <el-select
+                  v-if="form.infortitleType =='select'"
+                  id="infortitleSel"
+                  v-model="form.INFORTITLE"
+                  placeholder="请选择"
+                  class="filter-item"
+                  @change="forceUpdate">
+                  <el-option
+                    v-for="(item,index) in uesrInfoDic.zhichengList"
+                    :key="item.DICTIONARIES_ID"
+                    :label="item.NAME"
+                    :value="item.DICTIONARIES_ID">
+                    <span style="float: left">{{ item.NAME }}</span>
+                    <div style="float: right;" @click.stop="removeDuties(index,'JOB_TITLE')"><i
+                      class="el-icon-circle-close"/></div>
+                  </el-option>
+                </el-select>
+                <el-input
+                  v-show="form.infortitleType =='value'"
+                  id="infortitleVal"
+                  v-model="form.INFORTITLEValue"
+                  placeholder="这里输入新的职称名称..."/>
+                <el-button
+                  class="ml5"
+                  @click="form.infortitleType = (form.infortitleType =='select') ? 'value' : 'select'">
+                  {{ form.infortitleType === 'select' ? '输入' : '选择' }}
+                </el-button>
+              </div>
+            </el-form-item>
+            <el-form-item label="工作" prop="INFORWORK">
+              <div class="uo-flex">
+                <el-select
+                  v-if="form.inforworkType =='select'"
+                  id="infortitleSel"
+                  v-model="form.INFORWORK"
+                  placeholder="请选择"
+                  class="filter-item"
+                  @change="forceUpdate">
+                  <el-option
+                    v-for="(item,index) in uesrInfoDic.zhichengList"
+                    :key="item.DICTIONARIES_ID"
+                    :label="item.NAME"
+                    :value="item.DICTIONARIES_ID">
+                    <span style="float: left">{{ item.NAME }}</span>
+                    <div style="float: right;" @click.stop="removeDuties(index,'JOB_TITLE')"><i
+                      class="el-icon-circle-close"/></div>
+                  </el-option>
+                </el-select>
+                <el-input
+                  v-show="form.inforworkType =='value'"
+                  id="inforworkVal"
+                  v-model="form.INFORWORKValue"
+                  placeholder="这里输入新的工作名称..."/>
+                <el-button
+                  class="ml5"
+                  @click="form.inforworkType = (form.inforworkType =='select') ? 'value' : 'select'">
+                  {{ form.inforworkType === 'select' ? '输入' : '选择' }}
+                </el-button>
+              </div>
+            </el-form-item>
+            <el-form-item label="资格证书名称" prop="CERTIFICATENAME">
+              <el-select v-model="form.CERTIFICATENAME" filterable placeholder="请选择" class="filter-item">
+                <el-option
+                  v-for="item in certificatenamearr"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="证书编号" prop="CERTIFICATENO">
+              <el-input
+                v-model="form.CERTIFICATENO"
+                placeholder="请输入证书编号..."
+              />
+            </el-form-item>
+            <!--<el-form-item label="已上传证书">
+              <div class="slideshow">
+                <div class="disContent">
+                  <div v-for="(item, index) in hImgs" :key="index" class="img-div">
+                    <img :src="config.fileUrl + item.FILEPATH" alt="">
+                    <div class="disContent-hide">
+                      <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                        <span class="el-icon-zoom-in yuLan">
+                          <viewer :images="hImgs">
+                            <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                          </viewer>
+                        </span>
+                      </el-tooltip>
+                      <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                        <span class="Delete" @click="deleteCertificate(index)"><i class="el-icon-delete" /></span>
+                      </el-tooltip>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+            <el-form-item label="证书图片">
+              <el-upload ref="upload" :on-preview="handlePictureCardPreview" :before-upload="beforeFileUpload" :auto-upload="false" class="avatar-uploader" action="#" accept=".jpg,.jpeg,.png" list-type="picture-card">
+                <i class="el-icon-plus" />
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible">
+                <img :src="dialogImageUrl" width="100%" alt="">
+              </el-dialog>
+            </el-form-item>-->
+            <el-form-item label="有效期" prop="TERMOFVALIDITY">
+              <div class="block">
+                <el-date-picker
+                  v-model="form.TERMOFVALIDITY"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                />
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormLicenseInformation = false">取 消</el-button>
+        <el-button type="primary" @click="goConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="SchedulingFrom" title="排班信息" width="600px">
+      <template>
+        <div class="app-container">
+          <el-form ref="form" :model="form" label-width="110px" class="in-uploader">
+            <el-form-item label="排班">
+              <div style="display:flex;">
+                <el-select v-model="form.SHIFTDUTYONE" placeholder="请选择" class="filter-item" style="margin-right:10px">
+                  <el-option
+                    v-for="item in shiftDutyListOne"
+                    :key="item.SHIFTWORKRULES_ID"
+                    :label="item.NAME"
+                    :value="item.SHIFTWORKRULES_ID"/>
+                </el-select>
+                <el-select v-model="form.SHIFTDUTYTWO" placeholder="请选择" class="filter-item" style="margin-right:10px">
+                  <el-option
+                    v-for="item in shiftDutyListTwo"
+                    :key="item.SHIFTWORKRULES_ID"
+                    :label="item.NAME"
+                    :value="item.SHIFTWORKRULES_ID"/>
+                </el-select>
+                <el-button @click="detailShowDate">当前班状</el-button>
+              </div>
+            </el-form-item>
+            <el-form-item v-show="periodList.length > 0" label="当前班次">
+              <el-radio-group v-model="selectPeriod">
+                <el-radio-button
+                  v-for="(item,i) in periodList"
+                  :class="item.isBr?'isBr':''"
+                  :key="i"
+                  :label="item.period">{{ item.period.WORKSTATUS == '1' ? '上班' : '休班' }}
+                </el-radio-button>
+                <!-- <el-radio-button label="1">{{ selectPeriod }}</el-radio-button> -->
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="SchedulingFrom = false">取 消</el-button>
+        <el-button type="primary" @click="goScheduling(USER_ID)">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-if="dialogFormEditDate" :visible.sync="dialogFormEditDate" title="日历" width="500px">
+      <el-calendar id="calendar">
+        <template
+          slot="dateCell"
+          slot-scope="{data}">
+          <div class="date-cell">
+            <div class="calendar-day" style="line-height: 15px">
+              <span>{{ data.day.split('-').slice(2).join() }}</span>
+              <br>
+              <span v-for="(i, index) in workDateList" :key="index">
+                <template v-if="i.DATE==data.day">
+                  <span v-if="i.STATE == 1" style="color:blue">上班</span>
+                  <span v-else-if="i.STATE == 2" style="color:red">休班</span>
+                </template>
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-calendar>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEditDate = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+import { upload } from '@/utils/upload'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    var hasUser = (rule, value, callback) => {
+      requestFN(
+        '/user/hasUser',
+        {
+          USERNAME: value,
+          VERIFYUSER_ID: this.form.USER_ID
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          callback()
+        } else {
+          callback(new Error('用户名重复'))
+        }
+      }).catch((e) => {
+        callback()
+      })
+    }
+    var hasEmail = (rule, value, callback) => {
+      if (value) {
+        requestFN(
+          '/user/hasEmail',
+          {
+            EMAIL: value,
+            USERNAME: this.form.USERNAME
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            callback()
+          } else {
+            callback(new Error('邮箱重复'))
+          }
+        }).catch((e) => {
+
+        })
+      } else {
+        callback()
+      }
+    }
+    return {
+      ISCHECK: false,
+      dayTime: [],
+      LevelsData: [],
+      dialogFormEditDate: false,
+      dialogFormLicenseInformation: false,
+      listLoading: true,
+      treeLoading: false,
+      add: false,
+      del: false,
+      edit: false,
+      KEYWORDS: '',
+      SHIFTDUTYONE: '',
+      SHIFTDUTYTWO: '',
+      selectPeriod: [],
+      tzzyry: '',
+      periodList: [],
+      DEPARTMENT_ID: '',
+      varList: [],
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormEdit: false,
+      dialogType: 'saveUser',
+      disabledLCSelect: false,
+      displayLCSelect: 'display: block',
+      disabledLCInput: true,
+      displayLCInput: 'display: none',
+      LearnerCategoryList: [],
+      certificatenamearr: [
+        { value: '主要负责人证', label: '主要负责人证' },
+        { value: '安全管理人员证', label: '安全管理人员证' },
+        { value: '特种作业人员证', label: '特种作业人员证' }
+      ],
+      rules: {
+        NAME: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        USERNAME: [
+          { required: true, message: '请输入手机号码', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[0-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          },
+          { validator: hasUser, trigger: 'blur' }
+        ],
+        EMAIL: [
+          { required: true, message: '请输入邮箱', trigger: 'blur' },
+          {
+            pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
+            message: '请输入正确的邮箱'
+          },
+          { validator: hasEmail, trigger: 'blur' }
+        ],
+        PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
+        ROLE_NAME: [{ required: true, message: '请选择角色组', trigger: 'change' }],
+        ROLE_ID: [{ required: true, message: '请选择角色', trigger: 'change' }],
+        DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }],
+        DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
+        SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
+        NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
+        SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+        POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
+        DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
+        DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
+        IS_HAZARDCONFIRMER: [{ required: true, message: '隐患确认人不为必选', trigger: 'blur' }],
+        SHIFTDUTYONE: [{ required: true, message: '排班为必选', trigger: 'blur' }],
+        SHIFTDUTYTWO: [{ required: true, message: '排班字节点必选', trigger: 'blur' }],
+        POST: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
+        TYPE_OF_WORK: [{ required: true, message: '工种不能为空', trigger: 'blur' }],
+        ENTRY_DATE: [{ required: true, message: '请选择入职日期', trigger: 'blur' }],
+        WORKING_DATE: [{ required: true, message: '请选择参加工作日期', trigger: 'blur' }],
+        INCUMBENCY: [{ required: true, message: '在职情况不能为空', trigger: 'blur' }],
+        TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }],
+        DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
+        //  /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/
+        USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' },
+          {
+            pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
+            message: '请输入正确的身份证号'
+          }
+        ]
+      },
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      treeData: [],
+      form: {
+        IS_HAZARDCONFIRMER: 0,
+        INFORPOST: '',
+        CARDNO: '',
+        MKMJCARD: '',
+        INFORTITLE: '',
+        INFORTITLEValue: '',
+        infortitleType: 'select',
+        INFORWORK: '',
+        INFORWORKValue: '',
+        inforworkType: 'select',
+        USER_ID: '',
+        ROLE_ID: [],
+        ROLE_NAME: [],
+        DEPARTMENT_ID: '',
+        POST_ID: '',
+        USERNAME: '',
+        NAME: '',
+        EMAIL: '',
+        LEARNERCATEGORY: '',
+        LEARNERCATEGORYSTATUS: 'select',
+        SORT: '',
+        JCR: '',
+        BZ: '',
+        PERSON_TYPE: '',
+        PASSWORD: 'Aa@123456789',
+        USERAVATARPREFIX: '',
+        USERAVATARURL: '',
+        USERAVATARURL_CONVERT: '',
+        SHIFTDUTYONE: '',
+        SHIFTDUTYTWO: '',
+        DURATION: '',
+        WORKSTATUS: '',
+        WORKPERIOD: '',
+        ISSTUDENT: false,
+        NATION: '', // 民族
+        SEX: '', // 性别
+        POLITICAL_OUTLOOK: '', // 政治面貌
+        DATE_OF_BIRTH: '', // 出生年月
+        DEGREE_OF_EDUCATION: '', // 文化程度
+        POST: '', // 职务
+        TYPE_OF_WORK: '', // 工种
+        ENTRY_DATE: '', // 入职日期
+        WORKING_DATE: '', // 参加工作日期
+        INCUMBENCY: '', // 在职情况
+        CERTIFICATE_INFORMATION: '', // 证书信息
+        TITLE: '', // 职称
+        DUTIESValue: '',
+        DUTIES: '',
+        inforpostType: 'select',
+        INFORPOSTValue: '',
+        letDutiesType: 'select',
+        letPostType: 'select',
+        letTitleValue: '',
+        letTitleId: '',
+        letTitleType: 'select',
+        letTypeOfWorkValue: '',
+        letTypeOfWorkId: '',
+        letTypeOfWorkType: 'select',
+        USER_ID_CARD: '',
+        PERSONNEL_TYPE: '',
+        userCerList: [],
+        face_file: [],
+        CORPINFO_NAME: ''
+      },
+      IMGFILES_ID: '',
+      uesrInfoDic: {
+        minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd
+        zhengzhimianmaoList: [], // 政治面貌 6351efdd12dc4730952e5d195718e252
+        wenhuachengduList: [], // 文化程度 d7d80f08d73a4accbccf4fd3d8d1d867
+        renyuanleixingList: [], // 人员类型 0b62f92b0b624aab8e89a77304a64d5e
+        zhiwuList: [], // 职务 下拉菜单选择已输入过的职务 09e36ac01e9540f8bc84eab1c1a78754
+        gongzhongList: [], // 工种 下拉菜单选择已输入过的职务 55484e491a5e442d839c4595380713ec
+        zaizhiqingkuangList: [], // 在职情况 548764b5d4bf4bd7a18ef88274ef49e4
+        xingbieList: [], // 性别情况 21501808bbc344d593fbf9ccfe6c4531
+        zhichengList: []// 职称 945a6b10e59946078b500f0fbafa8679
+      },
+      certificate_files: [],
+      config: config,
+      dialogImageUrl: [],
+      dialogVisible: false,
+      SchedulingFrom: false,
+      roleList: [],
+      roleList1: [],
+      roleList_z: [],
+      role1List: [],
+      postList: [],
+      oldPostId: '', // 原岗位ID（用于判断岗位是否变化）
+      oldDepartId: '', // 原部门ID（用于判断部门是否变化）
+      dialogFormDaoru: false,
+      daoruFrom: {
+        FFILE: '',
+        FFILEName: ''
+      },
+      PARENTID: '0',
+      shiftDutyListOne: [],
+      shiftDutyListTwo: [],
+      queryShiftOneList: [],
+      queryShiftTwoList: [],
+      datePage: 0,
+      workDateList: [],
+      USER_ID: ''
+    }
+  },
+  watch: {
+    'form.SHIFTDUTYONE': {
+      handler(newVal, oldVal) {
+        if (this.dialogType == 'saveUser' || (oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+          this.form.SHIFTDUTYTWO = ''
+          this.selectPeriod = []
+        }
+        this.getShiftWorkTwo(this.form.SHIFTDUTYONE)
+      },
+      immediate: false
+    },
+    'form.SHIFTDUTYTWO': {
+      handler(newVal, oldVal) {
+        if (this.dialogType == 'saveUser' || (oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+          this.selectPeriod = []
+        }
+        this.listPeriods(this.form.SHIFTDUTYTWO)
+      },
+      immediate: false
+    },
+    'form.DEPARTMENT_ID': {
+      handler(newVal, oldVal) {
+        if (this.dialogType == 'saveUser' || (oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+          this.form.POST_ID = ''
+          this.getPostList()
+        }
+      },
+      immediate: false
+    },
+    'form.ISSTUDENT': {
+      handler() {
+        if (this.form.ISSTUDENT) {
+          this.ISSTUDENTCK()
+        }
+      },
+      immediate: false
+    },
+    'dialogFormLicenseInformation': {
+      handler(newValue) {
+        if (newValue) this.ISSTUDENTCK()
+      },
+      immediate: false
+    },
+    'form.DUTIESValue': {
+      handler() {
+        console.info('DUTIES被DUTIESValue赋值了')
+        this.form.DUTIES = this.form.DUTIESValue
+      }
+    },
+    'form.letTitleValue': {
+      handler() {
+        this.form.TITLE = this.form.letTitleValue
+      }
+    },
+    'form.letTypeOfWorkValue': {
+      handler() {
+        this.form.TYPE_OF_WORK = this.form.letTypeOfWorkValue
+      }
+    }
+  },
+  created() {
+    this.getRole1List()
+    this.getRoleList()
+    this.hasButton()
+    this.getTreeList()
+    this.getShiftWorkOne()
+    this.getPersonnelType()
+    this.getScheduleAll()
+    this.getDict()
+    // this.getLearnerCategory() // 学员类型已取消
+    if (this.$parent.IMGFILES_ID != '') {
+      this.IMGFILES_ID = this.$parent.IMGFILES_ID
+    }
+    if (this.$parent.USER_ID == '') {
+      this.handleAdd()
+    } else {
+      this.handleEdit(this.$parent.USER_ID)
+    }
+  },
+  methods: {
+    goCheck() {
+      if (this.form.USER_ID_CARD && this.form.USERNAME) {
+        const phoneJudge = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[0-9])\d{8}$/
+        const phoneResult = phoneJudge.test(this.form.USERNAME)
+        const cardJudge = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+        const cardResult = cardJudge.test(this.form.USER_ID_CARD)
+        if (phoneResult && cardResult) {
+          console.log('格式校验通过')
+          requestFN(
+            'user/goCheck',
+            {
+              CARD_NO: this.form.USER_ID_CARD,
+              USER_ID: this.form.USER_ID,
+              USERNAME: this.form.USERNAME
+            }
+          ).then((data) => {
+            if (data.result === 'success') {
+              this.$message.success('验证通过')
+              this.ISCHECK = true
+            } else {
+              this.$message.error('验证失败，请确认身份证号与手机号是否正确')
+              this.ISCHECK = false
+            }
+          }).catch((e) => {
+            this.listLoading = false
+            this.ISCHECK = false
+          })
+        } else {
+          this.ISCHECK = false
+        }
+      } else {
+        this.$message.warning('请确认身份证号与手机号后进行校验')
+        this.ISCHECK = false
+      }
+    },
+    getScheduleAll() {
+      requestFN(
+        'schedule/getData',
+        {
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          for (var i = 0; i < data.varList.length; i++) {
+            this.dayTime.push(data.varList[i].date)
+          }
+        } else if (data.result == 'exception') {
+          // showException('系统首页', '数据异常')// 显示异常
+        }
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    changePersonType(e) {
+      this.dialogFormLicenseInformation = true
+    },
+    getPersonnelType() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '0b62f92b0b624aab8e89a77304a64d5e'
+        }
+      ).then((data) => {
+        this.LevelsData = data.list
+      }).catch((e) => {
+      })
+    },
+    goConfirm() {
+      this.dialogFormLicenseInformation = false
+    },
+    goScheduling(USER_ID) {
+      this.$refs.form.validate(valid => {
+        if (this.form.SHIFTDUTYONE) {
+          // var
+          console.info(this.selectPeriod)
+          if (!this.form.SHIFTDUTYTWO || this.selectPeriod.DURATION == undefined) {
+            this.$message({
+              message: '请选择完整的排班类型',
+              type: 'error'
+            })
+            return false
+          }
+        }
+        this.SchedulingFrom = false
+        this.listLoading = true
+        this.form.USER_ID = USER_ID
+        requestFN(
+          '/user/editUserScheduling',
+          this.form
+        ).then((data) => {
+          this.listLoading = false
+          this.dialogFormEdit = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    showDate(SHIFTDUTYTWO) {
+      this.datePage = 0
+      this.dialogFormEditDate = true
+      this.getWorkDate(SHIFTDUTYTWO)
+      this.$nextTick(() => {
+        // 点击前一个月
+        const prevBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(1)'
+        )
+        prevBtn.addEventListener('click', e => {
+          this.datePage--
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+        // 点击今天
+        const todayBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(2)'
+        )
+        todayBtn.addEventListener('click', () => {
+          this.datePage = 0
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+        // 点击下一个月
+        const nextBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(3)'
+        )
+        nextBtn.addEventListener('click', e => {
+          this.datePage++
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+
+        // 点击上个月日期
+        var prevDay = document.querySelectorAll(
+          '.el-calendar-table__row .prev'
+        )
+        for (var i = 0; i < prevDay.length; i++) {
+          prevDay[i].addEventListener('click', e => {
+            this.datePage--
+            this.getWorkDate(SHIFTDUTYTWO)
+          })
+        }
+        // 点击下个月日期
+        var nextDay = document.querySelectorAll(
+          '.el-calendar-table__row .next'
+        )
+        // eslint-disable-next-line no-redeclare
+        for (var i = 0; i < nextDay.length; i++) {
+          nextDay[i].addEventListener('click', e => {
+            this.datePage++
+            this.getWorkDate(SHIFTDUTYTWO)
+          })
+        }
+      })
+    },
+
+    pageShowDate(item, USER_ID, SHIFTDUTYTWO) {
+      this.USER_ID = item.USER_ID
+      this.selectPeriod = {
+        'DURATION': item.DURATION,
+        'WORKSTATUS': item.WORKSTATUS,
+        'WORKPERIOD': item.WORKPERIOD
+      }
+      this.showDate(item.SHIFTDUTYTWO)
+    },
+    detailShowDate() {
+      this.showDate(this.form.SHIFTDUTYTWO)
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    },
+    getTreeList() {
+      this.treeLoading = true
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeLoading = false
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        this.treeLoading = false
+      })
+    },
+    getWorkDate(SHIFTWORKRULES_ID) {
+      requestFN(
+        '/shiftworkperiod/getWorkDate',
+        {
+          MONTHS: this.datePage,
+          SHIFTWORKRULES_ID: SHIFTWORKRULES_ID,
+          WORKSTATUS: this.selectPeriod.WORKSTATUS,
+          DURATION: this.selectPeriod.DURATION,
+          WORKPERIOD: this.selectPeriod.WORKPERIOD
+        }
+      ).then((data) => {
+        this.workDateList = data.varList
+      }).catch((e) => {
+      })
+    },
+    listPeriods(SHIFTWORKRULES_ID) {
+      this.periodList = []
+      if (SHIFTWORKRULES_ID) {
+        requestFN(
+          '/shiftworkperiod/listPeriods',
+          {
+            SHIFTWORKRULES_ID: SHIFTWORKRULES_ID
+          }
+        ).then((data) => {
+          this.periodList = data.varList
+          if (this.periodList.length == 1) {
+            this.selectPeriod = {
+              'DURATION': '1',
+              'WORKSTATUS': '1',
+              'WORKPERIOD': '1'
+            }
+          }
+        }).catch((e) => {
+        })
+      }
+    },
+    getRoleList() {
+      requestFN(
+        '/user/goAddUser',
+        {}
+      ).then((data) => {
+        this.roleList = data.roleList
+        this.roleList1 = data.roleList1
+        for (var i = 0; i < this.roleList1.length; i++) { // 循环，向数组里添加新元素
+          this.roleList.push(this.roleList1[i])
+        }
+        console.log(this.roleList, '角色列表')
+      }).catch((e) => {
+      })
+    },
+    getPostList() {
+      if (this.form.DEPARTMENT_ID != null && this.form.DEPARTMENT_ID != '') {
+        requestFN(
+          '/post/listAll',
+          { DEPARTMENT_ID: this.form.DEPARTMENT_ID }
+        ).then((data) => {
+          this.postList = data.postList
+        }).catch((e) => {
+        })
+      }
+    },
+    getRole1List(ROLE_ID) {
+      this.ROLE_ID = ROLE_ID
+      requestFN(
+        '/user/list1',
+        {
+          ROLE_ID: ROLE_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.activeTab = ROLE_ID
+        this.role1List = data.role1List
+        this.roleList_z = data.roleList_z
+        this.total = data.roleList_z
+        this.pd = data.pd
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    handleAdd() {
+      this.dialogType = 'saveUser'
+      requestFN(
+        '/role/findByName',
+        {
+          ROLE_NAME: '企业分级账号'
+        }
+      ).then((data) => {
+        this.shiftDutyListTwo = []
+        this.periodList = []
+        // this.form = Object.assign(this.form, { 'ROLE_ID': data.pd.ROLE_ID }) // copy obj
+        this.form = Object.assign(this.form, { 'userCerList': [] }) // copy obj
+      }).catch((e) => {
+
+      })
+      this.disabledLCInput = true
+      this.displayLCInput = 'display: none'
+      this.disabledLCSelect = false
+      this.displayLCSelect = 'display: block'
+      this.dialogFormEdit = true
+    },
+    number() {
+      this.form.SORT = this.form.SORT.replace(/[^\.\d]/g, '')
+
+      this.form.SORT = this.form.SORT.replace('.', '')
+    },
+    handleEdit(USER_ID) {
+      this.shiftDutyListTwo = []
+      this.periodList = []
+      this.USER_ID = ''
+      this.dialogType = 'editUser'
+      requestFN(
+        '/user/goEditUser',
+        {
+          USER_ID: USER_ID
+        }
+      ).then((data) => {
+        this.form = { ...this.form, ...data.pd, ...data.licenseinfor }
+        // this.form = Object.assign({}, this.form, data.pd, data.licenseinfor) // copy obj
+        this.form.userCerList = data.userCerList
+        this.form.face_file = data.face_file
+        if (this.form.ROLE_ID != null && this.form.ROLE_ID != '') {
+          // 将字符串转换成数组，此时是字符串数组
+          console.log(typeof (this.form.ROLE_ID), '00000000')
+          console.log(this.form.ROLE_ID, '00000000')
+          var arrString = []
+          arrString.push(this.form.ROLE_ID)
+          // eslint-disable-next-line no-unused-vars
+          var arrList = this.form.ROLE_IDS && this.form.ROLE_IDS != '' ? this.form.ROLE_IDS.split(',') : ''
+          // eslint-disable-next-line no-unused-vars
+          for (const item1 of arrList) { // 循环取出多个角色的ID
+            arrString.push(item1)
+          }
+        }
+        this.form.ROLE_ID = arrString
+        // this.form.PASSWORD = 'Aa@123456789'
+        if (this.form.IS_ONLINELEARNING == '1') {
+          this.$set(this.form, 'ISSTUDENT', true)
+        }
+        this.form.USERAVATARURL = this.form.USERAVATARURL_CONVERT
+        this.form.LEARNERCATEGORYSTATUS = 'select'
+        console.log(data.period)
+        this.selectPeriod = data.period
+        this.USER_ID = USER_ID
+        this.getPostList()
+        this.getShiftWorkTwo(this.form.SHIFTDUTYONE)
+        this.disabledLCInput = true
+        this.displayLCInput = 'display: none'
+        this.disabledLCSelect = false
+        this.displayLCSelect = 'display: block'
+        this.oldPostId = data.pd.POST_ID
+        this.oldDepartId = data.pd.DEPARTMENT_ID
+        const node = {}
+        node.id = this.form.DEPARTMENT_ID
+        this.dialogFormEdit = true
+        this.$refs.deptTree.clearHandle()
+
+        this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+          this.$refs.deptTree.handleNodeClick(node)
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    beforeFileUpload(file) {
+      this.daoruFrom.FFILE = file
+      this.daoruFrom.FFILEName = file.name
+      this.$forceUpdate()
+      return false
+    },
+    goPush(row) {
+      requestFN(
+        'user/goPush',
+        {
+          USER_ID: row.USER_ID,
+          STATUS: row.STATUS,
+          BZ: row.BZ,
+          SKIN: row.SKIN,
+          PHONE: row.PHONE,
+          NUMBER: row.NUMBER,
+          ISMAIN: row.ISMAIN,
+          OPENID: row.APPID,
+          SORT: row.SORT,
+          LEARNERCATEGORY: row.LEARNERCATEGORY,
+          USERAVATARPREFIX: row.USERAVATARPREFIX,
+          USERAVATARURL: row.USERAVATARURL,
+          SHIFTDUTYONE: row.SHIFTDUTYONE,
+          SHIFTDUTYTWO: row.SHIFTDUTYTWO,
+          DURATION: row.DURATION,
+          WORKSTATUS: row.WORKSTATUS,
+          WORKPERIOD: row.WORKPERIOD,
+          PERSONNEL_TYPE: row.PERSONNEL_TYPE,
+          TITLE: row.TITLE,
+          ISSTATE: row.ISSTATE,
+          INCUMBENCY: row.INCUMBENCY,
+          WORKING_DATE: row.WORKING_DATE,
+          ENTRY_DATE: row.ENTRY_DATE,
+          TYPE_OF_WORK: row.TYPE_OF_WORK,
+          DUTIES: row.DUTIES,
+          DEGREE_OF_EDUCATION: row.DEGREE_OF_EDUCATION,
+          DATE_OF_BIRTH: row.DATE_OF_BIRTH,
+          POLITICAL_OUTLOOK: row.POLITICAL_OUTLOOK,
+          CARD_NO: row.CARD_NO,
+          USERNAME: row.USERNAME,
+          NAME: row.NAME,
+          CORPINFO_ID: row.CORPINFO_ID,
+          CORPINFO_NAME: row.CORPINFO_NAME || '',
+          DEPARTMENT_ID: row.DEPARTMENT_ID,
+          DEPARTMENT_NAME: row.DEPARTMENT_NAME,
+          IMGFILES_ID: row.IMGFILES_ID,
+          FOREIGN_KEY: row.FOREIGN_KEY,
+          FILEPATH: row.FILEPATH,
+          EMAIL: row.EMAIL || '',
+          CARD_TYPE: '111',
+          CARD_TYPE_NAME: '身份证',
+          NATION: row.NATION || '',
+          SEX: row.SEX || '',
+          USER_TYPE: '1',
+          ISDELETE: row.ISDELETE
+        }
+      ).then((data) => {
+        if (data.result === 'success') {
+          this.$message.success('推送成功')
+          this.$parent.activeName = 'List'
+        } else {
+          this.$message.error('推送失败，' + data.msg)
+          this.$parent.activeName = 'List'
+        }
+      }).catch((e) => {
+        this.listLoading = false
+        this.$parent.activeName = 'List'
+      })
+    },
+    confirm() {
+      // debugger
+      // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息
+      this.$refs.form.validate(valid => {
+        if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) {
+          this.$message({
+            message: '请上传人脸照片',
+            type: 'error'
+          })
+          return false
+        }
+        let isUpdateFace = '0'
+        if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) {
+          isUpdateFace = '1'
+        }
+        if (this.form.SHIFTDUTYONE) {
+          // var
+          if (!this.form.SHIFTDUTYTWO || this.selectPeriod.DURATION == undefined) {
+            this.$message({
+              message: '请选择完整的排班类型',
+              type: 'error'
+            })
+            return false
+          }
+        }
+        // if (this.form.USERAVATARURL == '') {
+        //   this.$message({
+        //     message: '请上传人员照片',
+        //     type: 'warning'
+        //   })
+        //   return false
+        // }
+        if (valid) {
+          this.form.WORKSTATUS = this.selectPeriod.WORKSTATUS
+          this.form.DURATION = this.selectPeriod.DURATION
+          this.form.WORKPERIOD = this.selectPeriod.WORKPERIOD
+          console.log(this.form)
+          if (this.dialogType == 'saveUser') {
+            this.form.ROLE_ID = this.form.ROLE_ID.join(',')
+            this.listLoading = true
+            requestFN(
+              '/user/' + this.dialogType,
+              this.form
+            ).then((data) => {
+              this.listLoading = false
+              if (this.form.ISSTUDENT) {
+                this.uploadImgByZhengshu(data.USER_ID)
+                this.uploadImgByFace(data.USER_ID)
+                this.$parent.activeName = 'List'
+              } else {
+                this.uploadImgByFace(data.USER_ID)
+                this.$parent.activeName = 'List'
+              }
+            }).catch((e) => {
+              this.listLoading = false
+              this.form.ROLE_ID = ''
+              this.form.USERNAME = ''
+            })
+          } else {
+            if (this.oldDepartId != this.form.DEPARTMENT_ID || this.oldPostId != this.form.POST_ID) {
+              this.$confirm('如变更了部门或岗位，保存后将删除该用户所有清单，是否确定？', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.form.ROLE_ID = this.form.ROLE_ID.join(',')
+                this.form.OPERATIONTYPE = '1'
+                this.listLoading = true
+                requestFN(
+                  '/user/' + this.dialogType,
+                  {
+                    IMGFILES_ID: this.IMGFILES_ID, // 旧人脸图片
+                    isUpdateFace: isUpdateFace,
+                    ...this.form
+                  }
+                ).then((data) => {
+                  this.listLoading = false
+                  if (this.form.ISSTUDENT) {
+                    this.uploadImgByZhengshu(this.form.USER_ID)
+                    this.uploadImgByFace(this.form.USER_ID)
+                    this.goPush(this.form)
+                  } else {
+                    this.uploadImgByFace(this.form.USER_ID)
+                    this.goPush(this.form)
+                  }
+                }).catch((e) => {
+                  this.listLoading = false
+                })
+              })
+            } else {
+              this.form.ROLE_ID = this.form.ROLE_ID.join(',')
+              this.listLoading = true
+              requestFN(
+                '/user/' + this.dialogType,
+                {
+                  IMGFILES_ID: this.IMGFILES_ID, // 旧人脸图片
+                  isUpdateFace: isUpdateFace,
+                  ...this.form
+                }
+              ).then((data) => {
+                this.listLoading = false
+                if (this.form.ISSTUDENT) {
+                  this.uploadImgByZhengshu(this.form.USER_ID)
+                  this.uploadImgByFace(this.form.USER_ID)
+                  this.goPush(this.form)
+                } else {
+                  this.uploadImgByFace(this.form.USER_ID)
+                  this.goPush(this.form)
+                }
+              }).catch((e) => {
+                this.listLoading = false
+              })
+            }
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    getBase64(file) {
+      return new Promise(function(resolve, reject) {
+        const reader = new FileReader()
+        let imgResult = ''
+        reader.readAsDataURL(file)
+        reader.onload = function() {
+          imgResult = reader.result
+        }
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        reader.onloadend = function() {
+          resolve(imgResult)
+        }
+      })
+    },
+    getShiftWorkOne() {
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: this.PARENTID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.shiftDutyListOne = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getShiftWorkTwo(id) {
+      if (id) {
+        requestFN(
+          '/shiftworkrules/listAll',
+          {
+            PARENTID: id
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.shiftDutyListTwo = data.varList
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }
+    },
+    getShiftTwoList: function(PARENTID) {
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: PARENTID
+        }
+      ).then((data) => {
+        this.queryShiftTwoList = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getLearnerCategory() {
+      requestFN(
+        '/dictionariesCorp/getLevels',
+        {
+          DICTIONARIES_ID: '532282f9c48346b8b646531909c739df'
+        }
+      ).then((data) => {
+        this.LearnerCategoryList = data.list
+      }).catch((e) => {
+
+      })
+    },
+    changeLearnerCategory() {
+      this.form.LEARNERCATEGORY = ''
+      if (this.form.LEARNERCATEGORYSTATUS === 'select') {
+        this.disabledLCInput = false
+        this.displayLCInput = 'display: block'
+        this.disabledLCSelect = true
+        this.displayLCSelect = 'display: none'
+        this.form.LEARNERCATEGORYSTATUS = 'input'
+      } else {
+        this.disabledLCInput = true
+        this.displayLCInput = 'display: none'
+        this.disabledLCSelect = false
+        this.displayLCSelect = 'display: block'
+        this.form.LEARNERCATEGORYSTATUS = 'select'
+      }
+    },
+    getDict: function() {
+      if (this.uesrInfoDic.minzuList.length == 0) {
+        this.getDicListByPID('0a0e406f27f74ee698fe9979d25f62dd', '', 'minzuList')
+      }
+      if (this.uesrInfoDic.xingbieList.length == 0) {
+        this.getDicListByPID('21501808bbc344d593fbf9ccfe6c4531', '', 'xingbieList')
+      }
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: '0'
+        }
+      ).then((data) => {
+        this.queryShiftOneList = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'user:add,user:del,user:edit'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.userfhadminadd
+        this.del = data.userfhadmindel
+        this.edit = data.userfhadminedit
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    ISSTUDENTCK() {
+      if (this.form.ISSTUDENT || this.dialogFormLicenseInformation) {
+        if (this.uesrInfoDic.zhengzhimianmaoList.length == 0) {
+          this.getDicListByPID('6351efdd12dc4730952e5d195718e252', '', 'zhengzhimianmaoList')
+        }
+        if (this.uesrInfoDic.wenhuachengduList.length == 0) {
+          this.getDicListByPID('d7d80f08d73a4accbccf4fd3d8d1d867', '', 'wenhuachengduList')
+        }
+        if (this.uesrInfoDic.renyuanleixingList.length == 0) {
+          this.getDicListByPID('0b62f92b0b624aab8e89a77304a64d5e', '', 'renyuanleixingList')
+        }
+        if (this.uesrInfoDic.zaizhiqingkuangList.length == 0) {
+          this.getDicListByPID('548764b5d4bf4bd7a18ef88274ef49e4', '', 'zaizhiqingkuangList')
+        }
+        this.getDicListByPID('09e36ac01e9540f8bc84eab1c1a78754', '', 'zhiwuList')
+        this.getDicListByPID('945a6b10e59946078b500f0fbafa8679', '', 'zhichengList')
+        this.getDicListByPID('55484e491a5e442d839c4595380713ec', '', 'gongzhongList')
+      }
+    },
+    getDicListByPID(pId, id, listName) {
+      var url = '/dictionaries/getLevels'
+      if (listName == 'zhiwuList' || listName == 'zhichengList' || listName == 'gongzhongList') {
+        url = '/dictionariesCorp/getLevels'
+      }
+      requestFN(url,
+        {
+          DICTIONARIES_ID: pId
+        }
+      ).then((data) => {
+        this.uesrInfoDic[listName] = data.list
+      }).catch((e) => {
+
+      })
+    },
+    forceUpdate(item) {
+      this.$forceUpdate()
+    },
+    removeDuties(index, dictType) {
+      var dictID = ''
+      var msgTitle = ''
+      if (dictType == 'APPLICABLE_PERSONNEL') {
+        console.info('在线学习人员类别待处理索引：' + index)
+        dictID = this.LearnerCategoryList[index].DICTIONARIES_ID
+        msgTitle = '类别：' + this.LearnerCategoryList[index].NAME
+        dictType = 'APPLICABLE_PERSONNEL'
+      } else if (dictType == 'POSITION') {
+        console.info('职务待处理索引：' + index)
+        dictID = this.uesrInfoDic.zhiwuList[index].DICTIONARIES_ID
+        msgTitle = '职务：' + this.uesrInfoDic.zhiwuList[index].NAME
+      } else if (dictType == 'JOB_TITLE') {
+        console.info('职称待处理索引：' + index)
+        dictID = this.uesrInfoDic.zhichengList[index].DICTIONARIES_ID
+        msgTitle = '职称：' + this.uesrInfoDic.zhichengList[index].NAME
+      } else if (dictType == 'WORK_TYPE') {
+        console.info('工种待处理索引：' + index)
+        dictID = this.uesrInfoDic.gongzhongList[index].DICTIONARIES_ID
+        msgTitle = '工种：' + this.uesrInfoDic.gongzhongList[index].NAME
+      }
+      this.$confirm('删除此分类会同时删除其他相关已编辑过的人员信息中的分类设置，确定要删除（' + msgTitle + '）吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/dictionariesCorp/delete',
+          {
+            DICTIONARIES_ID: dictID,
+            DICTTYPE: dictType
+          }
+        ).then((data) => {
+          this.listLoading = false
+          if (dictType == 'APPLICABLE_PERSONNEL') {
+            this.LearnerCategoryList.splice(index, 1)
+          } else if (dictType == 'POSITION') {
+            this.uesrInfoDic.zhiwuList.splice(index, 1)
+          } else if (dictType == 'JOB_TITLE') {
+            this.uesrInfoDic.zhichengList.splice(index, 1)
+          } else if (dictType == 'WORK_TYPE') {
+            this.uesrInfoDic.gongzhongList.splice(index, 1)
+          }
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch((e) => {
+      })
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    /* 用户头像处理 Begin */
+    handleChangeIMG(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.splice(0, fileList.length)
+      } else {
+        this.getBase64(file.raw).then(res => {
+          this.form.USERAVATARPREFIX = res.substring(0, res.indexOf('base64,') + 7)
+          this.form.USERAVATARURL = res.substring(res.indexOf('base64,') + 7)
+          this.form.USERAVATARURL_CONVERT = res.substring(res.indexOf('base64,') + 7)
+        })
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    handlePictureCardRemove(file, fileList) {
+      this.form.USERAVATARPREFIX = ''
+      this.form.USERAVATARURL = ''
+      this.form.USERAVATARURL_CONVERT = ''
+    },
+    handleChangeIMGFace(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.pop()
+      }
+    },
+    handleChangeIMGZhengshu(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.pop()
+      }
+    },
+    beforeFileUploadByZhengshu(file) {
+      this.certificate_files.push(file)
+    },
+    beforeFileUploadByFace(file) {
+      this.form.face_file.push(file)
+    },
+    uploadImgByZhengshu(userId) {
+      this.$refs.upload.submit()
+      if (this.certificate_files.length > 0) {
+        const formData = new FormData()
+        for (var i = 0; i < this.certificate_files.length; i++) {
+          if (this.certificate_files[i]) {
+            formData.append('FFILE', this.certificate_files[i])
+          }
+        }
+        formData.append('FOREIGN_KEY', userId)
+        formData.append('TYPE', 18)
+        upload(
+          '/imgfiles/add',
+          formData
+        ).then((data) => {
+        }).catch((e) => {
+        })
+      }
+    },
+    uploadImgByFace(userId) {
+      this.$refs.uploadUserAvatar.submit()
+      if (this.form.face_file.length > 0) {
+        const formData = new FormData()
+        for (var i = 0; i < this.form.face_file.length; i++) {
+          if (this.form.face_file[i]) {
+            formData.append('FFILE', this.form.face_file[i])
+          }
+        }
+        formData.append('FOREIGN_KEY', userId)
+        formData.append('TYPE', 30)
+        upload(
+          '/imgfiles/add',
+          formData
+        ).then((data) => {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+        }).catch((e) => {
+        })
+      } else {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
+      }
+    },
+    deleteCertificate(index) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/imgfiles/delete',
+          {
+            IMGFILES_ID: this.form.userCerList[index].IMGFILES_ID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.form.userCerList.splice(index, 1)
+          this.$forceUpdate()
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-dialog__body {
+  padding: 0;
+  background: red;
+}
+
+.mark_up {
+  margin-bottom: 20px;
+  margin-left: 110px;
+}
+
+.icons-container {
+  margin: 0;
+  overflow: hidden;
+
+  .grid {
+    position: relative;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
+  }
+
+  .icon-item {
+    margin-bottom: 10px;
+    height: 70px;
+    text-align: center;
+    width: 100px;
+    float: left;
+    font-size: 24px;
+    color: #24292e;
+    cursor: pointer;
+
+    span {
+      display: block;
+      font-size: 14px;
+      margin-top: 10px;
+    }
+  }
+
+  .disabled {
+    pointer-events: none;
+  }
+}
+
+.filter-btn-group {
+  position: relative;
+}
+
+.filter-flot {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+.uploader {
+  width: 570px;
+  display: flex;
+  align-items: center;
+}
+
+.el-form-item__content {
+  line-height: 1;
+}
+
+.uo-flex {
+  display: flex;
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  border: 1px dashed #c0ccda;
+  font-size: 28px;
+  color: #8c939d;
+  width: 110px;
+  height: 110px;
+  line-height: 110px;
+  border-radius: 6px;
+  text-align: center;
+  background-color: #fbfdff;
+}
+
+.avatar-uploader-icon:hover,
+.avatar-uploader-icon:focus {
+  border-color: #1890ff;
+  color: #1890ff;
+}
+
+.avatar {
+  width: 110px;
+  height: 110px;
+  display: block;
+  border: 1px dashed #c0ccda;
+}
+</style>
+<style lang="sass" scoped>
+.el-row
+  margin-bottom: 16px
+
+  &:last-child
+    margin-bottom: 0
+
+    .form-group
+      display: flex
+      align-items: center
+      margin-right: 20px
+
+      .form-label
+        padding: 9px 15px
+        font-size: 14px
+        width: 240px
+        font-weight: 400
+        line-height: 20px
+        text-align: right
+        margin-bottom: 0
+
+        .star
+          color: red
+          padding-right: 4px
+
+      .input-block
+        flex: 1
+        min-height: 36px
+        position: relative
+
+.disContent
+  padding: 0 20px
+  display: flex
+  align-items: center
+  flex-wrap: wrap
+
+  .img-div
+    position: relative
+    margin: auto 10px 10px 10px
+    width: 120px
+    height: 120px
+    border-radius: 4px
+
+    & > img
+      width: 100%
+      height: 100%
+
+    .disContent-hide
+      position: absolute
+      width: 100%
+      height: 100%
+      border-radius: 4px
+      background-color: rgba(48, 48, 48, 0.59)
+      display: none
+      top: 0
+      left: 0
+
+      .Delete
+        position: absolute
+        bottom: 14px
+        right: 10px
+        font-size: 16px
+        color: white
+        cursor: pointer
+
+        .editCss
+          .Delete
+            font-size: 16px
+            right: 90px
+
+      .yuLan
+        position: absolute
+        bottom: 23px
+        right: 50px
+        font-size: 16px
+        color: white
+        cursor: pointer
+
+      .yuLanImg
+        position: absolute
+        bottom: 0
+        right: 0
+        width: 100%
+        height: 100%
+        opacity: 0
+
+  .img-div:hover .disContent-hide
+    display: block
+
+  .pitchCss
+    border: 1px solid #202e78
+    transition: all linear 0.1s
+    width: 116px
+    height: 116px
+</style>
diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue
new file mode 100644
index 0000000..54aea5f
--- /dev/null
+++ b/src/views/corpInfo/userCenter/components/list.vue
@@ -0,0 +1,1315 @@
+<template>
+  <div class="icons-container">
+    <el-container>
+      <el-aside width="300px" style="background-color:#fff">
+        <el-input
+          v-model="filterText"
+          placeholder="输入关键字进行过滤"
+          style="margin:10px 0"/>
+        <el-tree
+          v-loading="treeLoading"
+          ref="tree"
+          :data="treeData"
+          :props="defaultProps"
+          :filter-node-method="filterNode"
+          class="filter-tree"
+          @node-click="handleNodeClick"/>
+      </el-aside>
+      <el-main>
+        <el-form label-width="60px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="用户名">
+                <el-input v-model="KEYWORDS" style="width: 150px" placeholder="请输入关键字"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="排班">
+                <el-select v-model="SHIFTDUTYONE" placeholder="请选择" style="width: 49%">
+                  <el-option v-for="item in queryShiftOneList" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                </el-select>
+                <el-select v-model="SHIFTDUTYTWO" placeholder="请选择" style="width: 49%">
+                  <el-option v-for="item in queryShiftTwoList" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否为隐患确认人" label-width="150px">
+                <el-select v-model="IS_HAZARDCONFIRMER" placeholder="请选择">
+                  <el-option key="0" label="是" value="1" />
+                  <el-option key="1" label="否" value="0" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item>
+                <el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
+                  一键密码重置
+                </el-button>
+                <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
+                  导入
+                </el-button>
+                <el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
+                  导出
+                </el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" style="text-align: right">
+              <el-form-item label-width="10px">
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                  搜索
+                </el-button>
+                <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+                  重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+          <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
+          <el-table-column type="index" label="序号" width="50" align="center" />
+          <el-table-column prop="USERNAME" label="用户名" />
+          <el-table-column prop="NAME" label="姓名" />
+          <el-table-column prop="PID_NAME" label="上级部门" />
+          <el-table-column prop="DEPARTMENT_NAME" label="部门" />
+          <el-table-column prop="POST_NAME" label="岗位" width="150" show-overflow-tooltip />
+          <el-table-column prop="ROLE_NAME" label="角色" />
+          <el-table-column label="排班类型" >
+            <template slot-scope="{row}">
+              <span v-if="row.SHIFTDUTYONENAME && row.SHIFTDUTYTWONAME">{{ row.SHIFTDUTYONENAME }}-{{ row.SHIFTDUTYTWONAME }}</span>
+              <span v-else>全班</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" width="620px">
+            <template slot-scope="{row}">
+              <el-button v-show="edit" type="success" icon="el-icon-refresh" size="mini" @click="resetPwd(row.USER_ID)">重置密码</el-button>
+              <el-button v-show="edit && row.STATUS === '99'" type="warning" icon="el-icon-unlock" size="mini" @click="unLockUser(row.USER_ID, row.NAME)">帐号解锁</el-button>
+              <template v-if="row.ISMAIN!='1'">
+                <el-button v-show="edit" type="info" icon="el-icon-message" size="mini" @click="Scheduling(row,row.USER_ID,row.SHIFTDUTYTWO)">排班</el-button>
+                <el-button v-show="edit" type="info" icon="el-icon-message" size="mini" @click="pageShowDate(row,row.USER_ID,row.SHIFTDUTYTWO)">排班表</el-button>
+              </template>
+              <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
+              <el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
+              <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+          </div>
+          <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList(USER_ID)" />
+        </div>
+      </el-main>
+    </el-container>
+
+    <el-dialog v-if="dialogFormEditDate" :visible.sync="dialogFormEditDate" title="日历" width="500px">
+      <el-calendar id="calendar">
+        <template
+          slot="dateCell"
+          slot-scope="{data}">
+          <div class="date-cell">
+            <div class="calendar-day" style="line-height: 15px">
+              <span>{{ data.day.split('-').slice(2).join() }}</span>
+              <br>
+              <span v-for="(i, index) in workDateList" :key="index">
+                <template v-if="i.DATE==data.day">
+                  <span v-if="i.STATE == 1" style="color:blue">上班</span>
+                  <span v-else-if="i.STATE == 2" style="color:red">休班</span>
+                </template>
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-calendar>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEditDate = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormDaoru" title="导入" width="800px">
+      <template>
+        <div class="app-container">
+          <el-form ref="form" :model="daoruFrom" label-width="110px" class="in-uploader">
+            <el-form-item label="上传附件" prop="FIELDS">
+              <div class="uploader">
+                <el-input v-model="daoruFrom.FFILEName" :disabled="true" />
+                <el-upload :before-upload="beforeFileUpload" class="avatar-uploader" action="#">
+                  <el-button type="primary" icon="el-icon-upload" style="margin-left:10px">上传附件</el-button>
+                </el-upload>
+                <el-button v-waves type="success" icon="el-icon-right" style="margin-left:10px;width:150px" @click="getExcelModel">
+                  导出模板
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormDaoru = false">取 消</el-button>
+        <el-button type="primary" @click="goUpload">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="SchedulingFrom" title="排班信息" width="600px">
+      <template>
+        <div class="app-container">
+          <el-form ref="form" :model="form" label-width="110px" class="in-uploader">
+            <el-form-item label="排班">
+              <div style="display:flex;">
+                <el-select v-model="form.SHIFTDUTYONE" placeholder="请选择" class="filter-item" style="margin-right:10px">
+                  <el-option v-for="item in shiftDutyListOne" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                </el-select>
+                <el-select v-model="form.SHIFTDUTYTWO" placeholder="请选择" class="filter-item" style="margin-right:10px">
+                  <el-option v-for="item in shiftDutyListTwo" :key="item.SHIFTWORKRULES_ID" :label="item.NAME" :value="item.SHIFTWORKRULES_ID" />
+                </el-select>
+                <el-button @click="detailShowDate">当前班状</el-button>
+              </div>
+            </el-form-item>
+            <el-form-item v-show="periodList.length > 0" label="当前班次">
+              <el-radio-group v-model="selectPeriod">
+                <el-radio-button v-for="(item,i) in periodList" :class="item.isBr?'isBr':''" :key="i" :label="item.period">{{ item.period.WORKSTATUS=='1'?'上班':'休班' }}</el-radio-button>
+                <!-- <el-radio-button label="1">{{ selectPeriod }}</el-radio-button> -->
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="SchedulingFrom = false">取 消</el-button>
+        <el-button type="primary" @click="goScheduling(USER_ID)">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+// import { Message } from 'element-ui'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    var hasUser = (rule, value, callback) => {
+      requestFN(
+        '/user/hasUser',
+        {
+          USERNAME: value,
+          VERIFYUSER_ID: this.form.USER_ID
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          if (data.pd.USER_ID) {
+            callback(new Error('用户名重复'))
+          }
+          callback()
+        }
+      }).catch((e) => {
+        callback()
+      })
+    }
+    var hasEmail = (rule, value, callback) => {
+      if (value) {
+        requestFN(
+          '/user/hasEmail',
+          {
+            EMAIL: value,
+            USERNAME: this.form.USERNAME
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            callback()
+          } else {
+            callback(new Error('邮箱重复'))
+          }
+        }).catch((e) => {
+
+        })
+      } else {
+        callback()
+      }
+    }
+    return {
+      dayTime: [],
+      dialogFormEditDate: false,
+      SchedulingFrom: false,
+      listLoading: true,
+      treeLoading: false,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      filterText: '',
+      total: 0,
+      KEYWORDS: '',
+      SHIFTDUTYONE: '',
+      SHIFTDUTYTWO: '',
+      IS_HAZARDCONFIRMER: '',
+      selectPeriod: [],
+      periodList: [],
+      DEPARTMENT_ID: '',
+      varList: [],
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormEdit: false,
+      dialogType: 'saveUser',
+      disabledLCSelect: false,
+      displayLCSelect: 'display: block',
+      disabledLCInput: true,
+      displayLCInput: 'display: none',
+      LearnerCategoryList: [],
+      rules: {
+        NAME: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        USERNAME: [
+          { required: true, message: '请输入手机号码', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[0-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          },
+          { validator: hasUser, trigger: 'blur' }
+        ],
+        EMAIL: [
+          { required: false, message: '请输入邮箱', trigger: 'blur' },
+          {
+            pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
+            message: '请输入正确的邮箱'
+          },
+          { validator: hasEmail, trigger: 'blur' }
+        ],
+        ROLE_ID: [{ required: true, message: '请选择角色', trigger: 'change' }],
+        DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }],
+        DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
+        SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
+        NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
+        SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+        POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
+        DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
+        DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
+        POST: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
+        TYPE_OF_WORK: [{ required: true, message: '工种不能为空', trigger: 'blur' }],
+        ENTRY_DATE: [{ required: true, message: '请选择入职日期', trigger: 'blur' }],
+        WORKING_DATE: [{ required: true, message: '请选择参加工作日期', trigger: 'blur' }],
+        INCUMBENCY: [{ required: true, message: '在职情况不能为空', trigger: 'blur' }],
+        TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }],
+        DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
+        USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }]
+      },
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      treeData: [],
+      form: {
+        USER_ID: '',
+        ROLE_ID: '',
+        DEPARTMENT_ID: '',
+        POST_ID: '',
+        USERNAME: '',
+        NAME: '',
+        EMAIL: '',
+        LEARNERCATEGORY: '',
+        LEARNERCATEGORYSTATUS: 'select',
+        SORT: '',
+        BZ: '',
+        PASSWORD: 'Aa@123456789',
+        USERAVATARPREFIX: '',
+        USERAVATARURL: '',
+        USERAVATARURL_CONVERT: '',
+        ISSTUDENT: false,
+        NATION: '', // 民族
+        SEX: '', // 性别
+        POLITICAL_OUTLOOK: '', // 政治面貌
+        DATE_OF_BIRTH: '', // 出生年月
+        DEGREE_OF_EDUCATION: '', // 文化程度
+        POST: '', // 职务
+        TYPE_OF_WORK: '', // 工种
+        ENTRY_DATE: '', // 入职日期
+        WORKING_DATE: '', // 参加工作日期
+        INCUMBENCY: '', // 在职情况
+        CERTIFICATE_INFORMATION: '', // 证书信息
+        TITLE: '', // 职称
+        DUTIESValue: '',
+        DUTIES: '',
+        letPostType: 'select',
+        letTitleValue: '',
+        letTitleId: '',
+        letTitleType: 'select',
+        letTypeOfWorkValue: '',
+        letTypeOfWorkId: '',
+        letTypeOfWorkType: 'select',
+        USER_ID_CARD: ''
+      },
+      uesrInfoDic: {
+        minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd
+        zhengzhimianmaoList: [], // 政治面貌 6351efdd12dc4730952e5d195718e252
+        wenhuachengduList: [], // 文化程度 d7d80f08d73a4accbccf4fd3d8d1d867
+        renyuanleixingList: [], // 人员类型 0b62f92b0b624aab8e89a77304a64d5e
+        zhiwuList: [], // 职务 下拉菜单选择已输入过的职务 09e36ac01e9540f8bc84eab1c1a78754
+        gongzhongList: [], // 工种 下拉菜单选择已输入过的职务 55484e491a5e442d839c4595380713ec
+        zaizhiqingkuangList: [], // 在职情况 548764b5d4bf4bd7a18ef88274ef49e4
+        xingbieList: [], // 性别情况 21501808bbc344d593fbf9ccfe6c4531
+        zhichengList: []// 职称 945a6b10e59946078b500f0fbafa8679
+      },
+      certificate_files: [],
+      config: config,
+      dialogImageUrl: [],
+      dialogVisible: false,
+      roleList: [],
+      postList: [],
+      oldPostId: '', // 原岗位ID（用于判断岗位是否变化）
+      oldDepartId: '', // 原部门ID（用于判断部门是否变化）
+      dialogFormDaoru: false,
+      daoruFrom: {
+        FFILE: '',
+        FFILEName: ''
+      },
+      PARENTID: '0',
+      shiftDutyListOne: [],
+      shiftDutyListTwo: [],
+      queryShiftOneList: [],
+      queryShiftTwoList: [],
+      datePage: 0,
+      workDateList: [],
+      USER_ID: '',
+      LOGIN_USER: JSON.parse(sessionStorage.getItem('user')).USER_ID
+    }
+  },
+  watch: {
+    'form.DEPARTMENT_ID': {
+      handler(newVal, oldVal) {
+        if (this.dialogType == 'saveUser' || (oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+          this.form.POST_ID = ''
+          this.getPostList()
+        }
+      },
+      immediate: false
+
+    },
+    'form.SHIFTDUTYONE': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal, '9999999')
+        if ((oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+          this.form.SHIFTDUTYTWO = ''
+          // this.selectPeriod = []
+        }
+        this.getShiftWorkTwo(this.form.SHIFTDUTYONE)
+      },
+      immediate: false
+    },
+    'form.SHIFTDUTYTWO': {
+      handler(newVal, oldVal) {
+        // if (this.dialogType == 'saveUser' || (oldVal != null && oldVal != '')) { // 编辑初始化时，不监听
+        //   this.selectPeriod = []
+        // }
+        this.listPeriods(this.form.SHIFTDUTYTWO)
+      },
+      immediate: false
+    },
+    'SHIFTDUTYONE': {
+      handler(newVal, oldVal) {
+        this.SHIFTDUTYTWO = ''
+        this.getShiftTwoList(this.SHIFTDUTYONE)
+      },
+      immediate: false
+
+    },
+
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    this.getRoleList()
+    this.hasButton()
+    this.getTreeList()
+    this.getShiftWorkOne()
+
+    this.getScheduleAll()
+    this.getDict()
+    // this.getLearnerCategory() // 学员类型已取消
+  },
+  methods: {
+    goPush(row) {
+      requestFN(
+        'user/goPush',
+        {
+          USER_ID: row.USER_ID,
+          STATUS: row.STATUS,
+          BZ: row.BZ,
+          SKIN: row.SKIN,
+          PHONE: row.PHONE,
+          NUMBER: row.NUMBER,
+          ISMAIN: row.ISMAIN,
+          OPENID: row.APPID,
+          SORT: row.SORT,
+          LEARNERCATEGORY: row.LEARNERCATEGORY,
+          USERAVATARPREFIX: row.USERAVATARPREFIX,
+          USERAVATARURL: row.USERAVATARURL,
+          SHIFTDUTYONE: row.SHIFTDUTYONE,
+          SHIFTDUTYTWO: row.SHIFTDUTYTWO,
+          DURATION: row.DURATION,
+          WORKSTATUS: row.WORKSTATUS,
+          WORKPERIOD: row.WORKPERIOD,
+          PERSONNEL_TYPE: row.PERSONNEL_TYPE,
+          TITLE: row.TITLE,
+          ISSTATE: row.ISSTATE,
+          INCUMBENCY: row.INCUMBENCY,
+          WORKING_DATE: row.WORKING_DATE,
+          ENTRY_DATE: row.ENTRY_DATE,
+          TYPE_OF_WORK: row.TYPE_OF_WORK,
+          DUTIES: row.DUTIES,
+          DEGREE_OF_EDUCATION: row.DEGREE_OF_EDUCATION,
+          DATE_OF_BIRTH: row.DATE_OF_BIRTH,
+          POLITICAL_OUTLOOK: row.POLITICAL_OUTLOOK,
+          CARD_NO: row.CARD_NO,
+          USERNAME: row.USERNAME,
+          NAME: row.NAME,
+          CORPINFO_ID: row.CORPINFO_ID,
+          CORPINFO_NAME: row.CORPINFO_NAME || '',
+          DEPARTMENT_ID: row.DEPARTMENT_ID,
+          DEPARTMENT_NAME: row.DEPARTMENT_NAME,
+          IMGFILES_ID: row.IMGFILES_ID,
+          FOREIGN_KEY: row.FOREIGN_KEY,
+          FILEPATH: row.FILEPATH,
+          EMAIL: row.EMAIL || '',
+          CARD_TYPE: '111',
+          CARD_TYPE_NAME: '身份证',
+          NATION: row.NATION || '',
+          SEX: row.SEX || '',
+          USER_TYPE: '1',
+          ISDELETE: row.ISDELETE
+        }
+      ).then((data) => {
+        if (data.result === 'success') {
+          this.$message.success('推送成功')
+          this.getList()
+        } else {
+          this.$message.error('推送失败，' + data.msg)
+        }
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // schedulingChange(e) {
+    //   // console.log(e)
+    //   // this.PARENTID = e
+    //   this.getShiftWorkTwo(e)
+    // },
+    goScheduling(USER_ID) {
+      this.$refs.form.validate(valid => {
+        if (this.form.SHIFTDUTYONE) {
+          // var
+          console.info(this.selectPeriod)
+          if (!this.form.SHIFTDUTYTWO || this.selectPeriod.DURATION == undefined) {
+            this.$message({
+              message: '请选择完整的排班类型',
+              type: 'error'
+            })
+            return false
+          }
+        }
+        this.SchedulingFrom = false
+        this.listLoading = true
+        this.form.USER_ID = USER_ID
+        this.form.WORKSTATUS = this.selectPeriod.WORKSTATUS
+        this.form.DURATION = this.selectPeriod.DURATION
+        this.form.WORKPERIOD = this.selectPeriod.WORKPERIOD
+        requestFN(
+          '/user/editUserScheduling',
+          this.form
+        ).then((data) => {
+          this.listLoading = false
+          this.dialogFormEdit = false
+          this.varList = []
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    getScheduleAll() {
+      requestFN(
+        'schedule/getData',
+        {
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          for (var i = 0; i < data.varList.length; i++) {
+            this.dayTime.push(data.varList[i].date)
+          }
+        } else if (data.result == 'exception') {
+          // showException('系统首页', '数据异常')// 显示异常
+        }
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    getDaochu() {
+      this.$confirm('确定要导出到excel吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = false
+        window.location.href = config.httpurl + 'user/excels'
+      }).catch(() => {
+        this.listLoading = false
+      })
+      this.listLoading = false
+    },
+    showDate(SHIFTDUTYTWO) {
+      this.datePage = 0
+      this.dialogFormEditDate = true
+      this.getWorkDate(SHIFTDUTYTWO)
+      this.$nextTick(() => {
+        // 点击前一个月
+        const prevBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(1)'
+        )
+        prevBtn.addEventListener('click', e => {
+          this.datePage--
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+        // 点击今天
+        const todayBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(2)'
+        )
+        todayBtn.addEventListener('click', () => {
+          this.datePage = 0
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+        // 点击下一个月
+        const nextBtn = document.querySelector(
+          '.el-calendar__button-group .el-button-group>button:nth-child(3)'
+        )
+        nextBtn.addEventListener('click', e => {
+          this.datePage++
+          this.getWorkDate(SHIFTDUTYTWO)
+        })
+
+        // 点击上个月日期
+        var prevDay = document.querySelectorAll(
+          '.el-calendar-table__row .prev'
+        )
+        for (var i = 0; i < prevDay.length; i++) {
+          prevDay[i].addEventListener('click', e => {
+            this.datePage--
+            this.getWorkDate(SHIFTDUTYTWO)
+          })
+        }
+        // 点击下个月日期
+        var nextDay = document.querySelectorAll(
+          '.el-calendar-table__row .next'
+        )
+        // eslint-disable-next-line no-redeclare
+        for (var i = 0; i < nextDay.length; i++) {
+          nextDay[i].addEventListener('click', e => {
+            this.datePage++
+            this.getWorkDate(SHIFTDUTYTWO)
+          })
+        }
+      })
+    },
+    Scheduling(item, USER_ID, SHIFTDUTYTWO) {
+      this.getShiftWorkOne(USER_ID)
+      console.log(SHIFTDUTYTWO)
+      this.SchedulingFrom = true
+      this.USER_ID = USER_ID
+      this.selectPeriod = {
+        'DURATION': item.DURATION,
+        'WORKSTATUS': item.WORKSTATUS,
+        'WORKPERIOD': item.WORKPERIOD
+      }
+    },
+    pageShowDate(item, USER_ID, SHIFTDUTYTWO) {
+      this.USER_ID = item.USER_ID
+      this.selectPeriod = {
+        'DURATION': item.DURATION,
+        'WORKSTATUS': item.WORKSTATUS,
+        'WORKPERIOD': item.WORKPERIOD
+      }
+      this.showDate(item.SHIFTDUTYTWO)
+    },
+    detailShowDate() {
+      this.showDate(this.form.SHIFTDUTYTWO)
+    },
+    getRowKey(row) {
+      return row.USER_ID
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    handleNodeClick(node, data, value) {
+      this.form.DEPARTMENT_ID = node.id
+      this.getList(node.id)
+    },
+    getTreeList() {
+      this.treeLoading = true
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeLoading = false
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        this.treeLoading = false
+      })
+    },
+    getWorkDate(SHIFTWORKRULES_ID) {
+      requestFN(
+        '/shiftworkperiod/getWorkDate',
+        {
+          MONTHS: this.datePage,
+          SHIFTWORKRULES_ID: SHIFTWORKRULES_ID,
+          WORKSTATUS: this.selectPeriod.WORKSTATUS,
+          DURATION: this.selectPeriod.DURATION,
+          WORKPERIOD: this.selectPeriod.WORKPERIOD
+        }
+      ).then((data) => {
+        this.workDateList = data.varList
+      }).catch((e) => {
+      })
+    },
+    listPeriods(SHIFTWORKRULES_ID) {
+      this.periodList = []
+      if (SHIFTWORKRULES_ID) {
+        requestFN(
+          '/shiftworkperiod/listPeriods',
+          {
+            SHIFTWORKRULES_ID: SHIFTWORKRULES_ID
+          }
+        ).then((data) => {
+          this.periodList = data.varList
+          if (this.periodList.length == 1) {
+            this.selectPeriod = {
+              'DURATION': '1',
+              'WORKSTATUS': '1',
+              'WORKPERIOD': '1'
+            }
+          }
+        }).catch((e) => {
+        })
+      }
+    },
+    getRoleList() {
+      requestFN(
+        '/user/goAddUser',
+        {}
+      ).then((data) => {
+        this.roleList = data.roleList
+      }).catch((e) => {
+      })
+    },
+    getPostList() {
+      if (this.form.DEPARTMENT_ID != null && this.form.DEPARTMENT_ID != '') {
+        requestFN(
+          '/post/listAll',
+          { DEPARTMENT_ID: this.form.DEPARTMENT_ID }
+        ).then((data) => {
+          this.postList = data.postList
+        }).catch((e) => {
+        })
+      }
+    },
+    handleAdd() {
+      this.$parent.activeName = 'Edit'
+      this.$parent.USER_ID = ''
+    },
+    handleEdit(row) {
+      this.$parent.USER_ID = row.USER_ID
+      this.$parent.IMGFILES_ID = row.IMGFILES_ID
+      this.$parent.activeName = 'Edit'
+    },
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.SHIFTDUTYONE = ''
+      this.SHIFTDUTYTWO = ''
+      this.IS_HAZARDCONFIRMER = ''
+      this.getList()
+    },
+    beforeFileUpload(file) {
+      this.daoruFrom.FFILE = file
+      this.daoruFrom.FFILEName = file.name
+      this.$forceUpdate()
+      return false
+    },
+    goUpload() {
+      this.dialogFormDaoru = false
+      this.listLoading = true
+      const formData = new FormData()
+      Object.keys(this.daoruFrom).map(key => {
+        formData.append(key, this.daoruFrom[key])
+      })
+      upload(
+        '/user/readExcel3',
+        formData
+      ).then((data) => {
+        if (data.msg) {
+          this.$message({
+            message: data.msg,
+            type: data.type
+          })
+        } else {
+          this.$message({
+            message: '导入成功',
+            type: 'success'
+          })
+        }
+        this.getList()
+        this.getTreeList()
+        this.listLoading = false
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getList(DEPARTMENT_ID) {
+      this.listLoading = true
+      if (DEPARTMENT_ID) {
+        this.DEPARTMENT_ID = DEPARTMENT_ID
+      }
+      requestFN(
+        '/user/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          DEPARTMENT_ID: this.DEPARTMENT_ID,
+          SHIFTDUTYONE: this.SHIFTDUTYONE,
+          SHIFTDUTYTWO: this.SHIFTDUTYTWO,
+          IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
+          USER_ID: this.USER_ID,
+          ISPUSH: '0',
+          NOMAIN: '1'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.userList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getExcelModel() {
+      this.$confirm('确定要下载excel模板吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = false
+        window.location.href = config.httpurl + 'user/excelModel'
+      }).catch(() => {
+        this.listLoading = false
+      })
+      this.listLoading = false
+    },
+    /* 用户头像处理 Begin */
+    getFile(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.splice(0, fileList.length)
+      } else {
+        this.getBase64(file.raw).then(res => {
+          this.form.USERAVATARPREFIX = res.substring(0, res.indexOf('base64,') + 7)
+          this.form.USERAVATARURL = res.substring(res.indexOf('base64,') + 7)
+        })
+      }
+    },
+    getBase64(file) {
+      return new Promise(function(resolve, reject) {
+        const reader = new FileReader()
+        let imgResult = ''
+        reader.readAsDataURL(file)
+        reader.onload = function() {
+          imgResult = reader.result
+        }
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        reader.onloadend = function() {
+          resolve(imgResult)
+        }
+      })
+    },
+    resetPassword() {
+      this.$confirm('一键重置密码，会将所有未修改过密码的用户进行密码重置重置，是否继续?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/user/resetPwdAll',
+          {}
+        ).then(() => {
+          this.$message({
+            message: '重置成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    /* 用户头像处理 End */
+    resetPwd(id, name) {
+      this.$confirm('是否重置密码为Aa@123456789?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/corpinfo/resetPwd',
+          {
+            USER_ID: id
+          }
+        ).then(() => {
+          this.$message({
+            message: '重置成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    unLockUser(id, name) {
+      this.$confirm('确定要解锁 [ 帐号：' + name + ' ] 吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/user/unLockUser',
+          {
+            USER_ID: id
+          }
+        ).then(() => {
+          this.$message({
+            message: '解锁成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    handleDelete(id, name, ispush) {
+      this.$confirm('确定要删除[' + name + ']吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/user/deleteUser',
+          {
+            USER_ID: id,
+            ISPUSH: ispush
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    getShiftWorkOne(USER_ID) {
+      // // debugger
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: this.PARENTID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.shiftDutyListOne = data.varList
+        console.log(data.varList)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getShiftWorkTwo(id) {
+      if (id) {
+        requestFN(
+          '/shiftworkrules/listAll',
+          {
+            PARENTID: id
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.shiftDutyListTwo = data.varList
+          console.log(this.shiftDutyListTwo)
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }
+    },
+    getDict: function() {
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: '0'
+        }
+      ).then((data) => {
+        this.queryShiftOneList = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getShiftTwoList: function(PARENTID) {
+      requestFN(
+        '/shiftworkrules/listAll',
+        {
+          PARENTID: PARENTID
+        }
+      ).then((data) => {
+        this.queryShiftTwoList = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getLearnerCategory() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '532282f9c48346b8b646531909c739df'
+        }
+      ).then((data) => {
+        this.LearnerCategoryList = data.list
+      }).catch((e) => {
+
+      })
+    },
+    changeLearnerCategory() {
+      this.form.LEARNERCATEGORY = ''
+      if (this.form.LEARNERCATEGORYSTATUS === 'select') {
+        this.disabledLCInput = false
+        this.displayLCInput = 'display: block'
+        this.disabledLCSelect = true
+        this.displayLCSelect = 'display: none'
+        this.form.LEARNERCATEGORYSTATUS = 'input'
+      } else {
+        this.disabledLCInput = true
+        this.displayLCInput = 'display: none'
+        this.disabledLCSelect = false
+        this.displayLCSelect = 'display: block'
+        this.form.LEARNERCATEGORYSTATUS = 'select'
+      }
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'user:add,user:del,user:edit'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.userfhadminadd
+        this.del = data.userfhadmindel
+        this.edit = data.userfhadminedit
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    ISSTUDENTCK() {
+      if (this.form.ISSTUDENT) {
+        if (this.uesrInfoDic.minzuList.length == 0) {
+          this.getDicListByPID('0a0e406f27f74ee698fe9979d25f62dd', '', 'minzuList')
+        }
+        if (this.uesrInfoDic.zhengzhimianmaoList.length == 0) {
+          this.getDicListByPID('6351efdd12dc4730952e5d195718e252', '', 'zhengzhimianmaoList')
+        }
+        if (this.uesrInfoDic.wenhuachengduList.length == 0) {
+          this.getDicListByPID('d7d80f08d73a4accbccf4fd3d8d1d867', '', 'wenhuachengduList')
+        }
+        if (this.uesrInfoDic.renyuanleixingList.length == 0) {
+          this.getDicListByPID('0b62f92b0b624aab8e89a77304a64d5e', '', 'renyuanleixingList')
+        }
+        if (this.uesrInfoDic.zaizhiqingkuangList.length == 0) {
+          this.getDicListByPID('548764b5d4bf4bd7a18ef88274ef49e4', '', 'zaizhiqingkuangList')
+        }
+        if (this.uesrInfoDic.xingbieList.length == 0) {
+          this.getDicListByPID('21501808bbc344d593fbf9ccfe6c4531', '', 'xingbieList')
+        }
+        this.getDicListByPID('09e36ac01e9540f8bc84eab1c1a78754', '', 'zhiwuList')
+        this.getDicListByPID('945a6b10e59946078b500f0fbafa8679', '', 'zhichengList')
+        this.getDicListByPID('55484e491a5e442d839c4595380713ec', '', 'gongzhongList')
+      }
+    },
+    getDicListByPID(pId, id, listName) {
+      var url = '/dictionaries/getLevels'
+      if (listName == 'zhiwuList' || listName == 'zhichengList' || listName == 'gongzhongList') {
+        url = '/dictionariesCorp/getLevels'
+      }
+      requestFN(url,
+        {
+          DICTIONARIES_ID: pId
+        }
+      ).then((data) => {
+        this.uesrInfoDic[listName] = data.list
+      }).catch((e) => {
+
+      })
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    beforeFileUploadByZhengshu(file) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+      } else {
+        this.certificate_files.push(file)
+      }
+    },
+    uploadImgByZhengshu(userId) {
+      this.$refs.upload.submit()
+      const formData = new FormData()
+      for (var i = 0; i < this.certificate_files.length; i++) {
+        if (this.certificate_files[i]) {
+          formData.append('FFILE', this.certificate_files[i])
+        }
+      }
+      formData.append('FOREIGN_KEY', userId)
+      formData.append('TYPE', 18)
+      upload(
+        '/imgfiles/add',
+        formData
+      ).then((data) => {
+      }).catch((e) => {
+      })
+    },
+    goExcel() {
+      var data = '?KEYWORDS=' + this.KEYWORDS
+      data += '&DEPARTMENT_ID=' + this.DEPARTMENT_ID
+      data += '&SHIFTDUTYONE=' + this.SHIFTDUTYONE
+      data += '&SHIFTDUTYTWO=' + this.SHIFTDUTYTWO
+      data += '&IS_HAZARDCONFIRMER=' + this.IS_HAZARDCONFIRMER
+      data += '&tm=' + new Date().getTime()
+      window.location.href = config.httpurl + '/user/excel' + data
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+  .el-dialog__body{
+    padding: 0;
+    background: red;
+  }
+  .mark_up{
+    margin-bottom:20px;
+    margin-left: 110px;
+  }
+  .icons-container {
+    margin: 0;
+    overflow: hidden;
+
+    .grid {
+      position: relative;
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
+    }
+
+    .icon-item {
+      margin-bottom: 10px;
+      height: 70px;
+      text-align: center;
+      width: 100px;
+      float: left;
+      font-size: 24px;
+      color: #24292e;
+      cursor: pointer;
+      span {
+        display: block;
+        font-size: 14px;
+        margin-top: 10px;
+      }
+
+    }
+
+    .disabled {
+      pointer-events: none;
+    }
+  }
+  .filter-btn-group{
+    position: relative;
+  }
+  .filter-flot{
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+  .uploader{
+    width: 570px;
+    display: flex;
+    align-items: center;
+  }
+  .el-form-item__content{
+    line-height: 1;
+  }
+  .uo-flex{
+    display: flex
+  }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+
+</style>
+
+<style lang="sass" scoped>
+  .el-row
+    margin-bottom: 16px
+    &:last-child
+      margin-bottom: 0
+      .form-group
+        display: flex
+        align-items: center
+        margin-right: 20px
+        .form-label
+          padding: 9px 15px
+          font-size: 14px
+          width: 240px
+          font-weight: 400
+          line-height: 20px
+          text-align: right
+          margin-bottom: 0
+          .star
+            color: red
+            padding-right: 4px
+        .input-block
+          flex: 1
+          min-height: 36px
+          position: relative
+
+    .disContent
+      padding: 0 20px
+      display: flex
+      align-items: center
+      flex-wrap: wrap
+      .img-div
+        position: relative
+        margin: auto 10px 10px 10px
+        width: 20px
+        height: 20px
+        border-radius: 4px
+        &>img
+          width: 2%
+          height: 3%
+
+        .disContent-hide
+          position: absolute
+          width: 100%
+          height: 100%
+          border-radius: 4px
+          background-color: rgba(48, 48, 48, 0.59)
+          display: none
+          top: 0
+          left: 0
+
+          .Delete
+            position: absolute
+            bottom: 14px
+            right: 10px
+            font-size: 16px
+            color: white
+            cursor: pointer
+
+            .editCss
+              .Delete
+                font-size: 16px
+                right: 90px
+
+          .yuLan
+            position: absolute
+            bottom: 23px
+            right: 50px
+            font-size: 16px
+            color: white
+            cursor: pointer
+
+          .yuLanImg
+            position: absolute
+            bottom: 0
+            right: 0
+            width: 100%
+            height: 100%
+            opacity: 0
+
+      .img-div:hover .disContent-hide
+        display: block
+
+      .pitchCss
+        border: 1px solid #202e78
+        transition: all linear 0.1s
+        width: 116px
+        height: 116px
+</style>
diff --git a/src/views/corpInfo/userCenter/index.vue b/src/views/corpInfo/userCenter/index.vue
new file mode 100644
index 0000000..80f56d4
--- /dev/null
+++ b/src/views/corpInfo/userCenter/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <List v-show="activeName=='List'" ref="list" />
+    <Edit v-if="activeName=='Edit'" />
+  </div>
+</template>
+
+<script>
+import List from './components/list'
+import Edit from './components/edit'
+export default {
+  components: {
+    List: List,
+    Edit: Edit
+  },
+  data() {
+    return {
+      activeName: 'List',
+      USER_ID: ''
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getList()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue
index 76168b7..22e2de2 100644
--- a/src/views/hiddenApi/publicMethod/list.vue
+++ b/src/views/hiddenApi/publicMethod/list.vue
@@ -108,7 +108,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">

From 1bc847fea9e5cbd2bee901e665c6263ca14ad685 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Mon, 12 Aug 2024 14:09:21 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/corpInfo/userCenter/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue
index 54aea5f..d67d29e 100644
--- a/src/views/corpInfo/userCenter/components/list.vue
+++ b/src/views/corpInfo/userCenter/components/list.vue
@@ -94,7 +94,7 @@
               </template>
               <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
               <el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
-              <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
+              <el-button v-if="row.ISPUSH == '0' | row.ISPUSH == undefined" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
             </template>
           </el-table-column>
         </el-table>

From 202af29c014f7168aaa221b141f0857af71d6c89 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Tue, 3 Sep 2024 18:07:42 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firefighting/points/components/list.vue   | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index d28bce7..b8c08de 100644
--- a/src/views/firefighting/points/components/list.vue
+++ b/src/views/firefighting/points/components/list.vue
@@ -73,7 +73,7 @@
               <el-tag v-else type="danger">否</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="380">
+          <el-table-column label="操作" width="450">
             <template slot-scope="{row}">
               <el-button
                 v-show="true"
@@ -97,6 +97,14 @@
                 size="mini"
                 @click="handleDelete(row)">删除
               </el-button>
+              <!-- 新增按钮：检查记录二维码 -->
+              <el-button
+                class="tiffany-btn"
+                icon="el-icon-document"
+                type="info"
+                size="mini"
+                @click="handleShowRecordQr(row)">检查记录二维码
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -143,6 +151,22 @@
         <el-button v-print="'#printTest'" type="primary">打 印</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogRecordFormShow" title="查看检查记录二维码" width="680px" class="top-dialog">
+      <div id="recordPrintTest" style="border: 1px solid #fff;">
+        <div class="level-title" style="margin-top:20px">
+          <h1>检查记录二维码</h1>
+        </div>
+        <div class="table-qrcode">
+          <vue-qr :text="recordQrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRecordFormShow = false">关 闭</el-button>
+        <el-button v-print="'#recordPrintTest'" type="primary">打 印</el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
       <el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
         <el-row>
@@ -157,7 +181,6 @@
         <el-button @click="dialogEditUser = false">取 消</el-button>
         <el-button type="primary" @click="dialogEditUserConfirm">确 定</el-button>
       </div>
-
     </el-dialog>
   </div>
 </template>
@@ -171,9 +194,7 @@ import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
 
 export default {
-
   components: { Pagination, SelectTree, vueQr },
-
   directives: { waves },
   data() {
     return {
@@ -181,7 +202,9 @@ export default {
       addBtnType: true,
       listLoading: true,
       dialogFormShow: false,
+      dialogRecordFormShow: false,
       qrcodeStr: '',
+      recordQrcodeStr: '',
       qrInfo: {},
       add: false,
       del: false,
@@ -246,39 +269,36 @@ export default {
     handleShowQr(ROW) {
       this.dialogFormShow = true
       this.qrInfo = ROW
-      // 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun
       this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
-      // const json = {
-      //   MANAGER_TYPE: 'fireListManager',
-      //   FIRE_POINT_ID: ROW.FIRE_POINT_ID
-      // }
-      // const jsonStr = JSON.stringify(json)
-      // this.qrcodeStr = jsonStr
+    },
+    handleShowRecordQr(ROW) {
+      this.dialogRecordFormShow = true
+      const json = {
+        MANAGER_TYPE: 'fireListManager',
+        USER_ID: ROW.USER_ID,
+        DEPARTMENT_ID: ROW.DEPARTMENT_ID
+      }
+      this.recordQrcodeStr = JSON.stringify(json)
     },
     handleEdit(FIRE_POINT_ID) {
       this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
       this.$parent.activeName = 'Edit'
     },
     selectable(row, index) {
-      // return row.DEVICE_COUNT == 0
       return true
     },
     getRowKey(row) {
       return row.FIRE_POINT_ID
     },
-    // 添加
     handleAdd() {
       this.$parent.activeName = 'Edit'
       this.$parent.FIRE_POINT_ID = ''
       this.$parent.FIRE_POINT_CODE = ''
       this.$parent.FIRE_POINT_NAME = ''
     },
-    // 搜索
     getQuery() {
-      // this.$refs.multipleTable.clearSelection()
       this.getList()
     },
-    // 获取列表
     getList(pid) {
       this.listLoading = true
       this.varList = []
@@ -299,7 +319,8 @@ export default {
       }).catch((e) => {
         this.listLoading = false
       })
-    }, goKeyReset() {
+    },
+    goKeyReset() {
       this.FIRE_POINT_NAME = ''
       this.FIRE_POINT_CODE = ''
       this.IS_PUNCTUATION = ''
@@ -345,7 +366,6 @@ export default {
           this.listLoading = false
         })
     },
-    // 部门列表树
     getTreeData() {
       requestFN(
         '/department/listTreeV2',
@@ -355,7 +375,6 @@ export default {
       }).catch((e) => {
       })
     },
-    // 批量修改负责人
     handleEditUser(row) {
       this.editDataIds = []
       if (row.FIRE_POINT_ID) {
@@ -505,15 +524,15 @@ export default {
 }
 </script>
 
-<style scoped >
+<style scoped>
 .returnBtn {
   float: right;
 }
 .app-container {
-  display: flex; /**/
+  display: flex;
   align-items: baseline;
 }
-.table-qrcode{
+.table-qrcode {
   text-align: center;
   padding-top: 20px;
   width: 100%;