Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-09-03 3744ee1fd763d7414a38f515ba13224866b924aa

 UI-Project/src/layout/MainErpView.vue

@@ -187,10 +187,11 @@
                <SwitchButton size=""/>{{ $t('main.quit') }}
              </el-icon>
            </el-button>
            <!-- <div class="header-left">
            <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse"
              style="height:30px;"></el-button>
          </div> -->
            <div class="header-left">
              <el-button @click="toggleCollapse" style="height: 30px;">  
               <el-icon><Expand /></el-icon>
              </el-button>  
          </div>
          </span>
        </div>
      </el-header>
@@ -451,6 +452,6 @@
  }
}
.header-left{
  margin-left: -200px;
  margin-left: -350px;
}
</style>