田源
2023-12-19 b8b04115d5ac7bc9bc2ce17c0e60f67a11c2ffac
Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -8,7 +8,7 @@
             status-icon
    >
      <el-form-item prop="selectInput">
        <el-select v-model="loginForm.value" placeholder="请选择租户" style="width: 326px" @change="selectchange">
        <el-select v-model="loginForm.tenantId" placeholder="请选择租户" style="width: 100%" @change="selectChange">
          <i slot="prefix" class="el-icon-s-operation"/>
          <el-option
            v-for="(item,index) in loginForm.region"
@@ -48,25 +48,25 @@
      </el-form-item>
      <!--密码修改弹出框-->
    </el-form>
    <el-dialog title="修改密码" :visible.sync="dialogFormVisible" append-to-body @closed="closehandle" :close-on-press-escape="false" >
      <el-form :model="form"  :rules="rules">
        <el-form-item label="原密码" :label-width="formLabelWidth" prop="oldPassword">
    <el-dialog :close-on-press-escape="false" :visible.sync="dialogFormVisible" append-to-body title="修改密码"
               @closed="closehandle">
      <el-form :model="form" :rules="rules">
        <el-form-item :label-width="formLabelWidth" label="原密码" prop="oldPassword">
          <el-input v-model="form.oldPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="新密码" :label-width="formLabelWidth" prop="newPassword">
        <el-form-item :label-width="formLabelWidth" label="新密码" prop="newPassword">
          <el-input v-model="form.newPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="确认密码" :label-width="formLabelWidth" prop="newPassword1">
        <el-form-item :label-width="formLabelWidth" label="确认密码" prop="newPassword1">
          <el-input v-model="form.newPassword1" autocomplete="off"></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="delok">取 消</el-button>
        <el-button type="primary" @click="addok">确 定</el-button>
        <el-button type="primary" @click="addHandler">确 定</el-button>
      </div>
    </el-dialog>
  </div>
