Merge remote-tracking branch 'origin/sl' into wsy

src/components/arcgis/arcgis.vue

@@ -26,7 +26,7 @@
     import "@arcgis/core/assets/esri/themes/light/main.css";
 
     const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/nxmap/MapServer"; // ArcMap地址
-    // const mapUrl = "http://172.16.6.30:12345/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
+    // const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
     let basemap = null;
     let map = null;
     let view = null;

src/views/WindSite/pages/Home/wind-site-weather.vue

@@ -132,7 +132,6 @@ export default {
 
       .temperature-info {
         display: flex;
-        flex-direction: column;
         .temperature {
           font-size: 1.5625vw;
         }