调整树形结构

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

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

ems-ui/src/views/alarm/alarm-info/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false" :filter-node-method="filterNode"
+          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
             node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
@@ -388,11 +388,12 @@ export default {
     },
     getAreaTree (tier) {
       areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data;
-        this.queryParams.areaCode =response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.queryParams.areaCode = '-1'
       });
     },
      // 筛选节点

ems-ui/src/views/alarm/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false" :filter-node-method="filterNode"
+          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
             node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
@@ -229,10 +229,12 @@ export default {
      async getAreaTreeByTag (tier) {
       await areaTreeSelect(tier).then(response => {
         this.areaOptions = response.data
-        this.queryParams.areaCode =response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.queryParams.areaCode = '-1'
       })
     },
     // 筛选节点

ems-ui/src/views/analysis/device/warn.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container power-index-content">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false"  :filter-node-method="filterNode" node-key="id" highlight-current @node-click="handleNodeClick" />
+          <el-tree ref="tree" :data="areaOptions" :default-expand-all="true" :expand-on-click-node="false"  :filter-node-method="filterNode" node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
@@ -130,7 +130,6 @@ export default {
   watch: {
     // 根据名称筛选区域树
     areaName (val) {
-      debugger
       this.$refs.tree.filter(val)
     }
   },
@@ -142,11 +141,12 @@ export default {
     /** 查询区域树结构 */
     async getAreaTreeByTag (tier) {
       await areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data
-        this.areaCode = response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.areaCode = '-1'
       })
     },
     // 筛选节点

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="最大需量(kW·h/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
+            <el-form-item label="最大需量(kWh/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
               <el-input v-model="attrForm.reqQuantity" placeholder="请输入最大需量" />
             </el-form-item>
           </el-form>

ems-ui/src/views/devmgr/el/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false" :filter-node-method="filterNode"
+          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
             node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
-      <el-col :span="20" :xs="24">
+      <el-col :span="18" :xs="24" >
         <el-tabs v-model="queryParams.objType" @tab-click="resetQuery">
           <el-tab-pane v-for="dict in dict.type.device_type" :key="dict.value" :label="dict.label" :name="dict.value">
           </el-tab-pane>
@@ -62,7 +62,7 @@
             <template slot-scope="scope">
               <span v-if="scope.row.objType">({{ dict.type.device_type[scope.row.objType].label }}) {{
                 scope.row.objName
-              }}</span>
+                }}</span>
               <span v-else>({{ dict.type.device_type[scope.row.objType].label }}){{ scope.row.objName }}</span>
             </template>
           </el-table-column>
