Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-23 ba2a88b235360c8bea43f1c3adc90df84f437576

 web_standard/src/components/common/Header.vue

@@ -8,13 +8,18 @@
          {{title}}
        </h2>
        <div class="user">
          <div class="user_help" @click="jumpWord">
            <img src="@/assets/images/ic_help@2x.png" alt="" />
            <span>帮助文档</span>
          <div class="help" @click="jumpWord">
            <div class="user_help">
              <img src="@/assets/images/ic_help@2x.png" alt="" />
              <span>帮助文档</span>
            </div>
            <span class="ml5 mr5">|</span>
            <span>企业代码： {{ tempId }}</span>
          </div>
          <!-- <div style="margin-right: 10px;">企业代码： {{ tempId }}</div> -->
          <el-dropdown trigger="click" style="margin-right: 20px;" v-userState @command="select">
            <span class="el-dropdown-link">
              {{ tempC }}<i class="el-icon-arrow-down el-icon--right"></i>
            <span class="c2 f16">{{ tempC }}</span><i class="el-icon-arrow-down el-icon--right"></i>
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item v-for="(item, index) in cList" :key="index" :command='item.id'>{{ item.name }}</el-dropdown-item>
@@ -73,6 +78,7 @@
  data () {
    return {
      tempC: '',
      tempId: '',
      cList: '',
      visible: {
        // 修改密码
@@ -127,7 +133,10 @@
    }
  },
  created () {
    this.tempC = this.userInfo.curComDepartment ? this.userInfo.curComDepartment.name : ''
    if (this.userInfo.curComDepartment) {
      this.tempC = this.userInfo.curComDepartment.name
      this.tempId = this.userInfo.company.id
    }
    getDepartmentListByConditon({
      type: 0
    })
@@ -271,30 +280,41 @@
      // width: 30%;
      flex-shrink: 0;
      // text-align: right;
      vertical-align: middle;
      display: flex;
      align-items: center;
      .user_help {
        width: 111px;
        height: 36px;
      .help {
        display: flex;
        height: 29px;
        line-height: 38px;
        align-items: center;
        justify-content: center;
        background: #F7F7F7;
        border-radius: 4px;
        vertical-align: middle;
        margin-right: 30px;
        cursor: pointer;
        img {
          width: 16px;
          height: 16px;
          margin-right: 7px !important;
        }
        span {
          font-size: 16px;
          font-size: 12px;
          font-family: PingFangSC-Regular, PingFang SC;
          font-weight: 400;
          vertical-align: middle;
          color: #666666;
        }
        .user_help {
          // width: 111px;
          
          // background: #F7F7F7;
         
          
          cursor: pointer;
          img {
            width: 16px;
            height: 16px;
            margin-right: 7px !important;
            vertical-align: middle;
          }
          
        }
      }
      
      .el-dropdown {
        flex-shrink: 0;
        top: 2px;