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

src/components/screenDisplay.vue

@@ -8,8 +8,6 @@ import AMapLoader from "@amap/amap-jsapi-loader";
     <div class="btnGroup">
       <div class="btn btn1" @click="heatBtnClick(1)"><p>实时热耗</p></div>
       <div class="btn btn2" @click="heatBtnClick(2)"><p>供热面积</p></div>
-    </div>
-    <div class="btnGroup" style="top: 11.5%">
       <div class="btn btn3" @click="heatBtnClick(3)"><p>返回首页</p></div>
       <div class="btn btn4" @click="heatBtnClick(4)"><p>返回上一级</p></div>
     </div>
@@ -168,10 +166,10 @@ import AMapLoader from "@amap/amap-jsapi-loader";
               </td>
             </tr>
             <tr>
-              <td>一次补水量m³/h</td>
+              <td>一次补水量万m³/h</td>
               <td v-for="item in gYPipeReal" :key="item.supplyId">
                 <span v-if="item.supplyFlowSum != 0">{{
-                  parseInt(item.supplyFlowSum)
+                  parseInt(item.supplyFlowSum) / 10000
                 }}</span>
                 <span v-else>-</span>
               </td>
@@ -202,7 +200,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
             </li>
           </ul>
         </div>
-        <div class="selectBlock" style="top: 17%">
+        <div class="selectBlock">
           <select
             v-model="selectHour"
             v-show="selectShow"
@@ -2157,7 +2155,7 @@ export default defineComponent({
   position: fixed;
   width: 1280px;
   left: 50%;
-  top: calc(50% - 304px);
+  top: calc(50% - 350px);
   margin-left: -640px;
   z-index: 9999;
 }
@@ -2355,7 +2353,7 @@ export default defineComponent({
   cursor: pointer;
 }
 .gis_content .btnGroup .btn p {
-  padding-top: 6px;
+  padding-top: 5px;
   font-weight: bolder;
 }
 .gis_content .btnGroup .btn1 {
@@ -2366,6 +2364,7 @@ export default defineComponent({
 .gis_content .btnGroup .btn2 {
   background: url("/imgs/Gis/icon_btn2.png") center center no-repeat;
   color: #000000;
+  margin-bottom: 3%;
 }
 .gis_content .btnGroup .btn3 {
   background: url("/imgs/Gis/icon_btn3.png") center center no-repeat;
@@ -2375,7 +2374,6 @@ export default defineComponent({
 .gis_content .btnGroup .btn4 {
   background: url("/imgs/Gis/icon_btn4.png") center center no-repeat;
   color: #ffffff;
-  margin-bottom: 3%;
 }
 .gis_content .jkBarBlock {
   position: relative;
@@ -2420,7 +2418,7 @@ export default defineComponent({
 .gis_content .rightLayer2Block .btnGroup {
   position: absolute;
   width: 50%;
-  top: 18%;
+  top: 14%;
   left: 5%;
   height: 22%;
 }
@@ -2443,7 +2441,7 @@ export default defineComponent({
 }
 .gis_content .rightLayer2Block .selectBlock {
   position: absolute;
-  top: 22%;
+  top: 13%;
   right: 5%;
   width: 18%;
 }
@@ -2474,13 +2472,14 @@ export default defineComponent({
   background-color: #8797a6;
   font-size: 90%;
   padding: 0;
+  text-align: center;
 }
 .gis_content .rightLayer1 table th:first-child {
   width: 20%;
 }
 .gis_content .rightLayer1 table td {
   background-color: #0e3c77;
-  font-size: 85%;
+  font-size: 80%;
   color: rgb(25, 247, 255);
   text-align: center;
   padding: 0.6%;
@@ -2488,10 +2487,13 @@ export default defineComponent({
 .gis_content .rightLayer3Block {
   margin-top: 8%;
   padding: 0;
+  height: 28%;
 }
 .gis_content .rightLayer3Block table th {
+  font-size: 90%;
   margin-top: 8%;
   text-align: center;
+  line-height: 120%;
 }
 .gis_content .rightLayer4 {
   width: 90%;
@@ -2500,8 +2502,8 @@ export default defineComponent({
 }
 .gis_content .rightLayer4Block {
   position: relative;
-  height: 20%;
-  margin-top: 36%;
+  height: 25%;
+  margin-top: 25%;
 }
 .gis_content .nodata {
   display: flex;