Merge branch 'zhengwenfeng/modify-style' into dev

yangfeng

2023-11-07 751fb4763e34e6395a543cb5ae30c6300949c45b

Merge branch 'zhengwenfeng/modify-style' into dev

 src/components/layout/components/appHeader/index.vue

@@ -4,7 +4,7 @@
   <div class="header-user-info">
     <div class="avatar"><el-avatar icon="el-icon-user-solid"></el-avatar></div>
     <el-dropdown @command="handleCommand">
       <div class="el-dropdown-link">用户名<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></div>
        <div class="el-dropdown-link">{{ username }}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></div>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="logout">退出</el-dropdown-item>
       </el-dropdown-menu>
@@ -21,17 +21,22 @@
    headerTitle: String
  },
  data() {
    return {}
    return {
      username: ""
    }
  },
  mounted() {
    this.username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
  },
  methods: {
    environmentType(){
      let type
      if (location.href.includes('192.168.20.119')) {
          type = 'test'
      } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
          type = 'dev'
      if (location.href.includes("192.168.20.119")) {
        type = "test"
      } else if (location.href.includes("192.168") || location.href.includes("localhost")) {
        type = "dev"
      } else {
          type = 'prod'
        type = "prod"
      }

      return type
@@ -50,25 +55,27 @@
      console.log(command)
      if (command === "logout") {
        // this.$router.push({ path: "/login" })
        document.cookie = "cookieName=; path=/;";
        this.$confirm('确定要注销当前用户吗?', '注销用户', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          Cookies.remove('token')
        document.cookie = "cookieName=; path=/;"
        this.$confirm("确定要注销当前用户吗?", "注销用户", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            Cookies.remove("token")
          // window.location.href = 'http://localhost:8080/login'; //本地的智慧工厂-登录页
          window.location.href = 'http:'+this.getApsPage()+'/login'; 
            window.location.href = "http:" + this.getApsPage() + "/login"
          this.$message({
            type: 'success',
            message: '注销成功!'
          });
        }).catch(() => {
              type: "success",
              message: "注销成功!"
            })
          })
          .catch(() => {
          this.$message({
            type: 'info',
            message: '已取消注销'
          });          
        });
              type: "info",
              message: "已取消注销"
            })
          })
      }
    }
  }