问题修改

src/components/alarm-badge/index.vue

@@ -396,7 +396,7 @@ export default {
     getAlarmHistory(alarmType, deviceType) {
       let params = {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 30,
         alarmId: "",
         alarmType,
         deviceType,
@@ -406,7 +406,8 @@ export default {
         components: "",
         description: "",
         isclose: false,
-        begin: dayjs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),
+        // begin: dayjs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),//获取当前时间的前一天的相同时间
+        begin: dayjs().startOf('day').format("YYYY-MM-DD HH:mm:ss"), //获取当天 0 点
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       };
       if (params.alarmType == "windturbine") {

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -3,7 +3,7 @@
     :class="$store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'"
   >
     <!-- 头部按钮选项 -->
-    <HeaderNav :isAll="true" @firstRender="typeFlag" />
+    <!-- <HeaderNav :isAll="true" @firstRender="typeFlag" /> -->
     <div class="matrix-body">
       <!-- 接入台数  欠发情况 -->
       <div class="body-title">
@@ -166,7 +166,7 @@
                 >
                   <span>{{ titleListZb.sjgl }}</span>
                   &nbsp;
-                  <span>kW</span>
+                  <span>MW</span>
                 </div>
               </div>
             </div>
@@ -205,7 +205,7 @@
                 >
                   <span>{{ titleListZb.llgl }}</span>
                   &nbsp;
-                  <span>kW</span>
+                  <span>MW</span>
                 </div>
               </div>
             </div>
@@ -1458,6 +1458,7 @@ export default {
   flex-direction: column;
 
   .matrix-body {
+  margin-top: 20px;
     display: flex;
     flex-direction: column;
     height: 100%;

src/views/SandTable/SandTable.vue

@@ -1,6 +1,6 @@
 <template>
 <!-- padding: 0 10px; -->
-    <div style="width: 100%;height:100%;">
+    <div style="width: 100%;height:99vh;">
         <div class="sand-table" id="sandTable" v-if="$route.path === '/integratedAlarm'">
             <!-- <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" /> -->
             <StBack></StBack>
@@ -10,7 +10,7 @@
              <!-- v-if="showPanel" -->
             <!-- 第一机组 -->
             <div class="sand-table-left">
-                <PanelSand class="left-panel" title="停机信息-中车">
+                <PanelSand class="left-panel" :style="isFullScreen ? 'height: 26vh' : 'height: 27vh'" title="停机信息-中车">
                     <template v-slot:tools>
                         <div class="exchange" @click="changeBjSwitch('left')">
                             <span :class="bjSwitch ? 'gray' : 'white'">故障</span>
@@ -20,7 +20,7 @@
                     </template>
                     <RankTable :data="selsZC" @rowClick="clickStopRow('left')" height="20vh"></RankTable>
                 </PanelSand>
-                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况">
+                <PanelSandToolbar class="right-panel mg-t-16" :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'" title="预警情况">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="warnSwitch === 'z' ? 'white' : 'gray'" @click="changeWarnSwitch('z')">周</span>
@@ -41,7 +41,7 @@
                         <RadarPieChart height="18vh" :list="warnChartDataZC" :title="warnPC ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime('WT2000D121H85')" style="cursor: pointer">
+                <PanelSandToolbar class="right-panel mg-t-16" :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'" title="故障情况" @click="clickTime('WT2000D121H85')" style="cursor: pointer">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="probSwitch === 'z' ? 'white' : 'gray'" @click.stop="changeProbSwitch('z')">周</span>
@@ -78,7 +78,7 @@
                     </template>
                     <RankTable :data="selsLH" @rowClick="clickStopRow('right')" height="20vh"></RankTable>
                 </PanelSand>
-                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况">
+                <PanelSandToolbar class="right-panel mg-t-16" :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'" title="预警情况">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="warnSwitch2 === 'z' ? 'white' : 'gray'" @click="changeWarnSwitch2('z')">周</span>
@@ -99,7 +99,7 @@
                         <RadarPieChart height="18vh" :list="warnChartDataLH" :title="warnPC2 ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime('UP2000-130')">
+                <PanelSandToolbar class="right-panel mg-t-16" :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'" title="故障情况" @click="clickTime('UP2000-130')">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="probSwitch2 === 'z' ? 'white' : 'gray'" @click.stop="changeProbSwitch2('z')">周</span>
@@ -122,7 +122,7 @@
                     </template>
                 </PanelSandToolbar>
             </div>
-            <div class="footer">
+            <div class="footer" :style="isFullScreen ? 'bottom: 9vh' : 'bottom: 0vh'">
                 <div class="hover72Power">
                     <div
                     id="problem1"
@@ -571,6 +571,7 @@
                     }
                 ],
                 timmer: null, // 定时器开关
+                isFullScreen: false
             };
         },
 
@@ -1506,6 +1507,13 @@
             // 创建前
         },
         created() {
+            const clientHeight =
+                document.documentElement.clientHeight || document.body.clientHeight;
+                if (clientHeight === 1080) {
+                this.isFullScreen = true;
+                } else {
+                this.isFullScreen = false;
+                }
             // this.getWpHealthInfo();
             // this.getTop4Info();
             // this.getWarnMGT();
@@ -1519,6 +1527,11 @@
             // 渲染前
         },
         mounted() {
+            window.onresize = () => {
+            const clientHeight =
+                document.documentElement.clientHeight || document.body.clientHeight;
+            this.isFullScreen = window.screen.height == clientHeight;
+            };
             // 渲染后
             this.$nextTick(() =>{
                 // this.init(jsonData)
@@ -1564,7 +1577,8 @@
     .sand-table {
         width: 100%;
         // height: 91.667vh;
-        height: 100%;
+        // height: 100%;
+        height: 98vh;
         position: relative;
         background-image: url("../../assets/png/3dback.png");
 
@@ -1610,6 +1624,7 @@
         }
 
         .sand-table-left {
+            height: 79vh;
             position: absolute;
             left: 0;
             top: 0;
@@ -1617,6 +1632,7 @@
         }
 
         .sand-table-right {
+            height: 79vh;
             position: absolute;
             right: 0;
             top: 0;
@@ -1712,8 +1728,8 @@
             justify-content: space-between;
             width: 100%;
             height: 19vh;
-            position: relative;
-            bottom: -80vh;
+            position: absolute;
+            
             z-index: 111;
 
             .hover72Power,

src/views/economicsOperation/nxfHomePage/component/percent-card-2.vue

@@ -15,7 +15,7 @@
         <span class="value-text newBlue">{{ TotalText }}</span>
         <div>
           <span class="newwhite">{{ TotalValue.toFixed(2) }}</span>
-          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
+          <!-- <span class="newwhite" style="font-size: 12px">(万kWh)</span> -->
         </div>
       </div>
       <div class="card-value">
@@ -23,7 +23,7 @@
         <!-- <span class="newwhite">{{ ActualValue * 10 }}</span> -->
         <div>
           <span class="newwhite">{{ ActualValue }}</span>
-          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
+          <!-- <span class="newwhite" style="font-size: 12px">(万kWh)</span> -->
         </div>
         <!-- <span class="newwhite">{{ ActualValue }}</span> -->
       </div>
@@ -33,7 +33,7 @@
           <span class="newwhite">{{
             PercentValue ? PercentValue.toFixed(2) : 0
           }}</span>
-          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
+          <!-- <span class="newwhite" style="font-size: 12px">(万kWh)</span> -->
         </div>
         <!-- <span class="newwhite"
           >{{ PercentValue ? PercentValue.toFixed(2) : 0 }}(万kWh)</span

src/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis/index.vue

@@ -68,13 +68,14 @@
               style="width: 100%"
               height="100%"
             >
-              <el-table-column prop="type" align="center"> </el-table-column>
+              <el-table-column prop="type" align="center" width="55"> </el-table-column>
               <el-table-column
                 v-for="(item, index) in tableHeaderMonth"
                 :key="index"
-                width="64"
+                :width="item.width ? item.width : '65'"
                 :prop="item.code"
                 :label="item.title"
+                show-overflow-tooltip
                 align="center"
               >
                 <template #header="scope">
@@ -179,13 +180,14 @@
               style="width: 100%"
               height="calc(100% - 24px)"
             >
-              <el-table-column prop="type" align="center"> </el-table-column>
+              <el-table-column prop="type" align="center" width="55"> </el-table-column>
               <el-table-column
                 v-for="(item, index) in tableHeaderYear"
                 :key="index"
-                width="63"
+                :width="item.width ? item.width : '65'"
                 :prop="item.code"
                 :label="item.title"
+                show-overflow-tooltip
                 align="center"
               >
                 <template #header="scope">
@@ -344,8 +346,8 @@ export default {
         { id: -2, name: "光伏" },
       ],
       tableHeaderMonth: [
-        { title: "理论发电量", code: "yllfdl" },
-        { title: "实际发电量", code: "ysjfdl" },
+        { title: "理论发电量", code: "yllfdl", width: "65" },
+        { title: "实际发电量", code: "ysjfdl", width: "65" },
         { title: "风能利用率(%)", code: "yfnlyl" },
         { title: "维护损失电量", code: "ywhssdl" },
         { title: "维护损失率(%)", code: "ywhssl" },
@@ -359,8 +361,8 @@ export default {
         { title: "受累损失率(%)", code: "yslssl" },
       ],
       tableHeaderYear: [
-        { title: "理论发电量", code: "nllfdl" },
-        { title: "实际发电量", code: "nsjfdl" },
+        { title: "理论发电量", code: "nllfdl", width: "65" },
+        { title: "实际发电量", code: "nsjfdl", width: "65" },
         { title: "风能利用率(%)", code: "nfnlyl" },
         { title: "维护损失电量", code: "nwhssdl" },
         { title: "维护损失率(%)", code: "nwhssl" },