Merge branch 'develop' into single-develop

# Conflicts:
#	src/router/ems.js

src/views/ems/dzjk/sbjk/pcs/index.vue

@@ -209,10 +209,10 @@ export default {
       pcsList: [],
       infoData: [
         {
-          label: "总交流有功电率",
+          label: "总交流有功功率",
           attr: "totalActivePower",
           unit: "kW",
-          pointName: "总交流有功电率",
+          pointName: "总交流有功功率",
         },
         {
           label: "当天交流充电量",
@@ -228,10 +228,10 @@ export default {
           pointName: "A相电流",
         },
         {
-          label: "总交流无功电率",
+          label: "总交流无功功率",
           attr: "totalReactivePower",
           unit: "kVar",
-          pointName: "总交流无功电率",
+          pointName: "总交流无功功率",
         },
         {
           label: "当天交流放电量",