</template>
@@ -77,40 +77,49 @@
import {updatePassword} from "@/api/system/user.js"
import {removeToken} from "@/util/auth";
import md5 from "js-md5";
export default {
  name: "userlogin",
  data() {
    return {
      tenantMode: this.website.tenantMode,
      ButtonList: [],
      dialogFormVisible:false,
      dialogFormVisible: false,
      form: {
        oldPassword: '',
        newPassword: '',
        newPassword1: '',
      },
      loginRules: {
        username: [
          {required: true, message: '请输入账号', trigger: 'blur'}
        ],
        password: [
          {required: true, message: '请输入密码', trigger: 'blur'}
        ],
      },
      rules: {
        oldPassword: [
          { required: true, message: '请输入原密码', trigger: 'blur' }
          {required: true, message: '请输入原密码', trigger: 'blur'}
        ],
        newPassword:[
          { required: true, message: '请输入新密码', trigger: 'blur' }
        newPassword: [
          {required: true, message: '请输入新密码', trigger: 'blur'}
        ],
        newPassword1:[
          { required: true, message: '请输确认密码', trigger: 'blur' }
        newPassword1: [
          {required: true, message: '请输确认密码', trigger: 'blur'}
        ]
      },
      loginForm: {
        //租户ID
        tenantId: "000000",
        tenantId: "",
        //部门ID
        deptId: "",
        //角色ID
        roleId: "",
        //用户名
        username: "admin",
        username: "",
        //密码
        password: "admin",
        password: "",
        selectInput: '',
        //下拉input数据
        value: '管理组',
@@ -148,14 +157,118 @@
  created() {
    this.getTenant();
    //这里是浏览器的一个bug,突然出现的目前找不到原因,新的浏览器打开此项目。localStorage会少存储一个名为saber-permission的数据,少了这条数据租户管理界面会缺少几个按钮和样式
    //还有一种情况,当我们手动删除这条数据或者清空localStorage后,再刷新进入页面它也不存储这个变量,所以我就在这写死了存储,目前效果没有问题
    localStorage.setItem("saber-permission",JSON.stringify({"dataType":"object","content":{"flow_model_create":true,"flow_model_update":true,"flow_model_deploy":true,"flow_model_download":true,"flow_model_delete":true,"work_start_flow":true,"work_start_image":true,"oss_add":true,"oss_edit":true,"oss_delete":true,"oss_view":true,"oss_enable":true,"role_add":true,"role_edit":true,"role_delete":true,"role_view":true,"notice_add":true,"notice_edit":true,"notice_delete":true,"notice_view":true,"user_add":true,"user_edit":true,"user_delete":true,"user_role":true,"user_reset":true,"user_view":true,"log_usual_view":true,"code_add":true,"code_edit":true,"code_delete":true,"code_view":true,"region_add":true,"region_delete":true,"region_import":true,"region_export":true,"region_debug":true,"work_claim_sign":true,"work_claim_detail":true,"work_claim_follow":true,"work_todo_handle":true,"work_todo_detail":true,"work_todo_follow":true,"data_scope_setting":true,"datasource_add":true,"datasource_edit":true,"datasource_delete":true,"datasource_view":true,"attach_upload":true,"attach_download":true,"attach_delete":true,"dept_add":true,"dept_edit":true,"dept_delete":true,"dept_view":true,"log_api_view":true,"flow_manager_state":true,"flow_manager_image":true,"flow_manager_remove":true,"work_send_detail":true,"work_send_follow":true,"sms_add":true,"sms_edit":true,"sms_delete":true,"sms_view":true,"sms_enable":true,"api_scope_setting":true,"log_error_view":true,"post_add":true,"post_edit":true,"post_delete":true,"post_view":true,"flow_follow_delete":true,"work_done_detail":true,"work_done_follow":true,"dict_add":true,"dict_edit":true,"dict_delete":true,"dict_view":true,"dictbiz_add":true,"dictbiz_edit":true,"dictbiz_delete":true,"dictbiz_view":true,"menu_add":true,"menu_edit":true,"menu_delete":true,"menu_view":true,"topmenu_add":true,"topmenu_edit":true,"topmenu_delete":true,"topmenu_view":true,"topmenu_setting":true,"param_add":true,"param_edit":true,"param_delete":true,"param_view":true,"tenant_add":true,"tenant_edit":true,"tenant_delete":true,"tenant_view":true,"client_add":true,"client_edit":true,"client_delete":true,"client_view":true},"datetime":1678352291697}))
    // localStorage.setItem("saber-permission", JSON.stringify({
    //   "dataType": "object", "content": {
    //     "flow_model_create": true,
    //     "flow_model_update": true,
    //     "flow_model_deploy": true,
    //     "flow_model_download": true,
    //     "flow_model_delete": true,
    //     "work_start_flow": true,
    //     "work_start_image": true,
    //     "oss_add": true,
    //     "oss_edit": true,
    //     "oss_delete": true,
    //     "oss_view": true,
    //     "oss_enable": true,
    //     "role_add": true,
    //     "role_edit": true,
    //     "role_delete": true,
    //     "role_view": true,
    //     "notice_add": true,
    //     "notice_edit": true,
    //     "notice_delete": true,
    //     "notice_view": true,
    //     "user_add": true,
    //     "user_edit": true,
    //     "user_delete": true,
    //     "user_role": true,
    //     "user_reset": true,
    //     "user_view": true,
    //     "log_usual_view": true,
    //     "code_add": true,
    //     "code_edit": true,
    //     "code_delete": true,
    //     "code_view": true,
    //     "region_add": true,
    //     "region_delete": true,
    //     "region_import": true,
    //     "region_export": true,
    //     "region_debug": true,
    //     "work_claim_sign": true,
    //     "work_claim_detail": true,
    //     "work_claim_follow": true,
    //     "work_todo_handle": true,
    //     "work_todo_detail": true,
    //     "work_todo_follow": true,
    //     "data_scope_setting": true,
    //     "datasource_add": true,
    //     "datasource_edit": true,
    //     "datasource_delete": true,
    //     "datasource_view": true,
    //     "attach_upload": true,
    //     "attach_download": true,
    //     "attach_delete": true,
    //     "dept_add": true,
    //     "dept_edit": true,
    //     "dept_delete": true,
    //     "dept_view": true,
    //     "log_api_view": true,
    //     "flow_manager_state": true,
    //     "flow_manager_image": true,
    //     "flow_manager_remove": true,
    //     "work_send_detail": true,
    //     "work_send_follow": true,
    //     "sms_add": true,
    //     "sms_edit": true,
    //     "sms_delete": true,
    //     "sms_view": true,
    //     "sms_enable": true,
    //     "api_scope_setting": true,
    //     "log_error_view": true,
    //     "post_add": true,
    //     "post_edit": true,
    //     "post_delete": true,
    //     "post_view": true,
    //     "flow_follow_delete": true,
    //     "work_done_detail": true,
    //     "work_done_follow": true,
    //     "dict_add": true,
    //     "dict_edit": true,
    //     "dict_delete": true,
    //     "dict_view": true,
    //     "dictbiz_add": true,
    //     "dictbiz_edit": true,
    //     "dictbiz_delete": true,
    //     "dictbiz_view": true,
    //     "menu_add": true,
    //     "menu_edit": true,
    //     "menu_delete": true,
    //     "menu_view": true,
    //     "topmenu_add": true,
    //     "topmenu_edit": true,
    //     "topmenu_delete": true,
    //     "topmenu_view": true,
    //     "topmenu_setting": true,
    //     "param_add": true,
    //     "param_edit": true,
    //     "param_delete": true,
    //     "param_view": true,
    //     "tenant_add": true,
    //     "tenant_edit": true,
    //     "tenant_delete": true,
    //     "tenant_view": true,
    //     "client_add": true,
    //     "client_edit": true,
    //     "client_delete": true,
    //     "client_view": true
    //   }, "datetime": 1678352291697
    // }))
  },
  mounted() {
    //在mounted获取首页下拉菜单数据
    this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
      if (res.data.code == 200) {
        console.log(res.data.data);
        this.loginForm.tenantId = res.data.data[0].TENANT_ID;
        this.loginForm.region = res.data.data
      }
    })
@@ -185,31 +298,34 @@
  },
  props: [],
  methods: {
    // 这个其实跟下面delok一个效果,怕不实现写了两次,
    closehandle(){
    //单点登录跳转
    ChandleLogin() {
      this.$router.push({path: '/sso'});
    },
    closehandle() {
      removeToken()
    },
    delok(){
      //点击取消或者x 清除token关闭弹窗 清除token后会自动重新获取用户信息 这里没有重新调用方法,因为下面逻辑有点绕,怕重新掉有bug直接清除token重新获取用户信息
    delok() {
      //点击取消或者x 清除token关闭弹窗 清除token后会自动重新获取用户信息
      this.dialogFormVisible = false;
      removeToken()
    },
    // 点击确定修改密码
    addok(){
    addHandler() {
      this.dialogFormVisible = false
      updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res=>{
      updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
        console.log(res)
        if(res.data.code==200){
        if (res.data.code == 200) {
          this.$message({
            type:"success",
            message:"修改成功!"
            type: "success",
            message: "修改成功!"
          })
          this.$router.push({path: this.tagWel.value})
        }
      })
    },
    // 绑定下拉菜单动态ID
    selectchange(value) {
    selectChange(value) {
      this.loginForm.tenantId = value
    },
    showPassword() {
@@ -230,7 +346,7 @@
    },
    handleLogin: function () {
      this.userInfo = this.$store.state.upadatastatus
      localStorage.setItem('username',this.loginForm.username)
      localStorage.setItem('username', this.loginForm.username)
      this.$refs.loginForm.validate(valid => {
        if (valid) {
          const loading = this.$loading({
@@ -241,38 +357,37 @@
          this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
            //上面又加了一层判断的意思是如果是超管不进行判断 暂时加上这个判断的话,登录会有bug,点击登录刷新后才进入,先简单在下面判断是否为空,只有超管的strategyUpdateStatus为空
            // if(this.userInfo.user_id != '0' && this.userInfo.tenant_id !== '000000'){
              //判断如果不等于0就是策略密码没有修改走下面逻辑
              if (this.userInfo.strategyUpdateStatus == 0 || this.userInfo.strategyUpdateStatus==null) {
                if (this.website.switchMode) {
                  const deptId = this.userInfo.dept_id;
                  const roleId = this.userInfo.role_id;
                  if (deptId.includes(",") || roleId.includes(",")) {
                    this.loginForm.deptId = deptId;
                    this.loginForm.roleId = roleId;
                    this.userBox = true;
                    this.$store.dispatch("LogOut").then(() => {
                      loading.close();
                    });
                  }
            //判断如果不等于0就是策略密码没有修改走下面逻辑
            if (this.userInfo.strategyUpdateStatus == 0 || this.userInfo.strategyUpdateStatus == null) {
              if (this.website.switchMode) {
                const deptId = this.userInfo.dept_id;
                const roleId = this.userInfo.role_id;
                if (deptId.includes(",") || roleId.includes(",")) {
                  this.loginForm.deptId = deptId;
                  this.loginForm.roleId = roleId;
                  this.userBox = true;
                  this.$store.dispatch("LogOut").then(() => {
                    loading.close();
                  });
                }
                this.$router.push({path: this.tagWel.value});
              } else {
                //等于0说明密码策略被修改,提示用户修改密码,给一个修改弹框
                this.$message({
                  type: "warning",
                  message: "密码策略已被修改,请重新修改密码!"
                })
                // 1.5秒后执行 弹出框显示
                setTimeout(()=>{
                  this.dialogFormVisible=true
                },1500)
              }
              this.$router.push({path: this.tagWel.value});
            } else {
              //等于0说明密码策略被修改,提示用户修改密码,给一个修改弹框
              this.$message({
                type: "warning",
                message: "密码策略已被修改,请重新修改密码!"
              })
              setTimeout(() => {
                this.dialogFormVisible = true
              }, 1500)
            }
            // }
            //把判断密码策略修改的值存进本地,然后再路由权限js文件里面获取再做判断,不然刷新会进入首页(因为在有id和token的情况下,刷新页面或者进入登录页会自动进入首页)
            //index页面也可以用到这个值来判断是否是超管身份登录来判断是否提醒过期时间等
            localStorage.setItem("updataid",JSON.stringify(this.userInfo))
            localStorage.setItem("userId",this.userInfo.user_id)
            localStorage.setItem("updataid", JSON.stringify(this.userInfo))
            localStorage.setItem("userId", this.userInfo.user_id)
            loading.close();
          }).catch(() => {
            loading.close();