@@ -304,11 +304,12 @@ export default {
     /** 查询区域树结构 */
     async getAreaTreeByTag (tier) {
       await areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data
-        this.queryParams.areaCode =response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.queryParams.areaCode = '-1'
       })
     },
     // 筛选节点

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 ? 'kWh' : '吨'})`">
                     <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 ? 'kWh' : '吨'})`">
                     <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 ? 'kWh' : '吨'})`">
                     <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 ? 'kWh' : '吨'})`">
                     <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 ? 'kWh' : '吨'})`">
                     <template slot-scope="scope">
                       {{ scope.row.meteredValue }}
                     </template>
@@ -364,7 +364,7 @@ export default {
           },
           yAxis: [
             {
-              name: meterCls === 45 ? 'kW·h（千瓦时）' : '吨',
+              name: meterCls === 45 ? 'kWh（千瓦时）' : '吨',
               type: 'value'
             },
             {
@@ -450,7 +450,7 @@ export default {
         },
         yAxis: [
           {
-            name: meterCls === 45 ? 'kW·h（千瓦时）' : '吨',
+            name: meterCls === 45 ? 'kWh（千瓦时）' : '吨',
             type: 'value'
           },
           {

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

@@ -4,46 +4,42 @@
       <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="当日供电量【单位：kWh】" :opt-cfg="elecQuantity">
             </PieChartBlock>
           </el-col>
           <el-col :span="12">
-            <PieChartBlock title="当日电费【单位：元】" :opt-cfg="elecCost" >
+            <PieChartBlock title="当日电费【单位：元】" :opt-cfg="elecCost">
             </PieChartBlock>
           </el-col>
         </el-row>
         <el-row type="flex" :gutter="20" style="margin-top: 20px">
           <el-col :span="24">
-            <BarChartBlock title="当日供电量柱状图" :opt-cfg="pvSupplyIndex"/>
+            <BarChartBlock title="当日供电量柱状图" :opt-cfg="pvSupplyIndex" />
           </el-col>
         </el-row>
       </el-tab-pane>
       <el-tab-pane label="市电" name="first">
         <el-col :span="4" :xs="24">
           <div class="head-container">
-            <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small"
-                      prefix-icon="el-icon-search"
-                      style="margin-bottom: 20px"
-            />
+            <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small" prefix-icon="el-icon-search"
+              style="margin-bottom: 20px" />
           </div>
           <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
             <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false"
-                     :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-                     @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;"
-            />
+              :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+              @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;" />
           </div>
         </el-col>
         <el-col :span="20" :xs="24">
           <div class="container-block">
-            <SubTitle :title="`时段供电数据【${selectedLabel}】`"/>
-            <BaseChart width="100%" height="300px" :option="elecOptions"/>
+            <SubTitle :title="`时段供电数据【${selectedLabel}】`" />
+            <BaseChart width="100%" height="300px" :option="elecOptions" />
           </div>
           <div class="container-block">
             <div class="ctl-container">
               <el-date-picker v-model="dateRange" type="datetimerange" @change="getList"
-                              value-format="yyyy-MM-dd hh:mm:ss" :picker-options="pickerOptions" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期" align="right"
-              >
+                value-format="yyyy-MM-dd hh:mm:ss" :picker-options="pickerOptions" range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" align="right">
               </el-date-picker>
             </div>
             <el-table v-loading="loading" :data="pgSupplyHList">
@@ -62,43 +58,37 @@
                   <span>{{ getMeterTypeName(scope.row.meterType) }}</span>
                 </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="供电电费(￥)" align="center" prop="useElecCost"/>
+              <el-table-column label="单位电价(￥)" align="center" prop="meterUnitPrice" />
+              <el-table-column label="供电量(kWh)" 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]"
-                        :page.sync="queryParams.pageNum" @pagination="getList"
-            />
+              :page.sync="queryParams.pageNum" @pagination="getList" />
           </div>
         </el-col>
       </el-tab-pane>
       <el-tab-pane label="光伏" name="second">
         <el-col :span="4" :xs="24">
           <div class="head-container">
-            <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small"
-                      prefix-icon="el-icon-search"
-                      style="margin-bottom: 20px"
-            />
+            <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small" prefix-icon="el-icon-search"
+              style="margin-bottom: 20px" />
           </div>
           <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
             <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false"
-                     :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-                     @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;"
-            />
+              :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+              @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;" />
           </div>
         </el-col>
         <el-col :span="20" :xs="24">
           <div class="container-block">
-            <SubTitle :title="`时段发电数据【${selectedLabel}】`"/>
-            <BaseChart width="100%" height="300px" :option="pvOptions"/>
+            <SubTitle :title="`时段发电数据【${selectedLabel}】`" />
+            <BaseChart width="100%" height="300px" :option="pvOptions" />
           </div>
           <div class="container-block">
             <div class="ctl-container">
               <el-date-picker v-model="dateRange" type="datetimerange" @change="getList" :picker-options="pickerOptions"
-                              value-format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              align="right"
-              >
+                value-format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                align="right">
               </el-date-picker>
             </div>
             <el-table v-loading="loading" :data="pvSupplyHList">
@@ -112,14 +102,13 @@
                   <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="上网收益(￥)" align="center" prop="upElecEarn"/>
+              <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="上网收益(￥)" align="center" prop="upElecEarn" />
             </el-table>
             <pagination :total="total" :page-size.sync="queryParams.pageSize" :page-sizes="[10, 20, 50]"
-                        :page.sync="queryParams.pageNum" @pagination="getList"
-            />
+              :page.sync="queryParams.pageNum" @pagination="getList" />
           </div>
         </el-col>
       </el-tab-pane>
@@ -128,15 +117,15 @@
 </template>
 
 <script>
-import { ApiCode } from '@/api/apiEmums'
-import { areaWithFacsCategoryAsTree } from '@/api/basecfg/area'
-import { get } from '@/api/commonApi'
-import { listPgSupplyH, listPvSupplyH } from '@/api/mgr/pgSupplyH'
+import {ApiCode} from '@/api/apiEmums'
+import {areaWithFacsCategoryAsTree} from '@/api/basecfg/area'
+import {get} from '@/api/commonApi'
+import {listPgSupplyH, listPvSupplyH} from '@/api/mgr/pgSupplyH'
 import BaseChart from '@/components/BaseChart'
 import BarChartBlock from '@/components/Block/charts/BarChartBlock.vue'
 import PieChartBlock from '@/components/Block/charts/PieChartBlock.vue'
 import SubTitle from '@/components/SubTitle'
-import { DateTool } from '@/utils/DateTool'
+import {DateTool} from '@/utils/DateTool'
 import dayjs from 'dayjs'
 
 export default {
@@ -148,7 +137,7 @@ export default {
     BaseChart,
     SubTitle
   },
-  data() {
+  data () {
     return {
       activeName: 'summery',
       // 遮罩层
@@ -180,7 +169,7 @@ export default {
         shortcuts: [
           {
             text: '最近一周',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
@@ -188,7 +177,7 @@ export default {
             }
           }, {
             text: '最近一个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@@ -196,7 +185,7 @@ export default {
             }
           }, {
             text: '最近三个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@@ -281,7 +270,7 @@ export default {
     }
   },
   computed: {
-    elecOptions() {
+    elecOptions () {
       const xData = this.pgSupplyTodayList.map(item => item.time)
       const quantity = this.pgSupplyTodayList.map(item => item.useElecQuantity)
       const cost = this.pgSupplyTodayList.map(item => item.useElecCost)
@@ -307,7 +296,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW·h（千瓦时）',
+            name: 'kWh（千瓦时）',
             type: 'value'
           },
           {
@@ -343,14 +332,14 @@ export default {
               normal: {
                 color: '#5BD9A5',
 
-                  }
-                }
+              }
+            }
           }
         ]
       }
       return option
     },
-    pvOptions() {
+    pvOptions () {
       const option = {
         tooltip: {
           trigger: 'axis',
@@ -373,7 +362,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW·h（千瓦时）',
+            name: 'kWh（千瓦时）',
             type: 'value'
           },
           {
@@ -448,21 +437,21 @@ export default {
   },
   watch: {
     // 根据名称筛选区域树
-    areaName(val) {
+    areaName (val) {
       this.$refs.tree.filter(val)
     }
   },
-  async created() {
+  async created () {
     await this.getSummery()
   },
   methods: {
-    getLabelContentForElecQuantity() {
+    getLabelContentForElecQuantity () {
       return `总供电{totalSupply|${this.totalSupply} kWh}`;
     },
-    getLabelContentForElecCost() {
+    getLabelContentForElecCost () {
       return `供电成本{totalCost|${this.totalCost} 元}`;
     },
-    tabClick() {
+    tabClick () {
       if (this.activeName !== 'summery') {
         this.dateRange = [dayjs().format(DateTool.DateFormat.YYYY_MM_DD_00_00_00), dayjs().format(DateTool.DateFormat.YYYY_MM_DD_23_59_59)]
         this.queryParams.areaCode = '-1'
@@ -474,11 +463,11 @@ export default {
         this.getSummery()
       }
     },
-    async getSummery() {
+    async getSummery () {
       await this.getHSummery()
       await this.getThisDaySummery()
     },
-    async getThisDaySummery() {
+    async getThisDaySummery () {
       const {
         data,
         code
@@ -536,7 +525,7 @@ export default {
       this.totalCost = totalCost;
     },
 
-    async getHSummery() {
+    async getHSummery () {
       const {
         data,
         code
@@ -586,7 +575,7 @@ export default {
       this.pvSupplyIndex.series = series
       this.pvSupplyIndex.xAxis.data = xaxis
     },
-    getTodayList() {
+    getTodayList () {
       if (this.activeName === 'first') {
         areaWithFacsCategoryAsTree('W', this.facsSubCategory).then(response => {
           this.areaOptions = [{
@@ -623,7 +612,7 @@ export default {
         })
       }
     },
-    getList() {
+    getList () {
       this.loading = true
       this.queryParams.startRecTime = ''
       this.queryParams.endRecTime = ''
@@ -635,21 +624,21 @@ export default {
       if (this.activeName === 'first') {
         listPgSupplyH(
           {
-            startRecTime: dayjs().format(DateTool.DateFormat.YYYY_MM_DD_00_00_00),
-            endRecTime: dayjs().format(DateTool.DateFormat.YYYY_MM_DD_23_59_59),
+            startRecTime: this.queryParams.startRecTime,
+            endRecTime: this.queryParams.endRecTime,
             areaCode: this.queryParams.areaCode,
             pageNum: 1,
             pageSize: 999
           }
-      ).then(response => {
+        ).then(response => {
           this.pgSupplyHList = response.rows
           this.total = response.total
           this.loading = false
         })
       } else {
         listPvSupplyH({
-          startRecTime: dayjs().format(DateTool.DateFormat.YYYY_MM_DD_00_00_00),
-          endRecTime: dayjs().format(DateTool.DateFormat.YYYY_MM_DD_23_59_59),
+          startRecTime: this.queryParams.startRecTime,
+          endRecTime: this.queryParams.endRecTime,
           areaCode: this.queryParams.areaCode,
           pageNum: 1,
           pageSize: 999
@@ -661,23 +650,23 @@ export default {
       }
     },
     // 筛选节点
-    filterNode(value, data) {
+    filterNode (value, data) {
       if (!value) return true
       return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
-    handleNodeClick(data) {
+    handleNodeClick (data) {
       this.queryParams.areaCode = data.id
       this.selectedLabel = data.label
       this.handleQuery()
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1
       this.getTodayList()
       this.getList()
     },
-    getMeterTypeName(meterType) {
+    getMeterTypeName (meterType) {
       const meterTypeMap = {
         '-1': '低谷电',
         '0': '平峰电',

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

@@ -52,8 +52,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="充电电量(kWh)" align="center" prop="chargeElecQuantity" />
+              <el-table-column label="放电电量(kWh)" align="center" prop="dischargeElecQuantity" />
             </el-table>
           </div>
         </el-col>
@@ -165,7 +165,7 @@ export default {
         },
         yAxis: [
           {
-            name: 'kW·h（千瓦时）',
+            name: 'kWh（千瓦时）',
             type: 'value'
           }
         ],

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

@@ -71,7 +71,7 @@
                   <span>{{ scope.row.objName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity">
+              <el-table-column label="用电量(kWh)" align="center" prop="elecQuantity">
                 <template slot-scope="scope">
                   <span>{{ scope.row.elecQuantity }}</span>
                 </template>

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

ems-ui/src/views/task/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="task-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false" :filter-node-method="filterNode"
+          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
             node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
@@ -56,11 +56,12 @@ export default {
     /** 查询区域树结构 */
     async getAreaTreeByTag (tier) {
       await areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data
-        this.areaCode = response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.areaCode = '-1'
       })
     },
     // 筛选节点

ems-ui/src/views/task/report/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" :expand-on-click-node="false" :filter-node-method="filterNode"
+          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
             node-key="id" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
@@ -218,11 +218,12 @@ export default {
     /** 查询区域树结构 */
     async getAreaTreeByTag (tier) {
       await areaTreeSelect(tier).then(response => {
-        this.areaOptions = response.data
-        this.queryParams.areaCode =response.data[0].id
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(response.data[0].id)
-        })
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: response.data
+        }]
+        this.queryParams.areaCode = '-1'
       })
     },
     // 筛选节点