修改地图，使登录直接进入地图

src/components/screenDisplay.vue

@@ -4,7 +4,7 @@ import * as echarts from "echarts";
 import AMapLoader from "@amap/amap-jsapi-loader";
 </script>
 <template>
-  <div class="content">
+  <div class="gis_content" id="gis_content">
     <div class="btnGroup">
       <div class="btn btn1" @click="heatBtnClick(1)"><p>实时热耗</p></div>
       <div class="btn btn2" @click="heatBtnClick(2)"><p>供热面积</p></div>
@@ -14,7 +14,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
       <div class="btn btn4" @click="heatBtnClick(4)"><p>返回上一级</p></div>
     </div>
     <div class="leftLayer" id="leftLayer">
-      <div class="blockStyle" style="height: 30%">
+      <div class="blockStyle" style="height: 16%">
         <div class="titleStyle"><p>室外温度</p></div>
         <div class="leftLayer1" id="leftLayer1"></div>
       </div>
@@ -24,8 +24,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           <li>
             <div class="left">
               <div class="title">
-                <p>热电联产</p>
-                <p>供热面积</p>
+                <p>热电联产供热面积</p>
               </div>
               <div class="subTitle">（万㎡）</div>
             </div>
@@ -36,8 +35,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           <li>
             <div class="left">
               <div class="title">
-                <p>燃气锅炉</p>
-                <p>供热面积</p>
+                <p>燃气锅炉供热面积</p>
               </div>
               <div class="subTitle">（万㎡）</div>
             </div>
@@ -48,8 +46,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           <li>
             <div class="left">
               <div class="title">
-                <p>风电机组</p>
-                <p>供热面积</p>
+                <p>风电机组供热面积</p>
               </div>
               <div class="subTitle">（万㎡）</div>
             </div>
@@ -60,8 +57,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           <li>
             <div class="left">
               <div class="title">
-                <p>空气源热泵</p>
-                <p>供热面积</p>
+                <p>空气源热泵供热面积</p>
               </div>
               <div class="subTitle">（万㎡）</div>
             </div>
@@ -71,7 +67,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           </li>
           <li>
             <div class="left">
-              <div class="title" style="margin-bottom: 8px">计划热量</div>
+              <div class="title">计划热量</div>
               <div class="subTitle">（GJ）</div>
             </div>
             <div class="right sa-digital-number">
@@ -80,14 +76,14 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           </li>
           <li>
             <div class="left">
-              <div class="title" style="margin-bottom: 8px">实际热量</div>
+              <div class="title">实际热量</div>
               <div class="subTitle">（GJ）</div>
             </div>
             <div class="right sa-digital-number">{{ areaList.realHeat }}</div>
           </li>
           <li>
             <div class="left">
-              <div class="title" style="margin-bottom: 8px">机组数量</div>
+              <div class="title">机组数量</div>
               <div class="subTitle">（座）</div>
             </div>
             <div class="right sa-digital-number">
@@ -96,18 +92,29 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           </li>
           <li class="last">
             <div class="left">
-              <div class="title" style="margin-bottom: 8px">热用户数量</div>
+              <div class="title">热用户数量</div>
               <div class="subTitle">（户）</div>
             </div>
             <div class="right sa-digital-number">{{ areaList.userCount }}</div>
           </li>
         </ul>
       </div>
+      <div class="blockStyle rightLayer2Block">
+        <div class="titleStyle" style="margin-top: 1%">
+          <p>一次补水量曲线</p>
+        </div>
+        <div
+          class="rightLayer2"
+          id="rightLayer2"
+          v-if="rightLayer2Nodata"
+        ></div>
+        <div class="rightLayer2 nodata" v-else>暂无数据</div>
+      </div>
     </div>
     <div class="rightLayer">
       <div class="blockStyle" style="top: 1%">
         <div class="titleStyle"><p>实时数据</p></div>
-        <div class="rightLayer1">
+        <div class="rightLayer1" style="margin-top: 0.5%">
           <table>
             <tr>
               <th>名称</th>
