Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wu

2024-09-02 4c1bcfba73c00f44adc5b5b7f1275e24d5e6a901

 UI-Project/src/layout/MainErpView.vue

@@ -188,10 +188,9 @@
              </el-icon>
            </el-button>
            <div class="header-left">
              <el-button  @click="toggleCollapse"
              style="height:30px;">☰</el-button>
            <!-- <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse"
              style="height:30px;"></el-button> -->
              <el-button @click="toggleCollapse" style="height: 30px;">  
               <el-icon><Expand /></el-icon>
              </el-button>  
          </div>
          </span>
        </div>