表格样式修改

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -2034,7 +2034,7 @@ const enabledConvert = (val) => {
   }
 }
 .table-wrapper {
-  height: calc(100% - 160px);
+  height: calc(100% - 51px);
   width: calc(100% - 40px);
   padding: 20px;
   .leftContent {

src/views/IntegratedAlarm/alarmConfig/historyConfig/index.vue

@@ -626,7 +626,7 @@ const relatePartConvert = (val) => {
   }
 }
 .table-wrapper {
-  height: calc(100% - 160px);
+  height: calc(100% - 51px);
   width: calc(100% - 40px);
   padding: 20px;
   .leftContent {

src/views/IntegratedAlarm/alarmConfig/logs/index.vue

@@ -38,8 +38,7 @@
       <el-table
         :data="tableData"
         stripe
-        height="calc(100% - 80px)"
-        style="width: 100%; height: calc(100% - 80px)"
+        style="width: 100%; height: calc(100% - 70px)"
       >
         <el-table-column
           prop="ruleName"
@@ -99,7 +98,7 @@
       <div class="pagination">
         <el-pagination
           layout="total,sizes, prev, pager, next"
-          hide-on-single-page
+          :hide-on-single-page="false"
           :current-page="query.page"
           :page-size="query.limit"
           :page-sizes="[22, 50, 100, 200, 500]"
@@ -130,7 +129,7 @@ const pageTitle = "规则修改日志";
 const query = reactive({
   page: 1,
   limit: 22,
-  pageTotal: null,
+  pageTotal: 0,
 });
 let tableData = ref([]);
 let input = ref("");
@@ -176,7 +175,7 @@ const handlePageChange = (val) => {
 </script>
 <style lang="less" scoped>
 .logs {
-  height: calc(100% - 40px);
+  height: 100%;
   padding: 20px;
   .form-wrapper {
     display: flex;
@@ -214,7 +213,7 @@ const handlePageChange = (val) => {
   }
 }
 .table-wrapper {
-  height: calc(100% - 23px);
+  height: calc(100% - 48px);
   width: 100%;
   .leftContent {
     width: 242px;

src/views/IntegratedAlarm/deviceConfig/index.vue

@@ -4410,7 +4410,7 @@ const cascaderforEach = (val) => {
   display: block;
 }
 .device-config {
-  height: calc(100% - 20px);
+  height: 100%;
   padding: 20px;
   .btns {
     display: flex;

src/views/IntegratedAlarm/earlyWarning/index.vue

@@ -66,8 +66,7 @@
       <el-table
         size="mini"
         :data="tableData"
-        height="calc(100% - 110px)"
-        style="width: 100%;"
+        style="width: 100%; height: calc(100% - 45px);overflow: scroll;"
         @selection-change="handleSelectionChange"
         stripe
         border
@@ -306,7 +305,7 @@ export default {
       query: {
         page: 1,
         limit: 21,
-        pageTotal: null,
+        pageTotal: 0,
       },
       selectItem: {
         id: "",
@@ -342,7 +341,6 @@ export default {
   },
 
   created() {
-    
     this.init();
   },
 
@@ -593,7 +591,7 @@ export default {
 
 <style lang="less" scoped>
 .history-warning {
-  height: calc(100% - 40px);
+  height: 100%;
   padding: 0 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
@@ -649,7 +647,7 @@ export default {
     }
   }
   .table-wrapper {
-    height: calc(100% - 60px);
+    height: calc(100% - 55px);
     width: calc(100% - 20px);
     .leftContent {
       width: 242px;

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -139,11 +139,12 @@
       <!--     @cell-click="handle" -->
       <el-table
         :data="state.tableData"
-        :height="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
-        :style="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
+        style="height: calc(100% - 30px);overflow: scroll;"
         stripe
         @sort-change="handleSortChange"
-      >
+        >
+        <!-- :height="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
+        :style="isFullScreen ? 'height: 75vh' : 'height: 85vh'" -->
         <el-table-column
           prop="wtname"
           label="风机编号"
@@ -853,7 +854,7 @@ const compare = function (property) {
   }
   .table_all {
     width: calc(100% - 20px);
-    height: calc(100% - 80px);
+    height: calc(100% - 53px);
     padding: 20px;
     .leftContent {
       width: 242px;

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -148,10 +148,11 @@
       <el-table
         :data="state.tableData"
         stripe
-        :height="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
-        :style="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
+        style="height: calc(100% - 36px - 40px);overflow: scroll;"
         @sort-change="handleSortChange"
       >
+        <!-- :height="isFullScreen ? 'height: 75vh' : 'height: 85vh'"
+        :style="isFullScreen ? 'height: 75vh' : 'height: 85vh'" -->
         <el-table-column
           prop="wtname"
           label="设备编号"
@@ -339,7 +340,7 @@ const windName = ref([]);
 const query = reactive({
   page: 1,
   limit: 6,
-  pageTotal: null,
+  pageTotal: 0,
 });
 const state = reactive({
   typeVal: "windturbine",
@@ -892,7 +893,7 @@ const compare = function (property) {
   }
   .table_all {
     width: calc(100% - 20px);
-    height: calc(100% - 80px);
+    height: calc(100% - 53px);
     padding: 20px;
     .leftContent {
       width: 242px;

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -443,7 +443,7 @@ export default {
 <style lang="less" scoped>
 .safeCom {
   width: 100%;
-  height: calc(100% - 20px);
+  height: 100%;
   cursor: pointer;
   .safeCom_head {
     height: 50px;

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -180,10 +180,10 @@
         size="mini"
         :data="state.tableData"
         class="warpperTable"
-        style="width: 100%"
-        :style="isFullScreen ? 'height: 72vh' : 'height: 85vh'"
+        style="width: 100%; height: calc(100% - 46px - 44px)"
         stripe
       >
+        <!-- :style="isFullScreen ? 'height: 72vh' : 'height: 85vh'" -->
         <template v-if="state.isshowwindturbineName">
           <el-table-column
             v-for="item in state.tableHeader"
@@ -572,7 +572,7 @@ const getWindturbineList = async () => {
 const query = reactive({
   page: 1,
   limit: 1000,
-  pageTotal: null,
+  pageTotal: 0,
 });
 const tableLoading = ref(false);
 // 获取历史记录表
@@ -752,7 +752,7 @@ p {
   margin: 0;
 }
 .custom-warning {
-  height: calc(100% - 40px);
+  height: 100%;
   padding-left: 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
@@ -808,7 +808,7 @@ p {
     }
   }
   .table-wrapper {
-    height: calc(100% - 60px);
+    height: calc(100% - 53px);
     width: calc(100% - 20px);
     .leftContent {
       width: 242px;

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -4,8 +4,9 @@
       <div class="cardLine">
         <div
           class="lineItem card"
-          :style="isFullScreen ? 'height: 90vh' : 'height: 95vh'"
-        >
+          style="height: 100%"
+          >
+          <!-- :style="isFullScreen ? 'height: 90vh' : 'height: 95vh'" -->
           <Safecom
             title="风机预警"
             deviceType="windturbine"

src/views/IntegratedAlarm/yhjyReport/index.vue

@@ -570,9 +570,7 @@ export default {
       fjsxList2: [],
       theme: true,
       loading: false,
-      reportParamDate: dayjs()
-        .subtract(1, "month")
-        .format("YYYY-MM"),
+      reportParamDate: dayjs().subtract(1, "month").format("YYYY-MM"),
     };
   },
 
@@ -904,7 +902,7 @@ export default {
 
 <style lang="less" scoped>
 .optimizationSuggestions {
-  height: 96%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -958,11 +956,12 @@ export default {
   }
 
   .infoBox {
-    height: calc(100% - 80px);
+    height: calc(100% - 34px);
     overflow: scroll;
 
     #pdfDom {
-      margin: 20px;
+      height: calc(100% - 40px);
+      padding: 20px;
     }
   }