Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/page/index/logo.vue

@@ -2,22 +2,22 @@
  <div class="avue-logo">
    <transition-group name="fade">
      <template v-if="!keyCollapse">
        <!--<span
          key="1"
        <span
          key="1" style="background-color:#875a7b;font-weight: bold;"
          class="avue-logo_title" @click="goIndex"><span
          class="logo-lg">{{sysTitle&&sysTitle!='null'?sysTitle:'ASUN-MES'}}</span></span>-->
          class="logo-lg">{{sysTitle&&sysTitle!='null'?sysTitle:'MES'}}</span></span>
        <!--<span key="1" class="avue-logo_title" @click="goIndex">
          <el-image
            style="width: 220px;"
            src="/images/Sun-Mes-Logo-Normal.png"
        /></span>-->
        <div key="1" style="width:220px;height:60px;background-color:white;position: relative;">
          <el-image
        <div key="2" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
          <!-- <el-image
            v-if="logSrc != null"
            style="width:200px;position: absolute;"
            class="left-logo-image"
            :src="logSrc"
          />
          /> -->
          <!--<el-image
            v-else
            style="width: 220px;position: absolute;"
@@ -60,7 +60,7 @@
  name: 'Logo',
  data() {
    return {
      sysTitle: 'ASUN-MES',
      sysTitle: 'MES',
      logSrc: '/img/logo1.png',
      iconNameCn: '',
      iconNameEn: ''
@@ -71,7 +71,6 @@
  },
  created() {
    this.sysTitle = localStorage.getItem('SYSTEM_LOGO_TITLE')
    console.log('userInfouserInfo', this.userInfo)
    // this.getLogoInfo()
  },
  methods: {
@@ -81,7 +80,6 @@
      this.iconNameEn = null
      getByStaffId(this.userInfo.staffId).then((response) => {
        const resData = response.data.data
        console.log('resData', resData)
        if (resData != null) {
          this.logSrc = resData.fileAddress
          this.iconNameCn = resData.iconNameCn
@@ -120,7 +118,7 @@
  width: 220px;
  height: 64px;
  line-height: 64px;
  background-color: #006eff;
  background-color: #875a7b;
  font-size: 20px;
  overflow: hidden;
  box-sizing: border-box;
@@ -151,7 +149,7 @@
    width: 220px;
    height: 64px;
    line-height: 64px;
    background-color: #006eff;
    background-color: #875a7b;
    font-size: 20px;
    overflow: hidden;
    box-sizing: border-box;