diff --git a/src/components/face/Face.vue b/src/components/face/Face.vue
index 59b74ba77b68fa54f1be554e95a59a610f87c4d4..3da3cf218230df3e7d90a5f1fccb6e54528a8027 100644
--- a/src/components/face/Face.vue
+++ b/src/components/face/Face.vue
@@ -17,47 +17,47 @@
         登录注册
         <dv-border-box12>
           <div>
-            <a-steps :current="current" @change="onChange">
-              <a-step />
-              <a-step />
-              <a-step />
-            </a-steps>
-            <a-divider />
+            <a-tabs default-active-key="1" @change="onChange">
+              <a-tab-pane key="1" tab="登录">
+                <a-row style="margin-top:20px;color: whitesmoke" :gutter="40">
+                  <a-col :span="24">
+                    <a-button round @click="searchImage()">登录</a-button>
+                  </a-col>
+                </a-row>
+              </a-tab-pane>
+              <a-tab-pane key="2" tab="注册" force-render>
+                <a-row style="margin-top:20px;color: whitesmoke" :gutter="40">
+                  <a-col :span="24">
+                    工号：
+                    <a-select
+                      show-search
+                      :value="workNo+' '+realname"
+                      placeholder="请输入工号"
+                      style="width: 200px"
+                      :default-active-first-option="false"
+                      :show-arrow="false"
+                      :filter-option="false"
+                      :not-found-content="null"
+                      @search="handleSearch"
+                      @change="handleChange"
+                      @focus="fetchUser('')"
+                    >
+                      <a-select-option v-for="d in data" :key="JSON.stringify(d)">
+                        {{ d.workNo }} {{ d.realname }}
+                      </a-select-option>
+                    </a-select>
+                  </a-col>
+
+                  <a-col style="margin-top: 10px" :span="24">
+                    <a-button round @click="register()">注册</a-button>
+                  </a-col>
+
+                </a-row>
+              </a-tab-pane>
+            </a-tabs>
           </div>
 
-          <a-row style="margin-top:20px" :gutter="40">
-            <a-col v-if="current==0" :span="6">
-              <a-button round @click="setImage()">拍照</a-button>
-              <!-- <j-upload v-model="userFace" file-type="image"  ></j-upload>-->
-            </a-col>
-            <a-col :span="24" v-if="current==1">
-              工号：
-              <a-select
-                show-search
-                :value="workNo+' '+realname"
-                placeholder="请输入工号"
-                style="width: 200px"
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-                @search="handleSearch"
-                @change="handleChange"
-                @focus="fetchUser('')"
-              >
-                <a-select-option v-for="d in data" :key="JSON.stringify(d)">
-                  {{ d.workNo }} {{ d.realname }}
-                </a-select-option>
-              </a-select>
-            </a-col>
 
-            <a-col style="margin-top: 10px" :span="24" v-if="current==1">
-              <a-button round @click="register()">注册</a-button>
-            </a-col>
-            <a-col :span="4" v-if="current==2">
-              <a-button round @click="searchImage()">登录</a-button>
-            </a-col>
-          </a-row>
         </dv-border-box12>
       </dv-border-box-12>
     </dv-border-box-7>
@@ -65,334 +65,338 @@
 
 </template>
 <script>
-import { getAction, postAction } from '@api/manage'
-import Vue from 'vue'
-import user from '../../store/modules/user'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { mapActions } from 'vuex'
+    import { getAction, postAction } from '@api/manage'
+    import Vue from 'vue'
+    import user from '../../store/modules/user'
+    import { ACCESS_TOKEN } from '@/store/mutation-types'
+    import { mapActions } from 'vuex'
 