@@ -172,20 +179,9 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           </table>
         </div>
       </div>
-      <div class="blockStyle rightLayer2Block">
-        <div class="titleStyle" style="margin-top: 1%">
-          <p>一次补水量曲线</p>
-        </div>
-        <div
-          class="rightLayer2"
-          id="rightLayer2"
-          v-if="rightLayer2Nodata"
-        ></div>
-        <div class="rightLayer2 nodata" v-else>暂无数据</div>
-      </div>
       <div
         class="blockStyle rightLayer2Block rightLayer3Block"
-        style="margin-top: 13%"
+        style="margin-top: 2%"
       >
         <div class="titleStyle">
           <p>换热站工况</p>
@@ -206,7 +202,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
             </li>
           </ul>
         </div>
-        <div class="selectBlock" style="top: 20%">
+        <div class="selectBlock" style="top: 17%">
           <select
             v-model="selectHour"
             v-show="selectShow"
@@ -291,7 +287,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
           </table>
         </div>
       </div>
-      <div class="blockStyle rightLayer4Block" style="margin-top: 40.5%">
+      <div class="blockStyle rightLayer4Block">
         <div class="titleStyle"><p>机组一网电调阀开度分布</p></div>
         <div
           class="rightLayer4"
@@ -331,6 +327,9 @@ import AMapLoader from "@amap/amap-jsapi-loader";
   </div>
 </template>
 <script>
+import { detectZoom } from "@/plugins/screen";
+const m = detectZoom();
+
 import {
   postServicCenterList,
   postSupplylist,
@@ -412,8 +411,13 @@ export default defineComponent({
         timeOff = true;
       }
     }, 1000); // 每秒更新一次时间
