Merge remote-tracking branch 'origin/dev' into dev

src/views/system/user/index.vue

@@ -374,6 +374,7 @@ import {
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {forceLogout, list} from "@/api/monitor/online";
 
 export default {
   name: "User",
@@ -381,6 +382,12 @@ export default {
   components: {Treeselect},
   data() {
     return {
+
+      paramsss:{
+        addr:undefined,
+        userName:undefined
+      },
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -624,6 +631,19 @@ export default {
       }).then(({value}) => {
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          //使用list查询用户列表 传参
+          list(this.paramsss).then(res=>{
+             //定义一个集合
+             const userList =res.data.rows
+            //循环遍历拿到每一个
+             userList.forEach(userInfo=>{
+               //判断每一个密码是否正确
+               if (userInfo.userName==row.userName){
+                 //调用强制退出的方法
+                forceLogout(userInfo.tokenId);
+              }
+             })
+           })
         });
       }).catch(() => {
       });