LY

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

@@ -42,7 +42,7 @@ export default {
     border-radius: 0.125rem;
   }
   .text {
-    color: #c3cbde;
+    color: #ffffff;
   }
   .chart-box {
     margin-top: 0.2rem;

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

@@ -81,7 +81,7 @@ export default {
     border-radius: 0.125rem;
   }
   .text {
-    color: #c3cbde;
+    color: #ffffff;
   } //下滑线动态
   .decoration2 {
     position: absolute;

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

@@ -43,7 +43,7 @@
                   <icon name="chart-bar"></icon>
                 </span>
           <div class="d-flex">
-            <span class="fs-xl text mx-2">每日能耗状态</span>
+            <span class="fs-xl text mx-2">每日煤耗状态</span>
           </div>
         </div>
         <div>

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

@@ -27,16 +27,16 @@
         <div id="fourGTGyChart" style="width:100%;height:2rem;"></div>
       </div>
     </div>
-      <el-dialog class="my-info-dialog" :visible.sync="openChartOne" title="2#发电机趋势" @open="open1" width="1600px" destroy-on-close append-to-body>
+      <el-dialog class="my-info-dialog" :visible.sync="openChartOne" title="3#GTG" @open="open1" width="1600px" destroy-on-close append-to-body>
         <div id="oneGTGyChart1" style="width:100%;height:600px;"></div>
       </el-dialog>
-    <el-dialog class="my-info-dialog" :visible.sync="openChartTwo" title="1#发电机趋势" @open="open2" width="1600px" destroy-on-close append-to-body>
+    <el-dialog class="my-info-dialog" :visible.sync="openChartTwo" title="STG" @open="open2" width="1600px" destroy-on-close append-to-body>
       <div id="twoGTGyChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
-    <el-dialog class="my-info-dialog" :visible.sync="openChartThree" title="4#发电机趋势" @open="open3" width="1600px" destroy-on-close append-to-body>
+    <el-dialog class="my-info-dialog" :visible.sync="openChartThree" title="1#GTG" @open="open3" width="1600px" destroy-on-close append-to-body>
       <div id="threeGTGyChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
-    <el-dialog class="my-info-dialog" :visible.sync="openChartFour" title="3#发电机趋势" @open="open4" width="1600px" destroy-on-close append-to-body>
+    <el-dialog class="my-info-dialog" :visible.sync="openChartFour" title="2#GTG" @open="open4" width="1600px" destroy-on-close append-to-body>
       <div id="fourGTGyChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
   </div>
@@ -199,7 +199,7 @@ export default {
           containLabel: true
         },
         title: {
-          text: '2#发电机',
+          text: '3#GTG',
           textAlign: 'center',
           x: 'center',
           y: '1px',
@@ -311,7 +311,7 @@ export default {
           containLabel: true
         },
         title: {
-          text: '1#发电机',
+          text: 'STG',
           textAlign: 'center',
           x: 'center',
           y: '1px',
@@ -434,7 +434,7 @@ export default {
           containLabel: true
         },
         title: {
-          text: '4#发电机',
+          text: '1#GTG',
           textAlign: 'center',
           x: 'center',
           y: '1px',
@@ -558,7 +558,7 @@ export default {
           containLabel: true
         },
         title: {
-          text: '3#发电机',
+          text: '2#GTG',
           textAlign: 'center',
           x: 'center',
           y: '1px',
@@ -620,7 +620,7 @@ export default {
           containLabel: true
         },
         title: {
-          text: '3#发电机',
+          text: '2#GTG',
           textAlign: 'center',
           x: 'center',
           y: '1px',
@@ -694,7 +694,7 @@ export default {
     }
   }
   .text {
-    color: #c3cbde;
+    color: #ffffff;
   }
   .chart-box {
     margin-top: 0.2rem;

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

@@ -42,7 +42,7 @@ export default {
     border-radius: 0.125rem;
   }
   .text {
-    color: #c3cbde;
+    color: #ffffff;
   }
   .chart-box {
     margin-top: 0.2rem;

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

@@ -17,7 +17,7 @@
           <icon name="chart-line"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">BOC购电情况</span>
+          <span class="fs-xl text mx-2">BYC购电情况</span>
         </div>
       </div>
       <div class="d-flex jc-center body-box" @click="openBOCdialog">
@@ -27,7 +27,7 @@
     <el-dialog class="my-info-dialog" :visible.sync="openChartBYCChart" title="BYC用电情况" @open="openBYC" width="1600px" destroy-on-close append-to-body>
       <div id="BYCChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
-    <el-dialog class="my-info-dialog" :visible.sync="openChartBOCChart" title="BOC购电情况" @open="openBOC" width="1600px" destroy-on-close append-to-body>
+    <el-dialog class="my-info-dialog" :visible.sync="openChartBOCChart" title="BYC购电情况" @open="openBOC" width="1600px" destroy-on-close append-to-body>
       <div id="BOCChart1" style="width:100%;height:600px;"></div>
     </el-dialog>
   </div>
@@ -311,7 +311,7 @@ export default {
     border-radius: 0.125rem;
   }
   .text {
-    color: #c3cbde;
+    color: #ffffff;
   }
   .body-box {
     border-radius: 0.125rem;

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

@@ -1,7 +1,7 @@
 <template>
   <div id="centreRight2">
     <div class="bg-color-black">
-      
+
       <div class="d-flex jc-center body-box center-text" style=" margin-top: 0;height: 60px">
         <div class="fontElec"><p class="title-p">发电量</p><p class="title-p2">{{this.dashboarddayelec.ypg}}</p></div>
       </div>
@@ -125,7 +125,7 @@
 
 <style lang="scss">
   .center-text{
-    margin-left:80px;
+    margin-left:40px;
   }
   #centreRight2 {
     padding: 0.0625rem;
@@ -138,7 +138,7 @@
       border-radius: 0.125rem;
     }
     .text {
-      color: #c3cbde;
+      color: #ffffff;
     }
     .body-box {
       border-radius: 0.125rem;
@@ -150,7 +150,7 @@
     float: left;
   }
   .title-p2{
-
+    margin-left:20px;
     color: #cfe5ea;
     font:30px/15px 'ds-digitalbold';
     float: left;

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

@@ -262,7 +262,8 @@ export default {
               color: "rgba(255,255,255,.8)",
               fontSize: 12
             },
-            data: weekCategory
+            data: ['08:00' ,'11:00' ,'14:00' ,'17:00' ,'20:00' ,'23:00' ,'02:00' ,'05:00' ]
+            // data: weekCategory
           },
 
         yAxis: {
@@ -270,8 +271,8 @@ export default {
         },
         series: [
           {
-            // data: [820, 932, 901, 934, 1290, 1330, 1320],
-            data:dateNum,
+            data: [99, 180, 200, 310, 459, 601, 800 ,933],
+            // data:dateNum,
             type: 'line',
             smooth: true,
             symbolSize: 15,
@@ -284,13 +285,14 @@ export default {
               data: [
                 {
                   type: "average",
-                  name: "平均值"
+                  name: "额定值",
+                  yAxis: 900
                 }
               ],
               precision: 0,
               label: {
                 normal: {
-                  formatter: "平均值: \n {c}"
+                  formatter: "额定值: \n {c}"
                 }
               },
               lineStyle: {

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">
+    <div v-else class="host-body bg">
       <div class="d-flex jc-center">
         <dv-decoration-10 style="width:33.3%;height:.0625rem;" />
         <div class="d-flex jc-center">
@@ -483,7 +483,7 @@ export default {
 
 <style lang="scss">
 #elec-index {
-  color: #d3d6dd;
+  color: #ffffff;
   background-color: #000000;
   width: 100%;
   height: 100vh;
@@ -611,6 +611,6 @@ export default {
   right: 80px;
 }
 .fs-xl {
-  font-size: 0.14rem;
+  font-size: 0.18rem;
 }
 </style>

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

@@ -125,7 +125,7 @@
       border-radius: 0.125rem;
     }
     .text {
-      color: #c3cbde;
+      color: #ffffff;
     }
     .chart-box {
       margin-top: 0.2rem;

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

@@ -47,7 +47,7 @@
       border-radius: 0.125rem;
     }
     .text {
-      color: #c3cbde;
+      color: #ffffff;
     }
     .chart-box {
       margin-top: 0.2rem;