Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

src/style/index.less

@@ -140,6 +140,7 @@ html {
   }
   
   .enterprise-name {
+    width: 23%;
     line-height: 60px;
     padding: 0 20px 0 20px;
     color: #fff;

src/views/home.vue

@@ -2,7 +2,7 @@
     <div id="ams-container" >
         <div class="ams-aside" :style="{ width: menuWidth + 'px'}">
             <div class="header" :style="{ width: menuWidth - 1 + 'px'}">
-                <img style="margin-top:5px;height:50px; width: 150px;" v-show="!$store.state.iscollapse" v-bind:src="amslogo" />
+                <img :style="{height:amslogo_style.height+'px',width: amslogo_style.width+'px'}" v-show="!$store.state.iscollapse" v-bind:src="amslogo" />
                 <i @click="toggleLeft" class="collapse-menu" :style="{width:38+ 'px'}">
                     <el-icon v-if="!$store.state.iscollapse" size="20" style="vertical-align: middle"><Fold /></el-icon>
                     <el-icon v-if="$store.state.iscollapse" size="20" style="vertical-align: middle"><Expand /></el-icon>
@@ -15,7 +15,7 @@
         <div class="ams-container" :style="{ left: menuWidth-2 + 'px' }">
             <div class="ams-header">
                 <div class="enterprise-name">
-                    <el-dropdown size="'large'" style="margin-left: 10px;margin-top: 5px;color:blue;"
+                    <el-dropdown size="'large'" style="margin-left: 10px;margin-top: 5px;color:blue; width: 100%;"
                             @command="handleCommand" :trigger="(roleId > 2) ? 'contextmenu' : 'hover'">
                         <span class="el-dropdown-link">
                             <el-image style=" height: 60px " :src="currLogoUrl" :fit="'full'" />
@@ -30,7 +30,7 @@
                     </el-dropdown>
                 </div>
                 <div class="header-weather" id="mt">
-                    <el-row style="left: 20px;widows: 60px;" >
+                    <el-row style="left: 2.5%;widows: 60px;" >
                         <el-col :span="4">
                             <div>温度 ℃
                                 <div class="div-contain-text-big">{{ showWeatherData.weatherData.temperature }}</div>
@@ -237,14 +237,17 @@ export default defineComponent({
     const router = useRouter();
     let _config = getCurrentInstance()!.appContext.config.globalProperties;
 
-    var amslogo_url =new URL('/imgs/home/LOGO_ams_1.png',import.meta.url).href;
+    var amslogo_url =new URL('/imgs/home/LOGO_index.png',import.meta.url).href;
     const amslogo = ref(amslogo_url);
-    var currLogoUrl=new URL('../assets/imgs/home/LOGO_gangyi.png',import.meta.url).href;
+    var currLogoUrl=new URL('/imgs/home/PLATFORM.png',import.meta.url).href;
+    var amslogo_style=reactive({height:50,width:150});
 
     //控制左侧导航菜单的展开和隐藏
     const toggleLeft=()=>{
         store.commit('setAsideWidth');
         menuWidth.value =store.state.iscollapse ? 63 : 200;
+        amslogo_style.height=store.state.iscollapse ? 12 : 50;
+        amslogo_style.width=store.state.iscollapse ? 40 : 150;
         mainWidth.value = window.innerWidth-menuWidth.value;
         EventBus.emit('changeValue', mainWidth.value );
     }
@@ -490,6 +493,7 @@ export default defineComponent({
       visibleItem,
       currentMenuId,
       amslogo,
+      amslogo_style,
       addTab,
       //menuRoot,
       handleCommand,