LY

ui/src/assets/styles/index.scss

@@ -205,9 +205,8 @@ aside {
     background-position: center center;
     background-repeat: repeat;
     width: 3300px;
-    height: 100%;
+    height:100vh
   }
-
   .host-body {
     .title {
       position: relative;

ui/src/views/monitor/elec/bottomRight.vue

@@ -18,7 +18,7 @@
           <bottomRightChart :weekData="weekData"/>
         </div>
       <div class="naturalGasData" style="flex: 1">
-        <div style="padding-top:30px;">
+        <div style="padding-top:10px;">
           <div style="display:flex;flex-direction:row; margin-bottom: 30px;height: 30px">
             <p class="ml-3 colorBlue fw-b bottom-right-text" style="padding-right:17px;">电厂</p>
             <div class="fontElec1">755.0</div>

ui/src/views/monitor/elec/center.vue

@@ -49,7 +49,7 @@
         <div>
           <div id="naturalGasChart" style="width:100%;height:3rem;"></div>
         </div>
-        <el-dialog class="my-info-dialog" :visible.sync="openChart" title="瞬时值" @open="open" width="1600px" destroy-on-close append-to-body>
+        <el-dialog class="my-info-dialog" :visible.sync="openChart" title="每日煤耗状态" @open="open" width="1600px" destroy-on-close append-to-body>
           <div id="naturalGasChartDialog" style="width:100%;height:600px;"></div>
         </el-dialog>
       </div>
@@ -494,7 +494,6 @@ export default {
     }
   }
   .bottom-data {
-    margin-top: 10px;
     .item-box {
       float: right;
       position: relative;
@@ -548,7 +547,7 @@ export default {
         position: relative;
         .alarmIcon {
           width: 40px !important;
-          height: 40px !important;
+          //height: 40px !important;
           position: absolute;
           left: 50%;
           top: 50%;
@@ -560,7 +559,7 @@ export default {
         height: 1rem;
       }
       .water {
-        padding-top:30px;
+        padding-top:60px;
         width: 100%;
         height: 2rem;
       }

ui/src/views/monitor/elec/echart/bottom/bottomLeftChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div @click="opnenDialg">
-    <div id="bottomLeftChart" style="width:11.25rem;height:6.25rem;"></div>
+    <div id="bottomLeftChart" style="width:11.25rem;height:5.9rem;"></div>
     <el-dialog class="my-info-dialog" :visible.sync="openChart" title="蒸汽消耗" @open="open" width="1600px" destroy-on-close append-to-body>
       <div id="bottomLeftChart2" style="width:100%;height:600px;"></div>
     </el-dialog>
@@ -120,7 +120,7 @@ export default {
       for (let i = 0; i < 33; i++) {
         let rate = barData[i] / lineData[i];
         rateData[i] = rate.toFixed(2);
-      };
+      }
 
       let option = {
         title: {
@@ -383,7 +383,7 @@ export default {
       for (let i = 0; i < 33; i++) {
         let rate = barData[i] / lineData[i];
         rateData[i] = rate.toFixed(2);
-      };
+      }
 
       let option = {
         title: {
@@ -410,9 +410,6 @@ export default {
         legend: {
           data: ['HHP','HP','LP','MP','总消耗'],
           // data: ['Discharged','Planned emission','Emission rate'],
-          textStyle: {
-            color: "#B4B4B4"
-          },
           top: "0%"
         },
         grid: {
@@ -422,11 +419,6 @@ export default {
         },
         xAxis: {
           data: category,
-          axisLine: {
-            lineStyle: {
-              color: "#B4B4B4"
-            }
-          },
           axisTick: {
             show: false
           }
@@ -434,23 +426,12 @@ export default {
         yAxis: [
           {
             splitLine: { show: false },
-            axisLine: {
-              lineStyle: {
-                color: "#B4B4B4"
-              }
-            },
-
             axisLabel: {
               formatter: "{value} "
             }
           },
           {
             splitLine: { show: false },
-            axisLine: {
-              lineStyle: {
-                color: "#B4B4B4"
-              }
-            },
             axisLabel: {
               formatter: "{value} "
             }
@@ -463,7 +444,7 @@ export default {
             smooth: true,
             showAllSymbol: true,
             symbol: "emptyCircle",
-            symbolSize: 8,
+            symbolSize: 13,
             yAxisIndex: 1,
             itemStyle: {
               normal: {
@@ -476,7 +457,7 @@ export default {
           {
             name: 'HHP',
             type: "bar",
-            barWidth: 10,
+            barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: 5,
@@ -494,7 +475,7 @@ export default {
             type: "bar",
             barGap: "-100%",
             stack: 'Ad',
-            barWidth: 10,
+            barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: 5,
@@ -514,7 +495,7 @@ export default {
             type: "bar",
             barGap: "-100%",
             stack: 'Ad',
-            barWidth: 10,
+            barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: 5,
@@ -535,7 +516,7 @@ export default {
             type: "bar",
             barGap: "-100%",
             stack: 'Ad',
-            barWidth: 10,
+            barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: 5,

ui/src/views/monitor/elec/echart/bottom/bottomRightChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div @click="openSteamBalance">
-    <div id="bottomRightChart" style="width:100%;height:3.5rem;top: -20px"></div>
+    <div id="bottomRightChart" style="width:100%;height:3rem;top: -40px"></div>
     <el-dialog class="my-info-dialog" :visible.sync="openChart" title="天然气平衡" @open="open" width="1600px" destroy-on-close append-to-body>
       <div id="bottomRightChartDialog" style="width:100%;height:600px;"></div>
     </el-dialog>
@@ -61,7 +61,7 @@ export default {
         weekMaxData.push(maxData);
         var distance = Math.round(Math.random() * 11000 + 500);
         weekLineData.push(distance);
-      };
+      }
       const dateNum = [];
       for (let i = 0; i < this.weekData.length; i++) {
         dateNum[i] = this.weekData[i].evconsume;
@@ -345,7 +345,7 @@ export default {
         weekMaxData.push(maxData);
         var distance = Math.round(Math.random() * 11000 + 500);
         weekLineData.push(distance);
-      };
+      }
       const dateNum = [];
       for (let i = 0; i < this.weekData.length; i++) {
         dateNum[i] = this.weekData[i].evconsume;

ui/src/views/monitor/elec/echart/bottom/bottomRightChart2.vue

@@ -1,6 +1,6 @@
 <template>
   <div @click="openSteamUsed">
-    <div id="bottomRightChart2" style="width:100%;height:3.2rem;">
+    <div id="bottomRightChart2" style="width:100%;height:2.6rem;">
     </div>
     <el-dialog class="my-info-dialog" :visible.sync="openChart" title="瞬时值" @open="open" width="1600px" destroy-on-close append-to-body>
       <div id="bottomRightChart2Dialog" style="width:100%;height:600px;"></div>

ui/src/views/monitor/elec/elecindex.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="elec-index"  ref="appRef">
     <dv-loading v-if="loading">Loading...</dv-loading>
-    <div v-else class="host-body bg">
+    <div v-else class="host-body bg-elec">
       <div class="d-flex jc-center">
         <dv-decoration-10 style="width:33.3%;height:.0625rem;" />
         <div class="d-flex jc-center">
@@ -333,7 +333,7 @@ export default {
   mounted() {
     if(this.dashboard===1){
       this.bgCol1="#1a5cd7"
-    };
+    }
     this.timer = setInterval(()=>{
       const date= dayjs(new Date());
       this.dateDay = date.format('HH:mm:ss');
@@ -487,11 +487,13 @@ export default {
   background-color: #000000;
   width: 100%;
   height: 100vh;
-  .bg {
+  .bg-elec {
     padding: 0.2rem 0.2rem 0 0.2rem;
     background-size: cover;
     background-position: center center;
-    background-image: url("../../../assets/image/pageBg.png");
+    background-image: url("../../../assets/image/elec/bg.jpg");
+    width: 1920px;
+    height: 100%;
   }
 
   .host-body {

ui/src/views/monitor/elec/frontElecTwo.vue

@@ -3,7 +3,7 @@
     <div class="bg-color-black">
       <div class="content-box">
         <div>
-        <img src="@/assets/image/elec/4-1.png" width="1880" height="950px">
+        <img src="@/assets/image/elec/4-1.png" width="1880" height="920px">
 
         </div>
 
@@ -39,7 +39,7 @@
 <style lang="scss">
   #frontTwo {
     padding: 0.2rem;
-    height: 11.7rem;
+    height: 11rem;
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {