千瓦时单位

ems-ui/src/views/analysis/power/save.vue

@@ -109,8 +109,8 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="充电电量(kW-h)" align="center" prop="chargeElecQuantity" />
-      <el-table-column label="放电电量(kW-h)" align="center" prop="dischargeElecQuantity" />
+      <el-table-column label="充电电量(kW.h)" align="center" prop="chargeElecQuantity" />
+      <el-table-column label="放电电量(kW.h)" align="center" prop="dischargeElecQuantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/mgr/charging.vue

@@ -40,7 +40,7 @@
                   <el-table-column
                     prop="meteredValue"
                     align="center"
-                    :label="`商户用量(${queryParams.meterCls === 45 ? 'kW-h' : '吨'})`">
+                    :label="`商户用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -50,7 +50,7 @@
                   <el-table-column
                     prop="sharedValue"
                     align="center"
-                    :label="`公摊用量(${queryParams.meterCls === 45 ? 'kW-h' : '吨'})`">
+                    :label="`公摊用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -60,7 +60,7 @@
                   <el-table-column
                     prop="totalValue"
                     align="center"
-                    :label="`总用量(${queryParams.meterCls === 45 ? 'kW-h' : '吨'})`">
+                    :label="`总用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -87,7 +87,7 @@
                   <el-table-column
                     prop="meteredValue"
                     align="center"
-                    :label="`用量(${queryParams.meterCls === 45 ? 'kW-h' : '吨'})`">
+                    :label="`用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -121,7 +121,7 @@
                   <el-table-column
                     prop="meteredValue"
                     align="center"
-                    :label="`用量(${queryParams.meterCls === 45 ? 'kW-h' : '吨'})`">
+                    :label="`用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -364,7 +364,7 @@ export default {
           },
           yAxis: [
             {
-              name: meterCls === 45 ? 'kW-h（千瓦时）' : '吨',
+              name: meterCls === 45 ? 'kW·h（千瓦时）' : '吨',
               type: 'value'
             },
             {
@@ -450,7 +450,7 @@ export default {
         },
         yAxis: [
           {
-            name: meterCls === 45 ? 'kW-h（千瓦时）' : '吨',
+            name: meterCls === 45 ? 'kW·h（千瓦时）' : '吨',
             type: 'value'
           },
           {

ems-ui/src/views/mgr/powergrid.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="总览" name="summery">
         <el-row type="flex" :gutter="20" style="margin-top: 20px">
           <el-col :span="12">
-            <PieChartBlock title="当日供电量（单位：kw·h）" :opt-cfg="elecQuantity"/>
+            <PieChartBlock title="当日供电量（单位：kW·h）" :opt-cfg="elecQuantity"/>
           </el-col>
           <el-col :span="12">
             <PieChartBlock title="当日电费（单位：元）" :opt-cfg="elecCost"></PieChartBlock>
@@ -68,7 +68,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="单位电价(￥)" align="center" prop="meterUnitPrice"/>
-              <el-table-column label="供电量(kW-h)" align="center" prop="useElecQuantity"/>
+              <el-table-column label="供电量(kW·h)" align="center" prop="useElecQuantity"/>
               <el-table-column label="供电电费(￥)" align="center" prop="useElecCost"/>
             </el-table>
             <pagination :total="total" :page-size.sync="queryParams.pageSize" :page-sizes="[10, 20, 50]"
@@ -124,9 +124,9 @@
                   <span>{{ scope.row.time }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="总发电量(kW-h)" align="center" prop="genElecQuantity"/>
-              <el-table-column label="自用电量(kW-h)" align="center" prop="useElecQuantity"/>
-              <el-table-column label="上网电量(kW-h)" align="center" prop="upElecQuantity"/>
+              <el-table-column label="总发电量(kW·h)" align="center" prop="genElecQuantity"/>
+              <el-table-column label="自用电量(kW·h)" align="center" prop="useElecQuantity"/>
+              <el-table-column label="上网电量(kW·h)" align="center" prop="upElecQuantity"/>
               <el-table-column label="上网收益(￥)" align="center" prop="upElecEarn"/>
             </el-table>
             <pagination :total="total" :page-size.sync="queryParams.pageSize" :page-sizes="[10, 20, 50]"
@@ -268,7 +268,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW-h（千瓦时）',
+            name: 'kW·h（千瓦时）',
             type: 'value'
           },
           {
@@ -327,7 +327,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW-h（千瓦时）',
+            name: 'kW·h（千瓦时）',
             type: 'value'
           },
           {

ems-ui/src/views/mgr/powerstore.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="tabClick">
       <el-tab-pane label="总览" name="summary">
         <div class="chartGroup">
-          <Block title="当日充电量（单位：kw·h）">
+          <Block title="当日充电量（单位：kW·h）">
             <div class="block-area" slot="main">
               <div class="center-label">
                 <div>总充电量</div>
@@ -12,7 +12,7 @@
               <BaseChart width="100%" height="500px" :option="chargePieOptions"/>
             </div>
           </Block>
-          <Block title="当日放电量（单位：kw·h）">
+          <Block title="当日放电量（单位：kW·h）">
             <div class="block-area" slot="main">
               <div class="center-label">
                 <div>总放电量</div>
@@ -64,8 +64,8 @@
               </el-table-column>
               <el-table-column label="时间" align="center" prop="time">
               </el-table-column>
-              <el-table-column label="充电电量(kW-h)" align="center" prop="chargeElecQuantity"/>
-              <el-table-column label="放电电量(kW-h)" align="center" prop="dischargeElecQuantity"/>
+              <el-table-column label="充电电量(kW·h)" align="center" prop="chargeElecQuantity"/>
+              <el-table-column label="放电电量(kW·h)" align="center" prop="dischargeElecQuantity"/>
             </el-table>
           </div>
         </el-col>
@@ -175,7 +175,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW-h（千瓦时）',
+            name: 'kW·h（千瓦时）',
             type: 'value'
           }
         ],

ems-ui/src/views/mgr/poweruse.vue

@@ -47,7 +47,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="时间序列" align="center" prop="timeIndex"/>
-              <el-table-column label="用电量(kW-h)" align="center" prop="elecQuantity"/>
+              <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity"/>
             </el-table>
 
             <pagination

ems-ui/src/views/prediction/prod.vue

@@ -109,7 +109,7 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="发电量(kW-h)" align="center" prop="elecProdQuantity" />
+      <el-table-column label="发电量(kW·h)" align="center" prop="elecProdQuantity" />
       <el-table-column label="功率(W)" align="center" prop="avgPower" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">