diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 31e3900..295f33f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -137,7 +137,7 @@
           align: 'center'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },

diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 31e3900..295f33f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -137,7 +137,7 @@
           align: 'center'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index 1246fae..335e974 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -432,7 +432,8 @@
       } else {
         // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改
         // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送
-        const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username
         // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username
         console.log(socketUrl)
         this.socket = new WebSocket(socketUrl)

diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 31e3900..295f33f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -137,7 +137,7 @@
           align: 'center'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index 1246fae..335e974 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -432,7 +432,8 @@
       } else {
         // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改
         // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送
-        const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username
         // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username
         console.log(socketUrl)
         this.socket = new WebSocket(socketUrl)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 73b12af..49a0eca 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -363,7 +363,6 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)

diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 31e3900..295f33f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -137,7 +137,7 @@
           align: 'center'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index 1246fae..335e974 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -432,7 +432,8 @@
       } else {
         // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改
         // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送
-        const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username
+        const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username
         // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username
         console.log(socketUrl)
         this.socket = new WebSocket(socketUrl)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 73b12af..49a0eca 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -363,7 +363,6 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 99d95e8..e03e18c 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="dialogFormVisible" title="修改密码" width="350px" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-form-item label="原密码" prop="oldpassword">
-        <el-input v-model="userForm.oldPassword" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.oldpassword" type="password" placeholder="必填"/>
       </el-form-item>
       <el-form-item label="密码" prop="password">
-        <el-input v-model="userForm.password" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.password" type="password" placeholder="必填"/>
       </el-form-item>
       <el-form-item label="重复密码" prop="repassword">
-        <el-input v-model="userForm.repassword" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.repassword" type="password" placeholder="必填"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -27,6 +27,12 @@
   name: 'ResetPwd',
   components: { SelectTree },
   data() {
+    const validateOldPass = (rule, value, callback) => {
+      console.log('验证旧密码')
+      if (value === '') {
+        callback(new Error('旧密码不能为空'))
+      }
+    }
     const validatePass = (rule, value, callback) => {
       console.log('验证密码')
       if (value === '') {
@@ -62,12 +68,12 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       userForm: {
-        oldPassword: '', // 原密码
+        oldpassword: '', // 原密码
         password: '', // 密码
         repassword: '' // 重复密码
       }, // 表单
       rules: {
-        oldpassword: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
+        oldpassword: [{ required: true, validator: validateOldPass, trigger: ['blur', 'change'] }],
         password: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
         repassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }]
       } // 前端校验规则
@@ -85,7 +91,7 @@
     // 重置表单
     resetForm() {
       this.userForm = {
-        oldPassword: '',
+        oldpassword: '',
         password: '', // 密码
         repassword: '' // 重复密码
       }
@@ -94,7 +100,7 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         const userForm = {
-          oldPwd: this.userForm.oldPassword,
+          oldPwd: this.userForm.oldpassword,
           newPwd: this.userForm.password
         }
         userForm.oldPwd = RSAencrypt(userForm.oldPwd)