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

src/components/screenDisplay.vue

@@ -2058,7 +2058,7 @@ export default defineComponent({
           textStyle: {
             width: 5,
             color: "#ffffff", // 文本颜色
-            fontSize: 12,
+            fontSize: 10,
             padding: 0,
           },
           itemGap: 8,

src/views/Gis/screenDisplay.vue

@@ -58,4 +58,9 @@ ul, li {
   background-color: transparent;
   cursor: pointer;
 }
+@media (max-width: 2560px) {
+  body {
+    font-size: 15px;
+  }
+}
 </style>
\ No newline at end of file