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

src/components/art/AllBoilerArt.vue

@@ -9,7 +9,7 @@
 
       <div style="position: absolute;margin-top:0px;margin-left: 450px;">
         <h2 style="color: aliceblue;">1#锅炉</h2>
-      </div>
+      </div> 
       <!-- 炉膛 -->
       <div v-if="status_2.BoilerRun">
         <img style="position: absolute;width: 180px;margin-left: 1419px;margin-top: 239px;"

src/style/index.less

@@ -88,7 +88,12 @@ html {
     position: relative;
     display: flex;
     border-bottom: 1px solid #eee;
+    
+    a{
+      color: #ffffff;
+    }
   }
+
   
   .ams-main {
     border-left: 1px solid #0c0202;

src/views/home.vue

@@ -13,7 +13,7 @@
             </div>
         </div>
         <div class="ams-container" :style="{ left: menuWidth-2 + 'px' }">
-            <div class="ams-header">
+            <div class="ams-header" style="    background-color: #526bab;">
                 <div class="enterprise-name">
                     <el-dropdown size="'large'" style="margin-left: 10px;margin-top: 5px;color:blue; width: 100%;"
                             @command="handleCommand" :trigger="(roleId > 2) ? 'contextmenu' : 'hover'">
@@ -29,7 +29,7 @@
                         </template>
                     </el-dropdown>
                 </div>
-                <div class="header-weather" id="mt">
+                <div class="header-weather" id="">
                     <el-row style="left: 2.5%;widows: 60px;" >
                         <el-col :span="4">
                             <div>温度 ℃
@@ -240,6 +240,7 @@ export default defineComponent({
     var amslogo_url =new URL('/imgs/home/LOGO_index.png',import.meta.url).href;
     const amslogo = ref(amslogo_url);
     var currLogoUrl=new URL('/imgs/home/PLATFORM.png',import.meta.url).href;
+    //var backgroundImageUrl=new URL('/imgs/home/PLATFORM.png',import.meta.url).href;
     var amslogo_style=reactive({height:50,width:150});
 
     //控制左侧导航菜单的展开和隐藏

src/views/login/login.vue

@@ -2,7 +2,7 @@
     <div class="div-bg">
         <el-row class="row-contain" style="height:100%">
             <el-col :span="12">
-                <div class="div-logo"></div>
+                <!-- <div class="div-logo"></div> -->
             </el-col>
             <el-col :span="12" class="col-right">
                 <div class="div-login">
@@ -75,7 +75,7 @@
     /* flex:1; */
 }
 
-.div-logo {
+/* .div-logo {
     position: relative;
     left: 15%;
     top: 40%;
@@ -84,7 +84,7 @@
     background-size: contain;
     background-repeat: no-repeat;
     overflow: hidden;
-}
+} */
 
 .div-contain {
     position: relative;
@@ -148,7 +148,7 @@
 }
 
 .text {
-    color: white;
+    color: black;
     /* font-size: 10px; */
 }