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

src/views/Report/ForecastPage.vue

@@ -13,58 +13,59 @@
           style="background-color: #99bbe8"
         >
           <tr>
-            <th width="25%">
-              <span>记录时间</span>
+            <th>
+              <span>打印时间</span>
             </th>
             <th style="text-align: left; background-color: #ffffff">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
-                  type="datetime"
-                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="date"
+                  value-format="YYYY-MM-DD"
                   placeholder="选择查询时间"
                   style="width: 180px"
-                  v-model="enertyInfo.queryTime"
+                  v-model="enertyInfo.printTime"
                 />
               </el-config-provider>
             </th>
-            <th width="25%">
+            <th>
               <el-button
                 type="primary"
                 style="min-width: 70px"
-                @click="postHeatForecastFun"
                 class="printHidden"
                 v-show="printHidden"
-                >历史查询</el-button
+                @click="postPrintHeatForecastFun"
+                >打印查询</el-button
               >
             </th>
           </tr>
           <tr>
-            <th>
-              <span>打印时间</span>
+            <th width="25%">
+              <span>记录时间</span>
             </th>
             <th style="text-align: left; background-color: #ffffff">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
-                  type="date"
-                  value-format="YYYY-MM-DD"
+                  type="datetime"
+                  value-format="YYYY-MM-DD HH:mm:ss"
                   placeholder="选择查询时间"
                   style="width: 180px"
-                  v-model="enertyInfo.printTime"
+                  v-model="enertyInfo.queryTime"
                 />
               </el-config-provider>
             </th>
-            <th>
+            <th width="25%">
               <el-button
                 type="primary"
                 style="min-width: 70px"
+                @click="postHeatForecastFun"
                 class="printHidden"
                 v-show="printHidden"
-                @click="postPrintHeatForecastFun"
-                >打印查询</el-button
+                >历史查询</el-button
               >
             </th>
           </tr>
         </table>
+        <div class="overflowBlock">
           <table
             cellpadding="0"
             cellspacing="1"
@@ -248,6 +249,7 @@
               <td>领导：</td>
             </tr>
           </table>
+        </div>
         <div>
           <div class="btngrounp printHidden" v-show="printHidden">
             <el-button
@@ -720,7 +722,7 @@ function postPrintHeatForecastFun() {
       weather.value = {};
       dataList.value = {};
       dataTime.value = {};
-      ElMessage.error(res.message);
+      ElMessage.error("没有获取到打印记录");
     }
     loading.value = false;
   });
@@ -765,12 +767,11 @@ onUnmounted(() => {});
 </script>
 <style lang="less" scoped>
 .contentBlock {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #ffffff;
+}
+.overflowBlock {
+  width: 100%;
+  height: 60vh;
   overflow: auto;
 }
 table {
@@ -829,4 +830,14 @@ table.botList td {
     height: auto !important;
   }
 }
+@media (min-width: 1700px) {
+  .overflowBlock {
+    height: 67vh;
+  }
+}
+@media (min-width: 2560px) {
+  .overflowBlock {
+    height: 100%;
+  }
+}
 </style>
\ No newline at end of file

src/views/Report/HeatAnalysisPage.vue

@@ -40,10 +40,15 @@
                   @click="postHeatAnalysisFun"
                   >历史查询</el-button
                 >
+                <el-button type="primary" v-print="printObj">打印</el-button>
+                <el-button type="primary" @click="exportTableToExcel"
+                  >导出</el-button
+                >
               </div>
             </th>
           </tr>
         </table>
+        <div class="overflowBlock">
           <table
             cellpadding="0"
             cellspacing="1"
@@ -69,7 +74,9 @@
                   <tr>
                     <th>预测室外平均温度(℃)</th>
                     <td>
-                    {{ predictionTemp.avgTemp ? predictionTemp.avgTemp : "-" }}
+                      {{
+                        predictionTemp.avgTemp ? predictionTemp.avgTemp : "-"
+                      }}
                     </td>
                   </tr>
                   <tr>
@@ -322,26 +329,6 @@
               </tr>
             </template>
           </table>
-        <div class="printHidden">
-          <div class="btngrounp">
-            <el-button
-              type="primary"
-              style="margin: 15px 0 0 0"
-              v-print="printObj"
-              >打印</el-button
-            >
-            <!--<el-button
-              type="primary"
-              style="margin: 15px 0 0 10px"
-              >打印预览</el-button
-             -->
-            <el-button
-              type="primary"
-              @click="exportTableToExcel"
-              style="margin: 15px 0 0 10px"
-              >导出</el-button
-            >
-          </div>
         </div>
       </el-card>
     </div>
@@ -877,12 +864,11 @@ onUnmounted(() => {});
 </script>
 <style lang="less" scoped>
 .contentBlock {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #ffffff;
+}
+.overflowBlock {
+  width: 100%;
+  height: 68vh;
   overflow: auto;
 }
 table {
@@ -930,4 +916,14 @@ table td {
     height: auto !important;
   }
 }
+@media (min-width: 1700px) {
+  .overflowBlock {
+    height: 74vh;
+  }
+}
+@media (min-width: 2560px) {
+  .overflowBlock {
+    height: 100%;
+  }
+}
 </style>
\ No newline at end of file