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

src/style/index.less

@@ -185,17 +185,20 @@ html {
 
   /* 气象信息文本--小文本 */
 .div-contain-text-small {
-  font-size: 8pt;
+  font-size: 14px;
+  width: 100px;
   // text-align:center;
   vertical-align: top;
-  width: 100px;
+  
+  //width: 100px;
 }
 
 
 
 /* 气象信息文本--大文本 */
 .div-contain-text-big {
-  font-size: 14px;
+  font-size: 20px;
+  font-weight: bold;
 }
   
 .ams-header .user {

src/views/home.vue

@@ -35,15 +35,15 @@
                     </el-dropdown>
                 </div>
                 <div class="header-weather" id="">
-                    <el-row style="left: 37%;widows: 60px;width: 63%;">
+                    <el-row style="left: 35%;widows: 60px;width: 65%;">
                         <el-col :span="4" style="">
 
                             <div class="div-contain-titleAndText">
                                 <el-image style="padding-top:20px ;width: 30px;height: 30px;margin-right: 3px;" src="/imgs/home/wendu.png"
                                     :fit="'fill'" />
                                 <div>
-                                    <div class="div-contain-title"> 温度 ℃</div>
-                                    <div class="div-contain-text-big">{{ showWeatherData.weatherData.temperature }}
+                                    <div class="div-contain-title"> 室外温度</div>
+                                    <div class="div-contain-text-big">{{ showWeatherData.weatherData.temperature +'℃'}}
                                     </div>
                                 </div>
                             </div>
@@ -85,7 +85,7 @@
                                 <el-image style="padding-top:20px ;width: 30px;height: 30px;margin-right: 3px;" src="/imgs/home/time.png"
                                     :fit="'scale-down'" />
                                 <div>
-                                    <div class="div-contain-title" style="width: 100px;">气象时间</div>
+                                    <div class="div-contain-title" style="">气象时间</div>
                                     <div class="div-contain-text-small" style="line-height: 15px;">{{
             showWeatherData.weatherData.gatherTime
         }}</div>