Selaa lähdekoodia

修改负荷平均功率

luogang 9 kuukautta sitten
vanhempi
commit
275f1e22df

+ 7 - 2
ems-ui/src/views/analysis/power/consume.vue

@@ -14,7 +14,8 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <div class="container-block">
-          <div style="display: flex;justify-content: space-between;">
+          <el-card>
+            <div style="display: flex;justify-content: space-between;">
             <SubTitle :title="`平均功率【${selectedLabel}】`" />
             <el-button-group>
               <el-button v-for="item in btnGroup" :key="item.name" size="mini"
@@ -63,7 +64,9 @@
             <el-table-column label="功率因素" align="center" prop="pf" width="100" />
           </el-table>
           <BaseChart v-else width="100%" height="400px" :option="powerLineOptions" />
-          <div style="display: flex;justify-content: space-between;">
+          </el-card>
+          <el-card style="margin-top: 10px;">
+            <div style="display: flex;justify-content: space-between;">
             <SubTitle :title="`最大功率【${selectedLabel}】`" />
             <el-date-picker v-model="maxPowerDate" type="daterange" @change="getDayMaxLoad"
               :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
@@ -71,6 +74,8 @@
             </el-date-picker>
           </div>
           <BaseChart width="100%" height="400px" :option="maxLoadLineOptions" />
+          </el-card>
+
         </div>
       </el-col>
     </el-row>

+ 2 - 0
ems-ui/src/views/analysis/power/prod.vue

@@ -13,6 +13,7 @@
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
+       <el-card>
         <div class="container-block">
           <div style="display: flex;justify-content: space-between;">
             <SubTitle :title="`发电量【${selectedLabel}】`" />
@@ -37,6 +38,7 @@
           </el-table>
           <BaseChart v-else width="100%" height="500px" :option="elecOptions" />
         </div>
+       </el-card>
       </el-col>
     </el-row>
   </div>