-export default {
-  data() {
-    return {
-      videoWidth: 1200,
-      videoHeight: 600,
-      imgSrc: '',
-      thisCancas: null,
-      thisContext: null,
-      thisVideo: null,
-      openVideo: false,
-      photo: {
-        base64Code: '',
-        username: ''
-      },
-      current: 0,
-      data: [],
-      userInfoId: undefined,
-      workNo: '',
-      realname: '',
-      imgPath: '',
-      age: 18,
-      sex: '',
-      loginFailed: 0,
-      loginModel: false
-    }
-  },
-  mounted() {
-    this.getCompetence()
-    this.getImage()
-  },
-  methods: {
-    ...mapActions(['faceLogin']),
-    // 调用权限（打开摄像头功能）
-    getCompetence() {
-      const _this = this
-      _this.thisCancas = document.getElementById('canvasCamera')
-      _this.thisContext = this.thisCancas.getContext('2d')
-      _this.thisVideo = document.getElementById('videoCamera')
-      _this.thisVideo.style.display = 'block'
-      // 获取媒体属性，旧版本浏览器可能不支持mediaDevices，我们首先设置一个空对象
-      if (navigator.mediaDevices === undefined) {
-        navigator.mediaDevices = {}
-      }
+    export default {
+        data() {
+            return {
+                videoWidth: 1200,
+                videoHeight: 600,
+                imgSrc: '',
+                thisCancas: null,
+                thisContext: null,
+                thisVideo: null,
+                openVideo: false,
+                photo: {
+                    base64Code: '',
+                    username: ''
+                },
+                current: 0,
+                data: [],
+                userInfoId: undefined,
+                workNo: '',
+                realname: '',
+                imgPath: '',
+                age: 18,
+                sex: '',
+                loginFailed: 0,
+                loginModel: false
+            }
+        },
+        mounted() {
+            this.getCompetence()
+            this.getImage()
+        },
+        methods: {
+            ...mapActions(['faceLogin']),
+            // 调用权限（打开摄像头功能）
+            getCompetence() {
+                const _this = this
+                _this.thisCancas = document.getElementById('canvasCamera')
+                _this.thisContext = this.thisCancas.getContext('2d')
+                _this.thisVideo = document.getElementById('videoCamera')
+                _this.thisVideo.style.display = 'block'
+                // 获取媒体属性，旧版本浏览器可能不支持mediaDevices，我们首先设置一个空对象
+                if (navigator.mediaDevices === undefined) {
+                    navigator.mediaDevices = {}
+                }
 
-      // 一些浏览器实现了部分mediaDevices，我们不能只分配一个对象
-      // 使用getUserMedia，因为它会覆盖现有的属性。
-      // 这里，如果缺少getUserMedia属性，就添加它。
-      if (navigator.mediaDevices.getUserMedia === undefined) {
-        navigator.mediaDevices.getUserMedia = function(constraints) {
-          // 首先获取现存的getUserMedia(如果存在)
-          const getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia
-          // 有些浏览器不支持，会返回错误信息
-          // 保持接口一致
-          if (!getUserMedia) {//不存在则报错
-            return Promise.reject(
-              new Error('getUserMedia is not implemented in this browser')
-            )
-          }
-          // 否则，使用Promise将调用包装到旧的navigator.getUserMedia
-          return new Promise(function(resolve, reject) {
-            getUserMedia.call(navigator, constraints, resolve, reject)
-          })
-        }
-      }
-      const constraints = {
-        audio: false,
-        video: {
-          width: this.videoWidth,
-          height: this.videoHeight,
-          transform: 'scaleX(-1)'
-        }
-      }
-      navigator.mediaDevices
-        .getUserMedia(constraints)
-        .then(function(stream) {
-          // 旧的浏览器可能没有srcObject
-          if ('srcObject' in _this.thisVideo) {
-            _this.thisVideo.srcObject = stream
-          } else {
-            // 避免在新的浏览器中使用它，因为它正在被弃用。
-            _this.thisVideo.src = window.URL.createObjectURL(stream)
-          }
-          _this.thisVideo.onloadedmetadata = function() {
-            _this.thisVideo.play()
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-    //  绘制图片（拍照功能）
-    setImage() {
-      const _this = this
-      // canvas画图
-      _this.thisContext.drawImage(_this.thisVideo, 0, 0, _this.videoWidth, _this.videoHeight)
-      // 获取图片base64链接
-      _this.imgSrc = this.thisCancas.toDataURL('image/png')//赋值并预览图片
-      _this.current = 1
-    },
+                // 一些浏览器实现了部分mediaDevices，我们不能只分配一个对象
+                // 使用getUserMedia，因为它会覆盖现有的属性。
+                // 这里，如果缺少getUserMedia属性，就添加它。
+                if (navigator.mediaDevices.getUserMedia === undefined) {
+                    navigator.mediaDevices.getUserMedia = function(constraints) {
+                        // 首先获取现存的getUserMedia(如果存在)
+                        const getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia
+                        // 有些浏览器不支持，会返回错误信息
+                        // 保持接口一致
+                        if (!getUserMedia) {//不存在则报错
+                            return Promise.reject(
+                                new Error('getUserMedia is not implemented in this browser')
+                            )
+                        }
+                        // 否则，使用Promise将调用包装到旧的navigator.getUserMedia
+                        return new Promise(function(resolve, reject) {
+                            getUserMedia.call(navigator, constraints, resolve, reject)
+                        })
+                    }
+                }
+                const constraints = {
+                    audio: false,
+                    video: {
+                        width: this.videoWidth,
+                        height: this.videoHeight,
+                        transform: 'scaleX(-1)'
+                    }
+                }
+                navigator.mediaDevices
+                    .getUserMedia(constraints)
+                    .then(function(stream) {
+                        // 旧的浏览器可能没有srcObject
+                        if ('srcObject' in _this.thisVideo) {
+                            _this.thisVideo.srcObject = stream
+                        } else {
+                            // 避免在新的浏览器中使用它，因为它正在被弃用。
+                            _this.thisVideo.src = window.URL.createObjectURL(stream)
+                        }
+                        _this.thisVideo.onloadedmetadata = function() {
+                            _this.thisVideo.play()
+                        }
+                    })
+                    .catch(err => {
+                        console.log(err)
+                    })
+            },
+            //  绘制图片（拍照功能）
+            setImage() {
+                const _this = this
+                // canvas画图
+                _this.thisContext.drawImage(_this.thisVideo, 0, 0, _this.videoWidth, _this.videoHeight)
+                // 获取图片base64链接
+                _this.imgSrc = this.thisCancas.toDataURL('image/png')//赋值并预览图片
+                _this.current = 1
+            },
 
-    getImage() {
-      this.$message.info('请保持正脸进入屏幕')
-      let that = this
-      setTimeout(function() {
-        that.setImage()
-      }, 5000)
-      setTimeout(function() {
-        that.searchImage()
-      }, 6000)
-    },
-    // 关闭摄像头
-    stopNavigator() {
-      this.thisVideo.srcObject.getTracks()[0].stop()
-    },
-    register() {
-      if (this.userInfoId === undefined) {
-        this.$notification.open({
-          message: '注册失败',
-          description: '请录入工号'
-        })
-      } else {
-        let params = {
-          age: this.age,
-          sex: this.sex,
-          groupId: 101,
-          userInfoId: this.userInfoId,
-          file: this.imgSrc,
-          name: this.realname,
-          imgPath: 'temp/' + this.workNo + this.realname + '.png'
-        }
-        postAction('/sys/user/faceAdd', params).then(res => {
-          if (res.success) {
-            this.$notification.open({
-              message: '注册成功',
-              description: '用户' + this.realname + '注册成功,信息已录入！',
-              //Vue.
-              onClick: () => {
-                console.log('用户注册')
-              }
-            })
-            this.saveImageToLocal()
-          } else {
-            this.$notification.open({
-              message: '注册失败',
-              description: res.message + ',请重新拍照'
-            })
-          }
-        })
-      }
-    },
+            getImage() {
+                this.$message.info('请保持正脸进入屏幕')
+                let that = this
+                setTimeout(function() {
+                    that.setImage()
+                }, 5000)
+                setTimeout(function() {
+                    that.searchImage()
+                }, 6000)
+            },
+            // 关闭摄像头
+            stopNavigator() {
+                this.thisVideo.srcObject.getTracks()[0].stop()
+            },
+            register() {
+                if (this.userInfoId === undefined) {
+                    this.$notification.open({
+                        message: '注册失败',
+                        description: '请录入工号'
+                    })
+                } else {
+                    let params = {
+                        age: this.age,
+                        sex: this.sex,
+                        groupId: 101,
+                        userInfoId: this.userInfoId,
+                        file: this.imgSrc,
+                        name: this.realname,
+                        imgPath: 'temp/' + this.workNo + this.realname + '.png'
+                    }
+                    postAction('/sys/user/faceAdd', params).then(res => {
+                        if (res.success) {
+                            this.$notification.open({
+                                message: '注册成功',
+                                description: '用户' + this.realname + '注册成功,信息已录入！',
+                                //Vue.
+                                onClick: () => {
+                                    console.log('用户注册')
+                                }
+                            })
+                            this.saveImageToLocal()
+                        } else {
+                            this.$notification.open({
+                                message: '注册失败',
+                                description: res.message + ',请重新拍照'
+                            })
+                        }
+                    })
+                }
+            },
 
-    searchImage() {
-      const _this = this
-      let params = { groupId: 101, file: this.imgSrc }
-      this.faceLogin(params).then((res) => {
-        console.log(res)
-        if (res.success) {
-          this.$notification.open({
-            message: '登陆成功',
-            description: '相似度为' + res.result.faceSearchResDto.similarValue + '%，用户获得登录许可！',
-            onClick: () => {
-              console.log('用户搜索')
-            }
-          })
-          Vue.ls.set('ACCESS_TOKEN', res.result.token)
-          //this.mutations.SET_TOKEN()
-          user.state.token = res.result.token
-          this.$router.push('/toolbox')
-        } else {
-          this.loginFailed = this.loginFailed + 1
-          const model = this.$error({
-            title: '错误',
-            content: '登陆失败！请重试',
-            okText: '重新登陆',
-            onOk: () => {
-              model.destroy()
-              _this.stopNavigator()
-              _this.getCompetence()
-              _this.getImage()
+            searchImage() {
+                const _this = this
+                let params = { groupId: 101, file: this.imgSrc }
+                this.faceLogin(params).then((res) => {
+                    console.log(res)
+                    if (res.success) {
+                        this.$notification.open({
+                            message: '登陆成功',
+                            description: '相似度为' + res.result.faceSearchResDto.similarValue + '%，用户获得登录许可！',
+                            onClick: () => {
+                                console.log('用户搜索')
+                            }
+                        })
+                        Vue.ls.set('ACCESS_TOKEN', res.result.token)
+                        //this.mutations.SET_TOKEN()
+                        user.state.token = res.result.token
+                        this.$router.push('/toolbox')
+                    } else {
+                        this.loginFailed = this.loginFailed + 1
+                        const model = this.$error({
+                            title: '错误',
+                            content: '登陆失败！请重试',
+                            okText: '重新登陆',
+                            onOk: () => {
+                                model.destroy()
+                                _this.stopNavigator()
+                                _this.getCompetence()
+                                _this.getImage()
 
-            }
-          })
-          if (this.loginFailed === 5) {
-            this.$message.error('登陆失败' + this.loginFailed + '次，请使用账号密码登陆')
-            setTimeout(() => {
-              this.$router.push('/login')
-            }, 2000)
-          }
-        }
-      }).catch(error => {
-        this.loginFailed = this.loginFailed + 1
-        const model = this.$error({
-          title: '错误',
-          content: '登陆失败！请重试',
-          okText: '重新登陆',
-          onOk: () => {
-            model.destroy()
-            _this.stopNavigator()
-            _this.getCompetence()
-            _this.getImage()
+                            }
+                        })
+                        if (this.loginFailed === 5) {
+                            this.$message.error('登陆失败' + this.loginFailed + '次，请使用账号密码登陆')
+                            setTimeout(() => {
+                                this.$router.push('/login')
+                            }, 2000)
+                        }
+                    }
+                }).catch(error => {
+                    this.loginFailed = this.loginFailed + 1
+                    const model = this.$error({
+                        title: '错误',
+                        content: '登陆失败！请重试',
+                        okText: '重新登陆',
+                        onOk: () => {
+                            model.destroy()
+                            _this.stopNavigator()
+                            _this.getCompetence()
+                            _this.getImage()
 
-          }
-        })
-        if (this.loginFailed === 5) {
-          this.$message.error('登陆失败' + this.loginFailed + '次，请使用账号密码登陆')
-          setTimeout(() => {
-            this.$router.push('/login')
-          }, 2000)
-        }
-      })
-    },
+                        }
+                    })
+                    if (this.loginFailed === 5) {
+                        this.$message.error('登陆失败' + this.loginFailed + '次，请使用账号密码登陆')
+                        setTimeout(() => {
+                            this.$router.push('/login')
+                        }, 2000)
+                    }
+                })
+            },
 
-    saveImageToLocal() {
-      this.photo.base64Code = encodeURI(this.imgSrc).replace(/\+/g, '%2B')
-      this.photo.username = this.workNo + this.realname
-      postAction('/saveImage', this.photo).then(res => {
-        console.log(res)
-        this.imgPath = res.result
-      })
-    },
-    // base64转文件
-    dataURLtoFile(dataurl, filename) {
-      const arr = dataurl.split(',')
-      const mime = arr[0].match(/:(.*?);/)[1]
-      const bstr = atob(arr[1])
-      let n = bstr.length
-      const u8arr = new Uint8Array(n)
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n)
-      }
-      return new File([u8arr], filename, { type: mime })
-    },
-    onChange(current) {
-      // console.log('onChange:', current);
-      this.current = current
-    },
-    fetchUser(value) {
-      /*console.log("value+++:"+value)*/
-      let params = { workNo: value }
-      /*console.log(params.workNo)*/
-      let url = '/sys/user/getSysUserByWorkNo'
-      let that = this
-      getAction(url, params).then(res => {
-        that.data = res.result
-      })
-    },
-    handleSearch(value) {
-      /*console.log('value:' + value)*/
-      /*fetch(value, data => (this.data = data));*/
-      this.fetchUser(value)
-    },
-    handleChange(value) {
-      let user = JSON.parse(value)
-      /*console.log('user:' + user)*/
-      this.workNo = user.workNo
-      this.realname = user.realname
-      this.userInfoId = user.id
-      console.log(typeof user.birthday)
-      this.age = user.birthday
-      if (user.birthday != null) {
-        let time2 = new Date().getTime() - new Date(user.birthday + ' 00:00:00').getTime()
-        let date = new Date(time2)
-        this.age = date.getFullYear() - 1970
-      }
-      this.sex = user.sex
-      /*console.log(this.workNo+this.realname+this.userInfoId+this.age+this.sex)*/
-      this.fetchUser(value)
+            saveImageToLocal() {
+                this.photo.base64Code = encodeURI(this.imgSrc).replace(/\+/g, '%2B')
+                this.photo.username = this.workNo + this.realname
+                postAction('/saveImage', this.photo).then(res => {
+                    console.log(res)
+                    this.imgPath = res.result
+                })
+            },
+            // base64转文件
+            dataURLtoFile(dataurl, filename) {
+                const arr = dataurl.split(',')
+                const mime = arr[0].match(/:(.*?);/)[1]
+                const bstr = atob(arr[1])
+                let n = bstr.length
+                const u8arr = new Uint8Array(n)
+                while (n--) {
+                    u8arr[n] = bstr.charCodeAt(n)
+                }
+                return new File([u8arr], filename, { type: mime })
+            },
+            onChange(current) {
+                // console.log('onChange:', current);
+                this.current = current
+            },
+            fetchUser(value) {
+                /*console.log("value+++:"+value)*/
+                let params = { workNo: value }
+                /*console.log(params.workNo)*/
+                let url = '/sys/user/getSysUserByWorkNo'
+                let that = this
+                getAction(url, params).then(res => {
+                    that.data = res.result
+                })
+            },
+            handleSearch(value) {
+                /*console.log('value:' + value)*/
+                /*fetch(value, data => (this.data = data));*/
+                this.fetchUser(value)
+            },
+            handleChange(value) {
+                let user = JSON.parse(value)
+                /*console.log('user:' + user)*/
+                this.workNo = user.workNo
+                this.realname = user.realname
+                this.userInfoId = user.id
+                console.log(typeof user.birthday)
+                this.age = user.birthday
+                if (user.birthday != null) {
+                    let time2 = new Date().getTime() - new Date(user.birthday + ' 00:00:00').getTime()
+                    let date = new Date(time2)
+                    this.age = date.getFullYear() - 1970
+                }
+                this.sex = user.sex
+                /*console.log(this.workNo+this.realname+this.userInfoId+this.age+this.sex)*/
+                this.fetchUser(value)
+            }
+        }
     }
-  }
-}
 </script>
 
-
+<style>
+  div.ant-tabs-tab{
+    color: white;
+  }
+</style>
 <style lang="less">
-#veriFace {
-  width: 100%;
-  height: 100%;
-  background-color: #030409;
-  color: #fff;
-  background-image: url('../../assets/bg.png');;
-  background-size: 100% 100%;
-  box-shadow: 0 0 3px blue;
-  display: flex;
-  flex-direction: column;
-
-  .main-header {
-    height: 80px;
+  #veriFace {
+    width: 100%;
+    height: 100%;
+    background-color: #030409;
+    color: #fff;
+    background-image: url('../../assets/bg.png');
+    background-size: 100% 100%;
+    box-shadow: 0 0 3px blue;
     display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-    font-size: 30px;
-    margin: 0 auto;
-  }
-
-  .main-container {
-    height: calc(~"100% - 80px");
+    flex-direction: column;
 
-    .border-box-content {
-      padding: 20px;
-      box-sizing: border-box;
+    .main-header {
+      height: 80px;
       display: flex;
+      justify-content: space-between;
+      align-items: flex-end;
+      font-size: 30px;
+      margin: 0 auto;
     }
-  }
 
-  .left-container {
-    width: 70%;
-    padding: 10px;
-    box-sizing: border-box;
+    .main-container {
+      height: calc(~"100% - 80px");
 
-    .border-box-content {
-      flex-direction: column;
+      .border-box-content {
+        padding: 20px;
+        box-sizing: border-box;
+        display: flex;
+      }
     }
-  }
 
-  .right-container {
-    width: 30%;
-    padding-left: 5px;
-    box-sizing: border-box;
+    .left-container {
+      width: 70%;
+      padding: 10px;
+      box-sizing: border-box;
 
-    .border-box-content {
-      flex-direction: column;
+      .border-box-content {
+        flex-direction: column;
+      }
+    }
+
+    .right-container {
+      width: 30%;
+      padding-left: 5px;
+      box-sizing: border-box;
+
+      .border-box-content {
+        flex-direction: column;
+      }
     }
   }
-}
 </style>
\ No newline at end of file
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index d8c5737a018972efaa60df76ae4386dacd34175a..9277b06af427365a8fe5a38d5b4d20bae86ce909 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -26,30 +26,30 @@
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
+    <!--<span class="action">
       <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
         <a-icon type="question-circle-o"></a-icon>
       </a>
-    </span>
-    <header-notice class="action"/>
+    </span>-->
+    <!--<header-notice class="action"/>-->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-<!--        <a-menu-item key="0">-->
-<!--          <router-link :to="{ name: 'account-center' }">-->
-<!--            <a-icon type="user"/>-->
-<!--            <span>个人中心</span>-->
-<!--          </router-link>-->
-<!--        </a-menu-item>-->
-<!--        <a-menu-item key="1">-->
-<!--          <router-link :to="{ name: 'account-settings-base' }">-->
-<!--            <a-icon type="setting"/>-->
-<!--            <span>账户设置</span>-->
-<!--          </router-link>-->
-<!--        </a-menu-item>-->
+        <!--<a-menu-item key="0">
+          <router-link :to="{ name: 'account-center' }">
+            <a-icon type="user"/>
+            <span>个人中心</span>
+          </router-link>
+        </a-menu-item>
+        <a-menu-item key="1">
+          <router-link :to="{ name: 'account-settings-base' }">
+            <a-icon type="setting"/>
+            <span>账户设置</span>
+          </router-link>
+        </a-menu-item>-->
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>
diff --git a/src/views/jobManage/Toolbox.vue b/src/views/jobManage/Toolbox.vue
index 70a0e2357b105378887c9f2934b7cc7e17c76158..d4b291f5422a62ba2e63bdfc7f4b4429cf56c734 100644
--- a/src/views/jobManage/Toolbox.vue
+++ b/src/views/jobManage/Toolbox.vue
@@ -175,6 +175,8 @@ export default {
         _this.applyLoading = false
         postAction(_this.url.add, parameter).then(res => {
           if (res.success) {
+            _this.operator = res.result.operator
+            _this.jobManageList[_this.index].operator = res.result.operator
             _this.$set(_this.jobManageList[_this.index], 'status', '1')
             _this.$message.success(_this.cabinetName + '中的' + _this.cabinetName + '已借出')
             document.getElementById(_this.cupboardDoor).style.backgroundColor = '#FF0000'