Merge remote-tracking branch 'origin/master'

jiangping

2024-08-26 a1e663eeb588f419b1622ca07b23fb9d44292ee9

 admin/src/components/common/CommonHeader.vue

@@ -3,6 +3,13 @@
    <div class="header">
      <div class="logo">
        <div>{{ title }}</div>
        <div class="list">
          <div class="item">服务中心</div>
          <div class="item">安防中心</div>
          <div class="item">消防中心</div>
          <div class="item">能管中心</div>
          <div class="item">驾驶舱</div>
        </div>
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
      <div class="user">
@@ -168,7 +175,7 @@
            this.visible.changePwd = false
          })
          .catch(e => {
            this.$tip.apiFailed(e)
           //  this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking.changePwd = false
@@ -185,7 +192,7 @@
          window.location.reload()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
          // this.$tip.apiFailed(e)
        })
    }
  }
@@ -215,6 +222,8 @@
    font-size: 22px;
    font-weight: 600;
    color: #fff;
    display: flex;
    align-items: center;
    // display: inline;
    .title-en {
      font-size: 11px;