+
   },
   mounted: function mounted() {
+    
+    if (window.screen.height * window.devicePixelRatio == 1080) {
+      document.body.style.zoom = 100 / Number(m);
+    }
     this.login();
     window.onresize = function () {
       location.reload();
@@ -1667,7 +1671,6 @@ export default defineComponent({
             show: true,
             data: temperatureList,
           });
-          console.log(this.gYSupplyWaterSeries);
           this.rightEchartInit1();
         } else if (res.status == 9) {
           this.rightLayer2Nodata = false;
@@ -1754,7 +1757,7 @@ export default defineComponent({
         legend: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "16px",
+            fontSize: "10px",
           },
         },
         tooltip: {
@@ -1765,7 +1768,7 @@ export default defineComponent({
           data: ["昨日", "今日", "明日"],
           axisLabel: {
             color: "#ffffff",
-            fontSize: "16px",
+            fontSize: "10px",
           },
           axisLine: {
             lineStyle: {
@@ -1775,7 +1778,6 @@ export default defineComponent({
           },
         },
         yAxis: {
-          name: "℃",
           type: "value",
           splitLine: {
             show: false, // 不显示y轴网格线
@@ -1783,7 +1785,7 @@ export default defineComponent({
           axisLabel: {
             color: "#ffffff",
             interval: 5, // 显示每隔5个刻度值
-            fontSize: "14px",
+            fontSize: "9px",
           },
           axisLine: {
             lineStyle: {
@@ -1795,8 +1797,8 @@ export default defineComponent({
         grid: {
           left: 30,
           right: 20,
-          top: 40,
-          bottom: 25,
+          top: 15,
+          bottom: 35,
         },
         series: [
           {
@@ -1819,10 +1821,10 @@ export default defineComponent({
             label: {
               show: true, // 显示文字
               position: "top", // 文字位置
-              fontSize: 16,
+              fontSize: 12,
               color: "#ffffff",
               // 格式化文字内容
-              formatter: "{c}", // {c} 表示数据值
+              formatter: "{c}℃", // {c} 表示数据值
             },
           },
         ],
@@ -1879,16 +1881,16 @@ export default defineComponent({
               length: 20,
               lineStyle: {
                 color: "auto",
-                width: 5,
+                width: 2,
               },
             },
             title: {
               offsetCenter: [0, "-10%"],
-              fontSize: 20,
+              fontSize: 12,
               color: "#ffffff",
             },
             detail: {
-              fontSize: 20,
+              fontSize: 14,
               offsetCenter: [0, "-35%"],
               valueAnimation: true,
               formatter: function (value) {
@@ -1950,7 +1952,7 @@ export default defineComponent({
             if (name.includes("耗水量T")) {
               return name.split("耗水量T")[0];
             } else {
-              return name;
+              return name.split("平均")[1];
             }
           },
           left: 0,
@@ -1958,38 +1960,38 @@ export default defineComponent({
           right: 0,
           bottom: 0,
           textStyle: {
-            width: 5,
-            color: "#ffffff", // 文本颜色
-            fontSize: 10,
+            width: 1,
+            color: "#ffffff",
+            fontSize: 9,
             padding: 0,
+            margin: 0,
           },
         },
         grid: {
-          top: 65,
+          top: 50,
           left: 0,
-          right: 10,
+          right: 5,
           bottom: 0,
           containLabel: true,
         },
-        toolbox: {
-          feature: {
-            saveAsImage: {},
-          },
-        },
         xAxis: {
           type: "category",
           boundaryGap: false,
           data: this.gYSupplyWaterTime,
+          axisPointer: {
+            type: "shadow",
+          },
           axisLabel: {
             textStyle: {
               color: "#ffffff",
+              fontSize: 10,
             },
+            rotate: 45, // X轴标签倾斜 45 度
           },
         },
         yAxis: [
           {
             type: "value",
-            name: "T",
             position: "left",
             axisLine: {
               lineStyle: {
@@ -1997,10 +1999,16 @@ export default defineComponent({
                 color: "#ffffff", // 设置轴线的颜色
               },
             },
+            axisLabel: {
+              textStyle: {
+                color: "#ffffff",
+                fontSize: 10,
+              },
+              formatter: "{value}T",
+            },
           },
           {
             type: "value",
-            name: "℃",
             position: "right",
             min: 0,
             max: 100,
@@ -2012,6 +2020,13 @@ export default defineComponent({
                 color: "#ffffff", // 设置轴线的颜色
               },
             },
+            axisLabel: {
+              textStyle: {
+                color: "#ffffff",
+                fontSize: 10,
+              },
+              formatter: "{value} ℃",
+            },
           },
         ],
         series: this.gYSupplyWaterSeries,
@@ -2039,7 +2054,7 @@ export default defineComponent({
             color: "#ffffff",
           },
           left: 0,
-          top: 5,
+          top: 0,
           right: 0,
           bottom: 0,
           textStyle: {
@@ -2051,10 +2066,10 @@ export default defineComponent({
           itemGap: 8,
         },
         grid: {
-          top: 40,
+          top: 35,
           left: 10,
           right: 10,
-          bottom: 5,
+          bottom: 10,
           containLabel: true,
         },
         xAxis: {
@@ -2164,17 +2179,20 @@ export default defineComponent({
 .sa-digital-number {
   font-family: "sa-digital-number";
 }
-.content {
-  position: relative;
+.gis_content {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   width: 100%;
   /* min-width: 1890px; */
-  min-width: 1680px;
-  height: 100vh;
-  min-height: 1080px;
+  /* min-width: 1680px; */
+  /* min-height: 1080px; */
   margin: 0 auto;
   overflow: hidden;
 }
-#container {
+.gis_content #container {
   position: absolute;
   width: 100%;
   height: 100%;
@@ -2182,10 +2200,10 @@ export default defineComponent({
   overflow: hidden;
   z-index: 1;
 }
-.leftLayer {
+.gis_content .leftLayer {
   position: absolute;
   width: 21%;
-  height: 84.5%;
+  height: 84.1%;
   /* background: linear-gradient(to bottom, rgba(29, 70, 128, 0.5), rgba(29, 70, 128, 0.9), rgba(29, 70, 128, 0.5)); */
   background-color: rgba(29, 70, 128, 0.8);
   z-index: 9;
@@ -2194,16 +2212,16 @@ export default defineComponent({
   bottom: 5px;
   border: rgba(129, 210, 230, 0.5) solid 1px;
 }
-.leftLayer1 {
+.gis_content .leftLayer1 {
   width: 95%;
   height: 90%;
   /* height: 220px; */
   margin: 0 0 0 5%;
 }
-.rightLayer {
+.gis_content .rightLayer {
   position: absolute;
   width: 21%;
-  height: 98.9%;
+  height: 98.5%;
   /* height: 1068px; */
   top: 5px;
   right: 5px;
@@ -2213,12 +2231,12 @@ export default defineComponent({
   z-index: 9;
   border: rgba(129, 210, 230, 0.5) solid 1px;
 }
-.rightLayer2 {
+.gis_content .rightLayer2 {
   width: 95%;
   height: 100%;
   margin: 0 0 0 5%;
 }
-.bottomLayer {
+.gis_content .bottomLayer {
   position: absolute;
   width: 77.96%;
   height: 13.6%;
@@ -2229,99 +2247,99 @@ export default defineComponent({
   bottom: 5px;
   border: rgba(129, 210, 230, 0.5) solid 1px;
 }
-.bottomLayer .title {
+.gis_content .bottomLayer .title {
   margin: 1% 0 0 1%;
-  font-size: 15px;
   color: #19f7ff;
   letter-spacing: 3px;
 }
-.bottomLayer ul.bottomList {
+.gis_content .bottomLayer ul.bottomList {
   display: flex;
   justify-content: space-around;
   height: 100%;
 }
-.bottomLayer ul.bottomList li {
+.gis_content .bottomLayer ul.bottomList li {
   display: flex;
   justify-content: space-between;
   width: 20%;
   height: 100%;
 }
-.bottomLayer ul.bottomList li div.titleList {
+.gis_content .bottomLayer ul.bottomList li div.titleList {
   width: 20%;
   padding: 0 0 0 2.5%;
   text-align: center;
   background-color: rgba(2, 130, 222, 0.5);
   writing-mode: vertical-lr;
 }
-.bottomLayer ul.bottomList li div.titleList div.title,
-.bottomLayer ul.bottomList li div.titleList div.subTitle {
+.gis_content .bottomLayer ul.bottomList li div.titleList div.title,
+.gis_content .bottomLayer ul.bottomList li div.titleList div.subTitle {
   font-size: 120%;
   color: #19f7ff;
 }
-.bottomLayer ul.bottomList li div.titleList div.title {
+.gis_content .bottomLayer ul.bottomList li div.titleList div.title {
   letter-spacing: 6px;
 }
-.bottomLayer ul.bottomList li div.titleList div.subTitle {
+.gis_content .bottomLayer ul.bottomList li div.titleList div.subTitle {
   font-size: 80%;
   margin-left: 3%;
   letter-spacing: 1px;
 }
-.bottomLayer .bottomCharts1 {
+.gis_content .bottomLayer .bottomCharts1 {
   width: 80%;
   height: 98%;
 }
-.blockStyle {
+.gis_content .blockStyle {
   width: 100%;
 }
-.titleStyle {
+.gis_content .titleStyle {
   width: 95%;
   height: 35px;
-  margin: 4% 0 0 5%;
-  background: url("/images/title_bg.png") top left no-repeat;
+  margin: 2% 0 0 5%;
+  background: url("/imgs/Gis/title_bg.png") top left no-repeat;
 }
-.titleStyle p {
-  padding: 1% 5% 0 5%;
+.gis_content .titleStyle p {
+  padding: .5% 5% 0 5%;
   color: #19f7ff;
   letter-spacing: 3px;
   font-size: 120%;
 }
-.ulList li {
+.gis_content .ulList li {
   display: flex;
   width: 90%;
-  margin: 2% 5%;
+  margin: 0 5%;
   padding: 0 0 2%;
   color: #19f7ff;
   border-bottom: #19f7ff solid 2px;
+  font-size: 80%;
 }
-.ulList li.last {
+.gis_content .ulList li.last {
   border-bottom: none;
 }
-.ulList li div.left {
-  width: 30%;
+.gis_content .ulList li div.left {
+  width: 35%;
   font-size: 100%;
 }
-.ulList li div.left .title {
+.gis_content .ulList li div.left .title {
   margin-top: 3px;
 }
-.ulList li div.left .subTitle {
-  font-size: 9px;
+.gis_content .ulList li div.left .subTitle {
+  font-size: 90%;
   margin-left: 8%;
 }
-.ulList li div.right {
-  width: 70%;
+.gis_content .ulList li div.right {
+  width: 65%;
   text-align: right;
-  font-size: 200%;
+  font-size: 160%;
   color: #00ffd8;
   padding-top: 5px;
 }
-.jkBar {
+.gis_content .jkBar {
   width: 100%;
   height: 30px;
 }
-.mypopup {
+.gis_content .mypopup {
   background-color: #19f7ff !important;
 }
-.btnGroup {
+.gis_content .btnGroup {
   position: absolute;
   width: 10%;
   height: 10vh;
@@ -2329,37 +2347,37 @@ export default defineComponent({
   top: 2%;
   z-index: 10;
 }
-.btnGroup .btn {
+.gis_content .btnGroup .btn {
   width: 103px;
   height: 36px;
   font-size: 17px;
   text-align: center;
   cursor: pointer;
 }
-.btnGroup .btn p {
+.gis_content .btnGroup .btn p {
   padding-top: 6px;
   font-weight: bolder;
 }
-.btnGroup .btn1 {
+.gis_content .btnGroup .btn1 {
   background: url("/imgs/Gis/icon_btn1.png") center center no-repeat;
   color: #ffffff;
-  margin-bottom: 10px;
+  margin-bottom: 3%;
 }
-.btnGroup .btn2 {
+.gis_content .btnGroup .btn2 {
   background: url("/imgs/Gis/icon_btn2.png") center center no-repeat;
   color: #000000;
 }
-.btnGroup .btn3 {
+.gis_content .btnGroup .btn3 {
   background: url("/imgs/Gis/icon_btn3.png") center center no-repeat;
   color: #ffffff;
-  margin-bottom: 10px;
+  margin-bottom: 3%;
 }
-.btnGroup .btn4 {
+.gis_content .btnGroup .btn4 {
   background: url("/imgs/Gis/icon_btn4.png") center center no-repeat;
   color: #ffffff;
-  margin-bottom: 10px;
+  margin-bottom: 3%;
 }
-.jkBarBlock {
+.gis_content .jkBarBlock {
   position: relative;
   width: 90%;
   height: 18px;
@@ -2367,18 +2385,18 @@ export default defineComponent({
   background-color: rgba(25, 247, 255, 0.15);
   border: 2px solid rgb(25, 247, 255);
 }
-.jkBarSubtitle {
+.gis_content .jkBarSubtitle {
   margin: 2% 0 2px 5%;
   font-size: 90%;
   color: #19f7ff;
 }
-.jkBarBlockBar {
+.gis_content .jkBarBlockBar {
   position: absolute;
   width: 80%;
   height: 18px;
   background: linear-gradient(to right, rgb(0, 93, 168), rgb(0, 191, 193));
 }
-.jkBarBlock span {
+.gis_content .jkBarBlock span {
   font-family: "sa-digital-number";
   display: block;
   position: absolute;
@@ -2388,48 +2406,48 @@ export default defineComponent({
   color: rgb(25, 247, 255);
   z-index: 10;
 }
-.rightLayer2Block {
+.gis_content .rightLayer2Block {
   position: relative;
-  height: 16%;
+  height: 22%;
 }
-.rightLayer2Block .subTitle {
+.gis_content .rightLayer2Block .subTitle {
   position: absolute;
   top: 26%;
   left: 30%;
   font-size: 80%;
   color: #ffffff;
 }
-.rightLayer2Block .btnGroup {
+.gis_content .rightLayer2Block .btnGroup {
   position: absolute;
   width: 50%;
-  top: 22%;
+  top: 18%;
   left: 5%;
   height: 22%;
 }
-.rightLayer2Block .btnGroup ul {
+.gis_content .rightLayer2Block .btnGroup ul {
   display: flex;
   justify-content: space-between;
   width: 100%;
   border: rgb(25, 247, 255) solid 1px;
   border-radius: 8px;
 }
-.rightLayer2Block .btnGroup ul li {
+.gis_content .rightLayer2Block .btnGroup ul li {
   font-size: 80%;
   color: #ffffff;
   width: 51%;
   text-align: center;
   cursor: pointer;
 }
-.rightLayer2Block .btnGroup ul li.ac {
+.gis_content .rightLayer2Block .btnGroup ul li.ac {
   background-color: rgb(5, 162, 172);
 }
-.rightLayer2Block .selectBlock {
+.gis_content .rightLayer2Block .selectBlock {
   position: absolute;
   top: 22%;
   right: 5%;
   width: 18%;
 }
-.rightLayer2Block .selectBlock select {
+.gis_content .rightLayer2Block .selectBlock select {
   width: 100%;
   height: 100%;
   background: transparent;
@@ -2440,51 +2458,52 @@ export default defineComponent({
   border: rgb(25, 247, 255) solid 1px;
   cursor: pointer;
 }
-.rightLayer2Block .selectBlock select option {
+.gis_content .rightLayer2Block .selectBlock select option {
   background-color: #00192e;
 }
-.rightLayer1 {
+.gis_content .rightLayer1 {
   margin-top: 2%;
 }
-.rightLayer1 table {
+.gis_content .rightLayer1 table {
   width: 90%;
   margin-left: 5%;
   border-spacing: 2px;
 }
-.rightLayer1 table th {
+.gis_content .rightLayer1 table th {
   width: 16%;
   background-color: #8797a6;
-  font-size: 75%;
+  font-size: 90%;
   padding: 0;
 }
-.rightLayer1 table th:first-child {
+.gis_content .rightLayer1 table th:first-child {
   width: 20%;
 }
-.rightLayer1 table td {
+.gis_content .rightLayer1 table td {
   background-color: #0e3c77;
-  font-size: 75%;
+  font-size: 85%;
   color: rgb(25, 247, 255);
   text-align: center;
-  padding: 0.5%;
+  padding: 0.6%;
 }
-.rightLayer3Block {
+.gis_content .rightLayer3Block {
   margin-top: 8%;
   padding: 0;
 }
-.rightLayer3Block table th {
+.gis_content .rightLayer3Block table th {
   margin-top: 8%;
   text-align: center;
 }
-.rightLayer4 {
+.gis_content .rightLayer4 {
   width: 90%;
   height: 100%;
   margin-left: 5%;
 }
-.rightLayer4Block {
+.gis_content .rightLayer4Block {
+  position: relative;
   height: 20%;
-  margin-top: 35%;
+  margin-top: 36%;
 }
-.nodata {
+.gis_content .nodata {
   display: flex;
   align-items: center; /* 垂直居中 */
   justify-content: center; /* 水平居中，如果需要的话 */

src/views/Gis/screenDisplay.vue

 <script setup>
 import screenDisplay from '../../components/screenDisplay.vue'
-import { detectZoom } from '@/plugins/screen';
-const m = detectZoom();
-// console.log(window.screen.height, window.devicePixelRatio, m);
-// if (window.screen.width * window.devicePixelRatio >= 3840) {
-//   document.body.style.zoom = 100 / (Number(m) / 2)
-// } else if (window.screen.width * window.devicePixelRatio >= 2560 && window.screen.width * window.devicePixelRatio <= 3840) {
-//   document.body.style.zoom = 100 / (Number(m) / 1.33)
-// } else {
-//   document.body.style.zoom = 100 / Number(m)
-// }
-if( window.screen.height * window.devicePixelRatio == 1080) {
-    document.body.style.zoom = 100 / Number(m);
-}
 
 </script>
 
@@ -30,6 +17,7 @@ body, div, p, img, span, table, tr, td {
 html, body {
   font-family: "Microsoft YaHei";
   font-size: 16px;
+  background-color: #033447;
 }
 ul, li {
   list-style: none;
@@ -70,92 +58,4 @@ ul, li {
   background-color: transparent;
   cursor: pointer;
 }
-@media (min-width: 2000px) {
-  html,
-  body {
-    font-size: 16px;
-  }
-}
-
-@media (min-width: 2200px) {
-  html,
-  body {
-    font-size: 17px;
-  }
-  .content {
-    min-height: 1125px !important;
-  }
-}
-
-@media (min-width: 2400px) {
-  html,
-  body {
-    font-size: 18px;
-  }
-  .content {
-    min-height: 1350px !important;
-  }
-  .rightLayer4Block {
-    height:26% !important;
-    margin-top:28% !important;
-  }
-  .rightLayer3Block {
-    margin-top: 12% !important;
-  }
-  .titleStyle p {
-    padding: 0.5% 5% 0 5% !important;
-  }
-}
-
-@media (min-width: 2600px) {
-  html,
-  body {
-    font-size: 19px !important;
-  }
-  .content {
-    min-height: 1463px;
-  }
-  .rightLayer4Block {
-    height:26% !important;
-    margin-top:30% !important;
-  }
-}
-
-@media (min-width: 2800px) {
-  html,
-  body {
-    font-size: 20px !important;
-  }
-  .content {
-    min-height: 1575px !important;
-  }
-  .rightLayer4Block {
-    height:26% !important;
-    margin-top:30% !important;
-  }
-}
-
-@media (min-width: 3000px) {
-  html,
-  body {
-    font-size: 26px !important;
-  }
-  .content {
-    min-height: 1688px !important;
-  }
-  .rightLayer4Block {
-    height:26% !important;
-    margin-top:30% !important;
-  }
-}
-@media (min-width: 3100px) {
-  html,
-  body {
-    font-size: 26px !important;
-  }
-  .content {
-    min-height: 1688px !important;
-  }
-}
-
 </style>
\ No newline at end of file

src/views/home.vue

@@ -86,9 +86,7 @@
                                     :fit="'scale-down'" />
                                 <div>
                                     <div class="div-contain-title" style="">气象时间</div>
-                                    <div class="div-contain-text-small" style="line-height: 15px;">{{
-            showWeatherData.weatherData.gatherTime
-        }}</div>
+                                    <div class="div-contain-text-small" style="line-height: 15px;">{{showWeatherData.weatherData.gatherTime}}</div>
                                 </div>
                             </div>
                         </el-col>
@@ -519,12 +517,13 @@ export default defineComponent({
 
     function openMap(){
         const routePath = '/GisHome'; // 要导航到的路由路径
-      // 打开新窗口并导航到指定路由
-        window.open(
-            `${routePath}`,
-            '_blank',
-            'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes'
-        );
+        router.push({ path: routePath});
+    //   // 打开新窗口并导航到指定路由
+    //     window.open(
+    //         `${routePath}`,
+    //         '_blank',
+    //         'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes'
+    //     );
     }
 
     return {

src/views/login/login.vue

@@ -301,7 +301,8 @@ function login() {
         }
         $message.success('登录成功,正在跳转!');
         store.commit('setUserInfo', result.data);
-        router.push({ path: '/Home'});
+      //  router.push({ path: '/Home'});
+      router.push({ path: '/GisHome'});
       });
 }