调整kWh单位问题

ems-ui/src/components/Block/charts/LineChartBlock.vue

@@ -39,7 +39,7 @@ const opts = {
   },
   yAxis: {
     type: 'value',
-    name: 'kwh',
+    name: 'kW·h',
     minInterval: 1,
     nameLocation: 'middle',
     nameTextStyle: {
@@ -106,7 +106,7 @@ export default {
         data: legend,
       };
       option.xAxis = this.optCfg.xAxis;
-      option.yAxis.name = this.optCfg.unit || "kwh"
+      option.yAxis.name = this.optCfg.unit || "kW·h"
       option && this.refCharts && this.refCharts.setOption(option);
       this.refCharts.resize();
     },

ems-ui/src/views/basecfg/cacfg/index.vue

@@ -87,7 +87,7 @@
           <el-input v-model="form.regionName" placeholder="请输入地区名称" />
         </el-form-item>
         <el-form-item label="因子值" prop="factorValue">
-          <el-input v-model="form.factorValue" placeholder="请输入因子值 单位: kgCO2/kWh" />
+          <el-input v-model="form.factorValue" placeholder="请输入因子值 单位: kgCO2/kW·h" />
         </el-form-item>
         <el-form-item label="数据版本" prop="version">
           <el-input v-model="form.version" placeholder="请输入数据版本" />

ems-ui/src/views/basecfg/price/index.vue

@@ -54,7 +54,7 @@
             <el-form-item label="变压器容量(kVA/月)" prop="transCapacity" v-if="attrForm.reqCapacityFlag === 1">
               <el-input v-model="attrForm.transCapacity" placeholder="请输入变压器容量" />
             </el-form-item>
-            <el-form-item label="最大需量(kWh/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
+            <el-form-item label="最大需量(kW·h/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
               <el-input v-model="attrForm.reqQuantity" placeholder="请输入最大需量" />
             </el-form-item>
           </el-form>

ems-ui/src/views/largeScreen/device/left.vue

@@ -65,19 +65,19 @@ export default {
         {
           name: "光伏发电量",
           value: 86.3,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg1.png"),
         },
         {
           name: "负荷消耗",
           value: 82.1,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg3.png"),
         },
         {
           name: "入网",
           value: 78.09,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg4.png"),
         },
       ],
@@ -118,13 +118,13 @@ export default {
           name: "今日充电",
           image: require("@/assets/images/home/icon1.png"),
           value: 250,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "今日放电",
           image: require("@/assets/images/home/icon2.png"),
           value: 58,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "电池温度",

ems-ui/src/views/largeScreen/home/left.vue

@@ -65,19 +65,19 @@ export default {
         {
           name: "光伏发电量",
           value: 86.3,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg1.png"),
         },
         {
           name: "负荷消耗",
           value: 82.1,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg3.png"),
         },
         {
           name: "入网",
           value: 78.09,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg4.png"),
         },
       ],
@@ -148,13 +148,13 @@ export default {
           name: "今日充电",
           image: require("@/assets/images/home/icon1.png"),
           value: 250,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "今日放电",
           image: require("@/assets/images/home/icon2.png"),
           value: 58,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "电池温度",

ems-ui/src/views/largeScreen/net/left.vue

@@ -33,17 +33,17 @@ export default {
         {
           name: "今日上网电量",
           value: 321,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "本月上网电量",
           value: 9521,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "今年上网电量",
           value: 12342,
-          unit: "kWh",
+          unit: "kW·h",
         },
       ],
       lineData: [],
@@ -93,7 +93,7 @@ export default {
         },
         yAxis: [{
           type: "value",
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {
@@ -179,7 +179,7 @@ export default {
           trigger: "axis",
         },
         yAxis: {
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {

ems-ui/src/views/largeScreen/soc/left.vue

@@ -116,7 +116,7 @@ export default {
           trigger: "axis",
         },
         yAxis: {
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {

ems-ui/src/views/largeScreen/soc/right.vue

@@ -51,7 +51,7 @@ export default {
           name: "电",
           image: require("@/assets/images/soc/item1.png"),
           value: 345,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "燃气",
@@ -196,7 +196,7 @@ export default {
         },
         yAxis: [{
           type: "value",
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {

ems-ui/src/views/largeScreen/source/left.vue

@@ -3,7 +3,7 @@
     <CusModule title="光伏发电量">
       <div class="elec-top-bar">
         <span class="elec-content">
-          今日发电量<span class="elec-value">321</span><span class="unit"> kWh</span>
+          今日发电量<span class="elec-value">321</span><span class="unit"> kW·h</span>
         </span>
       </div>
       <div class="elec-items-container">
@@ -58,13 +58,13 @@ export default {
         {
           name: "今年发电量",
           value: 12034,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/l1-item2.png"),
         },
         {
           name: "累计发电量",
           value: 95312,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/l1-item3.png"),
         },
       ],
@@ -107,7 +107,7 @@ export default {
           trigger: "axis",
         },
         yAxis: {
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {

ems-ui/src/views/largeScreen/source/right.vue

@@ -106,7 +106,7 @@ export default {
           trigger: "axis",
         },
         yAxis: {
-          name: "kWh",
+          name: "kW·h",
           splitLine: {
             show: true,
             lineStyle: {

ems-ui/src/views/largeScreen/storage/left.vue

@@ -65,19 +65,19 @@ export default {
         {
           name: "光伏发电量",
           value: 86.3,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg1.png"),
         },
         {
           name: "负荷消耗",
           value: 82.1,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg3.png"),
         },
         {
           name: "入网",
           value: 78.09,
-          unit: "kWh",
+          unit: "kW·h",
           image: require("@/assets/images/source/item_bg4.png"),
         },
       ],
@@ -118,13 +118,13 @@ export default {
           name: "今日充电",
           image: require("@/assets/images/home/icon1.png"),
           value: 250,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "今日放电",
           image: require("@/assets/images/home/icon2.png"),
           value: 58,
-          unit: "kWh",
+          unit: "kW·h",
         },
         {
           name: "电池温度",

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

@@ -40,7 +40,7 @@
                   <el-table-column
                     prop="meteredValue"
                     align="center"
-                    :label="`商户用量(${queryParams.meterCls === 45 ? 'kWh' : '吨'})`">
+                    :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 ? 'kWh' : '吨'})`">
+                    :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 ? 'kWh' : '吨'})`">
+                    :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 ? 'kWh' : '吨'})`">
+                    :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 ? 'kWh' : '吨'})`">
+                    :label="`用量(${queryParams.meterCls === 45 ? 'kW·h' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -364,7 +364,7 @@ export default {
           },
           yAxis: [
             {
-              name: meterCls === 45 ? 'kWh（千瓦时）' : '吨',
+              name: meterCls === 45 ? 'kW·h（千瓦时）' : '吨',
               type: 'value'
             },
             {
@@ -450,7 +450,7 @@ export default {
         },
         yAxis: [
           {
-            name: meterCls === 45 ? 'kWh（千瓦时）' : '吨',
+            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="当日供电量【单位：kWh】" :opt-cfg="elecQuantity">
+            <PieChartBlock title="当日供电量【单位：kW·h】" :opt-cfg="elecQuantity">
             </PieChartBlock>
           </el-col>
           <el-col :span="12">
@@ -59,7 +59,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="单位电价(￥)" align="center" prop="meterUnitPrice" />
-              <el-table-column label="供电量(kWh)" 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]"
@@ -102,9 +102,9 @@
                   <span>{{ scope.row.time }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="总发电量(kWh)" align="center" prop="genElecQuantity" />
-              <el-table-column label="自用电量(kWh)" align="center" prop="useElecQuantity" />
-              <el-table-column label="上网电量(kWh)" 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]"
@@ -296,7 +296,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kWh（千瓦时）',
+            name: 'kW·h（千瓦时）',
             type: 'value'
           },
           {
@@ -362,7 +362,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kWh（千瓦时）',
+            name: 'kW·h（千瓦时）',
             type: 'value'
           },
           {
@@ -446,7 +446,7 @@ export default {
   },
   methods: {
     getLabelContentForElecQuantity () {
-      return `总供电{totalSupply|${this.totalSupply} kWh}`;
+      return `总供电{totalSupply|${this.totalSupply} kW·h}`;
     },
     getLabelContentForElecCost () {
       return `供电成本{totalCost|${this.totalCost} 元}`;

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

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

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

@@ -22,7 +22,7 @@
               <el-table  border stripe show-summary :data="tableData"  style="width: 100%;margin-top: 20px;">
                 <el-table-column prop="name" align="center" label="设施名称" >
                 </el-table-column>
-                <el-table-column prop="value" align="center" label="能耗(kWh)" >
+                <el-table-column prop="value" align="center" label="能耗(kW·h)" >
                 </el-table-column>
               </el-table>
             </div>
@@ -71,7 +71,7 @@
                   <span>{{ scope.row.objName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="用电量(kWh)" align="center" prop="elecQuantity">
+              <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity">
                 <template slot-scope="scope">
                   <span>{{ scope.row.elecQuantity }}</span>
                 </template>
@@ -100,7 +100,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="时间序列" align="center" prop="timeIndex" />
-              <el-table-column label="用电量(kWh)" align="center" prop="elecQuantity" />
+              <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity" />
             </el-table>
 
             <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -268,7 +268,7 @@ export default {
           data: xAxisData
         },
         yAxis: {
-          name: 'kWh（千瓦时）',
+          name: 'kW·h（千瓦时）',
           type: 'value',
         },
         series: [{
@@ -375,7 +375,7 @@ export default {
             const subentries = params.data.subentry;
             let tooltipContent = `<div><h4>${name}</h4><p>${value} (${percent}%)</p><ul>`;
             subentries.forEach(subItem => {
-              tooltipContent += `<li>${subItem.name}: ${subItem.value} kWh</li>`;
+              tooltipContent += `<li>${subItem.name}: ${subItem.value} kW·h</li>`;
             });
             tooltipContent += `</ul></div>`;
             return tooltipContent;

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="发电量(kWh)" 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">