ll

liukangdong

2024-10-18 9c491f119144c9bc536c1cf39307ad82be96b85b

 admin/src/components/common/CommonHeader.vue

@@ -8,10 +8,10 @@
            <div>服务中心</div>
            <div class="linellae"></div>
          </div>
          <div class="item">安防中心</div>
          <div class="item">消防中心</div>
          <div class="item">能管中心</div>
          <div class="item">驾驶舱</div>
          <div class="item" @click="getHeaderNav('0')">安防中心</div>
          <div class="item" @click="getHeaderNav('1')">消控中心</div>
          <div class="item" @click="getHeaderNav('2')">能管中心</div>
          <div class="item" @click="getHeaderNav('3')">驾驶舱</div>
        </div>
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
@@ -19,61 +19,35 @@
        <el-dropdown v-if="isLogined" trigger="click">
          <span class="el-dropdown-link">
            <!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
            <img
              v-if="userInfo != null"
              style="width: 30px !important"
              src="@/assets/avatar/man.png"
              alt=""
            />{{ userInfo | displayName
            <img v-if="userInfo != null" style="width: 30px !important" src="@/assets/avatar/man.png" alt="" />{{
              userInfo | displayName
            }}<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item @click.native="changePwd"
              >修改密码</el-dropdown-item
            >
            <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
            <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
      </div>
    </div>
    <!-- 修改密码 -->
    <GlobalAlertWindow
      title="修改密码"
      :visible.sync="visible.changePwd"
      @confirm="confirmChangePwd"
      @close="visible.changePwd = false"
    >
      <el-form
        :model="changePwdData.form"
        ref="changePwdDataForm"
        :rules="changePwdData.rules"
      >
    <GlobalAlertWindow title="修改密码" :visible.sync="visible.changePwd"
      :showClose="!userInfo.needChangePwd || userInfo.needChangePwd == '1'"
      :showCancel="!userInfo.needChangePwd || userInfo.needChangePwd == '1'" @confirm="confirmChangePwd"
      @close="visible.changePwd = false">
      <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
        <el-form-item label="原始密码" prop="oldPwd" required>
          <el-input
            v-model="changePwdData.form.oldPwd"
            type="password"
            placeholder="请输入原始密码"
            maxlength="30"
            show-password
          ></el-input>
          <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="请输入原始密码" maxlength="30"
            show-password></el-input>
        </el-form-item>
        <el-form-item label="新密码" prop="newPwd" required>
          <el-input
            v-model="changePwdData.form.newPwd"
            type="password"
            placeholder="请输入新密码"
            maxlength="30"
            show-password
          ></el-input>
          <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="请输入新密码，密码需包含字母、数字及特殊字符中的至少两种" maxlength="20"
            show-password></el-input>
        </el-form-item>
        <!-- <div style="font-size: 12px;color:#999999">密码需包含字母、数字及特殊字符中的至少两种</div> -->
        <el-form-item label="确认新密码" prop="confirmPwd" required>
          <el-input
            v-model="changePwdData.form.confirmPwd"
            type="password"
            placeholder="请再次输入新密码"
            maxlength="30"
            show-password
          ></el-input>
          <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="请再次输入新密码" maxlength="20"
            show-password></el-input>
        </el-form-item>
      </el-form>
    </GlobalAlertWindow>
@@ -84,6 +58,7 @@
import { mapState, mapMutations } from 'vuex'
import GlobalAlertWindow from './GlobalAlertWindow'
import { logout, updatePwd } from '@/api/system/common'
import { getAppHeaderNav } from '@/api'
export default {
  name: 'CommonHeader',
  components: { GlobalAlertWindow },
@@ -96,6 +71,7 @@
  data() {
    return {
      title: process.env.VUE_APP_TITLE,
      headerNavData: {},
      visible: {
        // 修改密码
        changePwd: false
@@ -117,7 +93,8 @@
            { required: true, message: '请输入原始密码' }
          ],
          newPwd: [
            { required: true, message: '请输入新密码' }
            { required: true, message: '请输入密码', trigger: 'blur' },
            { validator: this.validatePassword, trigger: 'blur' },
          ],
          confirmPwd: [
            { required: true, message: '请再次输入新密码' }
@@ -131,6 +108,13 @@
    // title () {
    //   return this.$route.meta.title
    // }
  },
  mounted() {
    // console.log('userInfo',this.userInfo);
    if (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0') {
      // this.visible.changePwd = true
    }

  },
  filters: {
    // 展示名称
@@ -151,6 +135,31 @@
      this.visible.changePwd = true
      this.$nextTick(() => {
        this.$refs.changePwdDataForm.resetFields()
      })
    },
    validatePassword(rule, value, callback) {
      if (!value) {
        callback(new Error('请输入密码'))
      } else {
        const lengthValid = /^.{6,20}$/.test(value)
        const hasLetter = /[a-zA-Z]/.test(value)
        const hasNumber = /[0-9]/.test(value)
        const hasSpecial = /[!@#$%^&*(),.?":{}|<>]/.test(value)

        const typesCount = [hasLetter, hasNumber, hasSpecial].filter(Boolean).length

        if (!lengthValid) {
          callback(new Error('密码长度需为6到20个字符'))
        } else if (typesCount < 2) {
          callback(new Error('密码需包含字母、数字及特殊字符中的至少两种'))
        } else {
          callback() // 验证通过
        }
      }
    },
    getHeaderNav(type) {
      getAppHeaderNav(type).then(res => {
        window.open(res, "_blank")
      })
    },
    // 确定修改密码
@@ -178,7 +187,7 @@
            this.visible.changePwd = false
          })
          .catch(e => {
           //  this.$tip.apiFailed(e)
            //  this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking.changePwd = false
@@ -204,15 +213,18 @@

<style scoped lang="scss">
@import "@/assets/style/variables.scss";

.common-header {
  background-color: #2080f7;
}
.list{

.list {
  flex: 1;
  display: flex;
  align-items: center;
  margin-left: 60px;
  .item{

  .item {
    margin-right: 40px;
    font-size: 16px;
    font-weight: 400;
@@ -222,16 +234,19 @@
    justify-content: flex-start;
    height: 40px;
    cursor: pointer;
    .linellae{

    .linellae {
      width: 64px;
      height: 2px;
      background: #FFFFFF;
    }
  }
  .active{

  .active {
    font-weight: 500;
  }
}

.header {
  overflow: hidden;
  // background: #fff;
@@ -252,9 +267,11 @@
    color: #fff;
    display: flex;
    align-items: center;
    .title{

    .title {
      width: 200px;
    }

    // display: inline;
    .title-en {
      font-size: 11px;
@@ -262,6 +279,7 @@
      color: rgb(202, 214, 238);
    }
  }

  .user {
    width: 212px;
    box-sizing: border-box;
@@ -270,10 +288,13 @@
    background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;
    flex-shrink: 0;
    text-align: right;
    cursor: pointer;

    .el-dropdown {
      top: 2px;
      color: #fff;
    }

    img {
      width: 32px;
      position: relative;
@@ -282,9 +303,11 @@
    }
  }
}

// 下拉菜单框
.el-dropdown-menu {
  width: 140px;

  .el-dropdown-menu__item:hover {
    background: #e3edfb;
    color: $primary-color;