Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/warningHome/components/chat_components/index.vue

@@ -375,7 +375,7 @@ const addSystemReply = (type = "system", textObject, callback) => {
                     scrollToBottom();
                     callback && callback(); // 回复完成后解锁输入
                 }
-            }, 100);
+            }, 50);
         } else {
             callback && callback(); // 如果 content 为空，直接解锁输入
         }
@@ -394,7 +394,7 @@ const addSystemReply = (type = "system", textObject, callback) => {
                 clearInterval(headerInterval);
                 showContent();
             }
-        }, 100); // 50ms 逐字显示 header
+        }, 50); // 50ms 逐字显示 header
     } else {
         showContent();
     }

src/views/warningHome/index.vue

@@ -245,7 +245,7 @@ const toggleBox = (name) => {
             .map-legend {
                 position: absolute;
                 bottom: -33px;
-                left: -455px;
+                left: -360px;
                 width: 340px;
                 img {
                     width: 340px;
@@ -416,8 +416,8 @@ const toggleBox = (name) => {
 <style lang="less">
 .ol-scale-line {
     left: auto;
-    right: 430px;
-    bottom: 38px;
+    right: 435px;
+    bottom: 13px;
     .ol-scale-line-inner {
         max-width: 80px;
         width: 80px !important;