李扬

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

@@ -19,24 +19,24 @@
         </div>
       <div class="naturalGasData" style="flex: 1">
         <div style="">
-          <div style="display:flex;flex-direction:row; margin-bottom: 30px">
+          <div style="display:flex;flex-direction:row; margin-bottom: 30px;height: 30px">
             <p class="ml-3 colorBlue fw-b">电厂</p>
             <div class="fontElec1">{{dashboardelecdata.elecp}}</div>
           </div>
         </div>
-        <div style="display:flex;flex-direction:row; margin-bottom: 30px">
+        <div style="display:flex;flex-direction:row; margin-bottom: 30px;height: 30px">
           <p class="ml-3 colorBlue fw-b">合成器</p>
           <div>
             <div class="fontElec1">{{ dashboardelecdata.hechengqi }}</div>
           </div>
         </div>
-        <div style="display:flex;flex-direction:row; margin-bottom: 30px">
+        <div style="display:flex;flex-direction:row; margin-bottom: 30px;height: 30px">
           <p class="ml-3 colorBlue fw-b">剩余U2</p>
           <div>
             <div class="fontElec1">{{dashboardelecdata.u2}}</div>
           </div>
         </div>
-        <div style="display:flex;flex-direction:row; margin-bottom: 30px">
+        <div style="display:flex;flex-direction:row; margin-bottom: 30px;height: 30px">
           <p class="ml-3 colorBlue fw-b">剩余量</p>
           <div style="float: top">
             <div class="fontElec1">{{ dashboardelecdata.evconsume }}</div>

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

@@ -190,18 +190,18 @@ export default {
             data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
             type: 'line',
             itemStyle: {
-              color: 'rgb(213,173,92)'
+              color: 'rgb(24,56,255)'
             },
             symbol: "none",
             areaStyle: {
               color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
                 {
                   offset: 0,
-                  color: 'rgb(239,193,152)'
+                  color: 'rgb(8,32,252)'
                 },
                 {
                   offset: 1,
-                  color: 'rgb(224,148,34)'
+                  color: 'rgb(21,171,231)'
                 }
               ])
             },

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

@@ -10,17 +10,16 @@
       <div class="d-flex jc-center body-box" style=" margin-top: 0;">
         <div id="peakToValley" style="width:100%;height:2.5rem;"></div>
       </div>
-      <div class="d-flex jc-center body-box" style=" margin-top: 0;">
-        <div class="fontElec">{{dashboardelecdata.ypg}}</div>
-        <p>发电量</p>
+      <div class="d-flex jc-center body-box" style=" margin-top: 0;height: 60px">
+        <div class="fontElec"><p class="title-p">发电量</p><p class="title-p2">{{dashboardelecdata.ypg}}</p></div>
       </div>
-      <div class="d-flex jc-center body-box" style=" margin-top: 0;">
-        <div class="fontElec">{{dashboardelecdata.daodianliang}}</div>
-        <p>倒电量</p>
+      <div class="d-flex jc-center body-box" style=" margin-top: 0;height: 60px">
+        <div class="fontElec"><p class="title-p">倒电量</p> <p class="title-p2">{{dashboardelecdata.daodianliang}}</p></div>
+
       </div>
-      <div class="d-flex jc-center body-box" style=" margin-top: 0;">
-        <div class="fontElec">{{dashboardelecdata.eveLec}}</div>
-        <p>用电量</p>
+      <div class="d-flex jc-center body-box" style=" margin-top: 0;height: 60px">
+        <div class="fontElec"><p class="title-p">用电量</p><p class="title-p2">{{dashboardelecdata.eveLec}}</p>p</div>
+
       </div>
     </div>
   </div>
@@ -133,13 +132,23 @@
       overflow: hidden;
     }
   }
-
-  .fontElec {
-    width:100px;
+  .title-p{
+    font-size: 16px;
+    float: left;
+  }
+  .title-p2{
     margin-left: 0.3rem;
-    padding-top: 0.25rem;
+    width:100px;
     color: #cfe5ea;
     font:30px/15px 'ds-digitalbold';
-    text-align:center;
+    float: left;
+  }
+  .fontElec {
+    //width:100px;
+    //margin-left: 0.3rem;
+    //padding-top: 0.25rem;
+    //color: #cfe5ea;
+    //font:30px/15px 'ds-digitalbold';
+    //text-align:center;
   }
 </style>