diff --git a/klp-ems/src/main/java/com/klp/ems/controller/EmsLocationController.java b/klp-ems/src/main/java/com/klp/ems/controller/EmsLocationController.java
index c8adfc4a..22e053f3 100644
--- a/klp-ems/src/main/java/com/klp/ems/controller/EmsLocationController.java
+++ b/klp-ems/src/main/java/com/klp/ems/controller/EmsLocationController.java
@@ -20,7 +20,6 @@ import com.klp.common.utils.poi.ExcelUtil;
 import com.klp.ems.domain.vo.EmsLocationVo;
 import com.klp.ems.domain.bo.EmsLocationBo;
 import com.klp.ems.service.IEmsLocationService;
-import com.klp.common.core.page.TableDataInfo;
 
 /**
  * 位置
@@ -31,7 +30,7 @@ import com.klp.common.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/mes/location")
+@RequestMapping("/ems/location")
 public class EmsLocationController extends BaseController {
 
     private final IEmsLocationService iEmsLocationService;
@@ -40,8 +39,9 @@ public class EmsLocationController extends BaseController {
      * 查询位置列表
      */
     @GetMapping("/list")
-    public TableDataInfo<EmsLocationVo> list(EmsLocationBo bo, PageQuery pageQuery) {
-        return iEmsLocationService.queryPageList(bo, pageQuery);
+    public R<List<EmsLocationVo>> list(EmsLocationBo bo) {
+        List<EmsLocationVo> list = iEmsLocationService.queryList(bo);
+        return R.ok(list);
     }
 
     /**
diff --git a/klp-ems/src/main/java/com/klp/ems/service/IEmsLocationService.java b/klp-ems/src/main/java/com/klp/ems/service/IEmsLocationService.java
index cbffaabd..b86cb9ba 100644
--- a/klp-ems/src/main/java/com/klp/ems/service/IEmsLocationService.java
+++ b/klp-ems/src/main/java/com/klp/ems/service/IEmsLocationService.java
@@ -3,8 +3,6 @@ package com.klp.ems.service;
 import com.klp.ems.domain.EmsLocation;
 import com.klp.ems.domain.vo.EmsLocationVo;
 import com.klp.ems.domain.bo.EmsLocationBo;
-import com.klp.common.core.page.TableDataInfo;
-import com.klp.common.core.domain.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,10 +20,6 @@ public interface IEmsLocationService {
      */
     EmsLocationVo queryById(Long locationId);
 
-    /**
-     * 查询位置列表
-     */
-    TableDataInfo<EmsLocationVo> queryPageList(EmsLocationBo bo, PageQuery pageQuery);
 
     /**
      * 查询位置列表
diff --git a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsLocationServiceImpl.java b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsLocationServiceImpl.java
index 5b34d4b8..ca0bbd66 100644
--- a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsLocationServiceImpl.java
+++ b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsLocationServiceImpl.java
@@ -1,12 +1,9 @@
 package com.klp.ems.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.klp.common.core.page.TableDataInfo;
-import com.klp.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.ems.domain.bo.EmsLocationBo;
@@ -39,15 +36,6 @@ public class EmsLocationServiceImpl implements IEmsLocationService {
         return baseMapper.selectVoById(locationId);
     }
 
-    /**
-     * 查询位置列表
-     */
-    @Override
-    public TableDataInfo<EmsLocationVo> queryPageList(EmsLocationBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<EmsLocation> lqw = buildQueryWrapper(bo);
-        Page<EmsLocationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
 
     /**
      * 查询位置列表
diff --git a/klp-ems/src/main/resources/mapper/EmsLocationMapper.xml b/klp-ems/src/main/resources/mapper/EmsLocationMapper.xml
index 539331bc..809d475b 100644
--- a/klp-ems/src/main/resources/mapper/EmsLocationMapper.xml
+++ b/klp-ems/src/main/resources/mapper/EmsLocationMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.klp.ems.mapper.EmsLocationMapper">
 
     <resultMap type="com.klp.ems.domain.EmsLocation" id="EmsLocationResult">
diff --git a/klp-ui/src/api/ems/alert.js b/klp-ui/src/api/ems/alert.js
new file mode 100644
index 00000000..583f50c7
--- /dev/null
+++ b/klp-ui/src/api/ems/alert.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询告警列表
+export function listAlert(query) {
+  return request({
+    url: '/ems/alert/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询告警详细
+export function getAlert(alertId) {
+  return request({
+    url: '/ems/alert/' + alertId,
+    method: 'get'
+  })
+}
+
+// 新增告警
+export function addAlert(data) {
+  return request({
+    url: '/ems/alert',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改告警
+export function updateAlert(data) {
+  return request({
+    url: '/ems/alert',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除告警
+export function delAlert(alertId) {
+  return request({
+    url: '/ems/alert/' + alertId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/ems/energyConsumption.js b/klp-ui/src/api/ems/energyConsumption.js
new file mode 100644
index 00000000..95971538
--- /dev/null
+++ b/klp-ui/src/api/ems/energyConsumption.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询能耗记录列表
+export function listEnergyConsumption(query) {
+  return request({
+    url: '/ems/energyConsumption/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能耗记录详细
+export function getEnergyConsumption(energyConsumptionId) {
+  return request({
+    url: '/ems/energyConsumption/' + energyConsumptionId,
+    method: 'get'
+  })
+}
+
+// 新增能耗记录
+export function addEnergyConsumption(data) {
+  return request({
+    url: '/ems/energyConsumption',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能耗记录
+export function updateEnergyConsumption(data) {
+  return request({
+    url: '/ems/energyConsumption',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能耗记录
+export function delEnergyConsumption(energyConsumptionId) {
+  return request({
+    url: '/ems/energyConsumption/' + energyConsumptionId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/ems/energyRate.js b/klp-ui/src/api/ems/energyRate.js
new file mode 100644
index 00000000..60fb143e
--- /dev/null
+++ b/klp-ui/src/api/ems/energyRate.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）列表
+export function listEnergyRate(query) {
+  return request({
+    url: '/ems/energyRate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）详细
+export function getEnergyRate(energyRateId) {
+  return request({
+    url: '/ems/energyRate/' + energyRateId,
+    method: 'get'
+  })
+}
+
+// 新增能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）
+export function addEnergyRate(data) {
+  return request({
+    url: '/ems/energyRate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）
+export function updateEnergyRate(data) {
+  return request({
+    url: '/ems/energyRate',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）
+export function delEnergyRate(energyRateId) {
+  return request({
+    url: '/ems/energyRate/' + energyRateId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/ems/energyType.js b/klp-ui/src/api/ems/energyType.js
new file mode 100644
index 00000000..6510bf14
--- /dev/null
+++ b/klp-ui/src/api/ems/energyType.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询能源类型（阈值已移除）列表
+export function listEnergyType(query) {
+  return request({
+    url: '/mes/energyType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询能源类型（阈值已移除）详细
+export function getEnergyType(energyTypeId) {
+  return request({
+    url: '/mes/energyType/' + energyTypeId,
+    method: 'get'
+  })
+}
+
+// 新增能源类型（阈值已移除）
+export function addEnergyType(data) {
+  return request({
+    url: '/mes/energyType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改能源类型（阈值已移除）
+export function updateEnergyType(data) {
+  return request({
+    url: '/mes/energyType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源类型（阈值已移除）
+export function delEnergyType(energyTypeId) {
+  return request({
+    url: '/mes/energyType/' + energyTypeId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/ems/location.js b/klp-ui/src/api/ems/location.js
new file mode 100644
index 00000000..15b39584
--- /dev/null
+++ b/klp-ui/src/api/ems/location.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询位置列表
+export function listLocation(query) {
+  return request({
+    url: '/ems/location/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询位置详细
+export function getLocation(locationId) {
+  return request({
+    url: '/ems/location/' + locationId,
+    method: 'get'
+  })
+}
+
+// 新增位置
+export function addLocation(data) {
+  return request({
+    url: '/ems/location',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改位置
+export function updateLocation(data) {
+  return request({
+    url: '/ems/location',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除位置
+export function delLocation(locationId) {
+  return request({
+    url: '/ems/location/' + locationId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/ems/meter.js b/klp-ui/src/api/ems/meter.js
new file mode 100644
index 00000000..eba060fd
--- /dev/null
+++ b/klp-ui/src/api/ems/meter.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询计量设备（阈值移至此处）列表
+export function listMeter(query) {
+  return request({
+    url: '/mes/meter/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询计量设备（阈值移至此处）详细
+export function getMeter(meterId) {
+  return request({
+    url: '/mes/meter/' + meterId,
+    method: 'get'
+  })
+}
+
+// 新增计量设备（阈值移至此处）
+export function addMeter(data) {
+  return request({
+    url: '/mes/meter',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改计量设备（阈值移至此处）
+export function updateMeter(data) {
+  return request({
+    url: '/mes/meter',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除计量设备（阈值移至此处）
+export function delMeter(meterId) {
+  return request({
+    url: '/mes/meter/' + meterId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 228c7a7c..83dc7dff 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -89,8 +89,8 @@ $--border-color: $border-color-base;
   /* 金属质感变量 */
   // --metal-gradient-light: linear-gradient(145deg, #3E434A, #363B41);
   // --metal-gradient-dark: linear-gradient(145deg, #363B41, #3E434A);
-  --metal-gradient-light: linear-gradient(145deg, $--color-background-light, $--color-background);
-  --metal-gradient-dark: linear-gradient(145deg, $--color-background, $--color-background-light);
+  --metal-gradient-light: linear-gradient(145deg, --color-background-light, --color-background);
+  --metal-gradient-dark: linear-gradient(145deg, --color-background, --color-background-light);
   --metal-highlight: rgba(255, 255, 255, .14);
   --metal-shadow: 5px 5px 12px rgba(0, 0, 0, .22), -5px -5px 12px rgba(255, 255, 255, .06);
   --metal-shadow-inset: inset 3px 3px 6px rgba(0, 0, 0, .28), inset -3px -3px 6px rgba(255, 255, 255, .06);
@@ -980,7 +980,7 @@ body {
 
 // 抽屉
 .el-drawer {
-  background: $--metal-gradient-light;
+  // background: $--metal-gradient-light;
   border: 1px solid $--border-color-light;
   box-shadow: $--metal-shadow;
   border-radius: 8px;
@@ -989,7 +989,7 @@ body {
 
 // Popover
 .el-popover {
-  background: $--metal-gradient-light;
+  // background: $--metal-gradient-light;
   border: 1px solid $--border-color-light;
   border-radius: 8px;
   box-shadow: $--metal-shadow;
diff --git a/klp-ui/src/layout/components/TagsView/index.vue b/klp-ui/src/layout/components/TagsView/index.vue
index c63e1bba..3d898700 100644
--- a/klp-ui/src/layout/components/TagsView/index.vue
+++ b/klp-ui/src/layout/components/TagsView/index.vue
@@ -306,7 +306,8 @@ export default {
   .contextmenu {
     margin: 0;
     // 右键菜单金属背景
-    background: #454c51;
+    // background: #454c51;
+    background: white;
     border: 1px solid #a0a6ad;
     z-index: 3000;
     position: absolute;
diff --git a/klp-ui/src/views/components/AllApplications.vue b/klp-ui/src/views/components/AllApplications.vue
index 3005ca2b..2270f02f 100644
--- a/klp-ui/src/views/components/AllApplications.vue
+++ b/klp-ui/src/views/components/AllApplications.vue
@@ -191,7 +191,9 @@ export default {
       if (parent && parent.children) {
         return parent.children.find(child => child.path === childPath)
       }
-      return null
+      return {
+        meta: {}
+      }
     },
     
     handleAppClick(parentMenu, childMenu) {
diff --git a/klp-ui/src/views/components/FlowTable.vue b/klp-ui/src/views/components/FlowTable.vue
index 3798624a..d83343f0 100644
--- a/klp-ui/src/views/components/FlowTable.vue
+++ b/klp-ui/src/views/components/FlowTable.vue
@@ -6,7 +6,7 @@
         <KLPTable v-loading="loading" :data="ownProcessList">
           <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
           <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
-          <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />
+          <el-table-column label="流程类别" align="center" prop="category" />
           <el-table-column label="流程版本" align="center" width="80px">
             <template slot-scope="scope">
               <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
diff --git a/klp-ui/src/views/ems/alert/index.vue b/klp-ui/src/views/ems/alert/index.vue
new file mode 100644
index 00000000..131824a2
--- /dev/null
+++ b/klp-ui/src/views/ems/alert/index.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计量设备" prop="meterId">
+        <el-input
+          v-model="queryParams.meterId"
+          placeholder="请输入关联计量设备"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际值" prop="actualValue">
+        <el-input
+          v-model="queryParams.actualValue"
+          placeholder="请输入实际值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="告警时间" prop="alertTime">
+        <el-date-picker clearable
+          v-model="queryParams.alertTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择告警时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="处理人" prop="resolvedBy">
+        <el-input
+          v-model="queryParams.resolvedBy"
+          placeholder="请输入处理人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理时间" prop="resolvedTime">
+        <el-date-picker clearable
+          v-model="queryParams.resolvedTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择处理时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <el-table v-loading="loading" :data="alertList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="alertId" v-if="false"/>
+      <el-table-column label="计量设备" align="center" prop="meterId" />
+      <el-table-column label="告警类型" align="center" prop="alertType" />
+      <el-table-column label="实际值" align="center" prop="actualValue" />
+      <el-table-column label="告警时间" align="center" prop="alertTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.alertTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="告警状态" align="center" prop="status" />
+      <el-table-column label="处理人" align="center" prop="resolvedBy" />
+      <el-table-column label="处理时间" align="center" prop="resolvedTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.resolvedTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改告警对话框 -->
+    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="计量设备" prop="meterId">
+          <el-input v-model="form.meterId" placeholder="请输入计量设备" />
+        </el-form-item>
+        <el-form-item label="实际值" prop="actualValue">
+          <el-input v-model="form.actualValue" placeholder="请输入实际值" />
+        </el-form-item>
+        <el-form-item label="告警时间" prop="alertTime">
+          <el-date-picker clearable
+            v-model="form.alertTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择告警时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="处理人" prop="resolvedBy">
+          <el-input v-model="form.resolvedBy" placeholder="请输入处理人" />
+        </el-form-item>
+        <el-form-item label="处理时间" prop="resolvedTime">
+          <el-date-picker clearable
+            v-model="form.resolvedTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择处理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import { listAlert, getAlert, delAlert, addAlert, updateAlert } from "@/api/ems/alert";
+
+export default {
+  name: "Alert",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 告警表格数据
+      alertList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        meterId: undefined,
+        alertType: undefined,
+        actualValue: undefined,
+        alertTime: undefined,
+        status: undefined,
+        resolvedBy: undefined,
+        resolvedTime: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询告警列表 */
+    getList() {
+      this.loading = true;
+      listAlert(this.queryParams).then(response => {
+        this.alertList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        alertId: undefined,
+        meterId: undefined,
+        alertType: undefined,
+        actualValue: undefined,
+        alertTime: undefined,
+        status: undefined,
+        resolvedBy: undefined,
+        resolvedTime: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.alertId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加告警";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const alertId = row.alertId || this.ids
+      getAlert(alertId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改告警";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.alertId != null) {
+            updateAlert(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addAlert(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const alertIds = row.alertId || this.ids;
+      this.$modal.confirm('是否确认删除告警编号为"' + alertIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delAlert(alertIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/alert/export', {
+        ...this.queryParams
+      }, `alert_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/ems/dashboard/index.vue b/klp-ui/src/views/ems/dashboard/index.vue
new file mode 100644
index 00000000..b4019a19
--- /dev/null
+++ b/klp-ui/src/views/ems/dashboard/index.vue
@@ -0,0 +1,97 @@
+<template>
+  <el-row>
+    <el-col :span="4">
+      <el-select v-model="energyType" placeholder="请选择能源类型">
+        <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
+      </el-select>
+
+      <!-- 区域选择，默认展开，最高高度为60%的屏幕尺寸 -->
+      <el-tree @node-click="handleNodeClick" :data="locationList" :props="defaultProps" :default-expand-all="true" :style="{ height: 'calc(50vh - 50px)' }"></el-tree>
+
+      <!-- 设备列表 -->
+      <ul v-if="locationId">
+        <li></li>
+      </ul>
+      <div v-else>
+        <el-empty description="请选择区域"></el-empty>
+      </div>
+    </el-col>
+
+    <el-col :span="20">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="环比概况" name="1">
+        </el-tab-pane>
+        <el-tab-pane label="近期趋势" name="2"></el-tab-pane>
+        <el-tab-pane label="同比分析" name="3"></el-tab-pane>
+        <el-tab-pane label="环比分析" name="4"></el-tab-pane>
+      </el-tabs>
+
+      <Overview v-if="activeTab === '1'" />
+      <RecentTrend v-if="activeTab === '2'" />
+      <YearToYear v-if="activeTab === '3'" />
+      <MonthToMonth v-if="activeTab === '4'" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { listEnergyType } from "@/api/ems/energyType";
+import { listLocation } from "@/api/ems/location";
+
+import Overview from "./panels/Overview.vue";
+import RecentTrend from "./panels/RecentTrend.vue";
+import YearToYear from "./panels/YearToYear.vue";
+import MonthToMonth from "./panels/MonthToMonth.vue";
+import Overview from "./panels/Overview.vue";
+
+export default {
+  name: "Dashboard",
+  components: {
+    Overview,
+    RecentTrend,
+    YearToYear,
+    MonthToMonth
+  },
+  data() {
+    return {
+      energyTypeList: [],
+      energyType: '',
+      locationId: '',
+      locationList: [
+      ],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      activeTab: '1'
+    }
+  },
+  created() {
+    this.getEnergyTypeList();
+    this.getLocationList();
+  },
+  watch: {
+    // 当选择的区域变化时重新获取设备列表
+    locationId: {
+
+    },
+  },
+  methods: {
+    getEnergyTypeList() {
+      listEnergyType({ pageNum: 1, pageSize: 9999 }).then(response => {
+        this.energyTypeList = response.rows;
+      });
+    },
+    getLocationList() {
+      listLocation().then(response => {
+        const data = { locationId: undefined, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "locationId", "parentId");
+        this.locationList.push(data);
+      });
+    },
+    handleNodeClick(data) {
+      this.locationId = data.locationId;
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/ems/dashboard/panels/MonthToMonth.vue b/klp-ui/src/views/ems/dashboard/panels/MonthToMonth.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/ems/dashboard/panels/Overview.vue b/klp-ui/src/views/ems/dashboard/panels/Overview.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/ems/dashboard/panels/RecentTrends.vue b/klp-ui/src/views/ems/dashboard/panels/RecentTrends.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/ems/dashboard/panels/YearOnYear.vue b/klp-ui/src/views/ems/dashboard/panels/YearOnYear.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/ems/data/index.vue b/klp-ui/src/views/ems/data/index.vue
new file mode 100644
index 00000000..238c8b27
--- /dev/null
+++ b/klp-ui/src/views/ems/data/index.vue
@@ -0,0 +1,365 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="关联计量设备" prop="meterId">
+        <el-input
+          v-model="queryParams.meterId"
+          placeholder="请输入关联计量设备"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="起始读数" prop="startReading">
+        <el-input
+          v-model="queryParams.startReading"
+          placeholder="请输入起始读数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结束读数" prop="endReading">
+        <el-input
+          v-model="queryParams.endReading"
+          placeholder="请输入结束读数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="消耗量" prop="consumption">
+        <el-input
+          v-model="queryParams.consumption"
+          placeholder="请输入消耗量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="起始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择起始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker clearable
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录人" prop="recordedBy">
+        <el-input
+          v-model="queryParams.recordedBy"
+          placeholder="请输入记录人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="energyConsumptionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="energyConsumptionId" v-if="true"/>
+      <el-table-column label="计量设备" align="center" prop="meterId" />
+      <el-table-column label="起始读数" align="center" prop="startReading" />
+      <el-table-column label="结束读数" align="center" prop="endReading" />
+      <el-table-column label="消耗量" align="center" prop="consumption" />
+      <el-table-column label="起始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="记录人" align="center" prop="recordedBy" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改能耗记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="计量设备" prop="meterId">
+          <el-input v-model="form.meterId" placeholder="请输入关联计量设备" />
+        </el-form-item>
+        <el-form-item label="起始读数" prop="startReading">
+          <el-input v-model="form.startReading" placeholder="请输入起始读数" />
+        </el-form-item>
+        <el-form-item label="结束读数" prop="endReading">
+          <el-input v-model="form.endReading" placeholder="请输入结束读数" />
+        </el-form-item>
+        <el-form-item label="消耗量" prop="consumption">
+          <el-input v-model="form.consumption" placeholder="请输入消耗量" />
+        </el-form-item>
+        <el-form-item label="起始时间" prop="startTime">
+          <el-date-picker clearable
+            v-model="form.startTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择起始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="记录人" prop="recordedBy">
+          <el-input v-model="form.recordedBy" placeholder="请输入记录人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEnergyConsumption, getEnergyConsumption, delEnergyConsumption, addEnergyConsumption, updateEnergyConsumption } from "@/api/ems/energyConsumption";
+
+export default {
+  name: "EnergyConsumption",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能耗记录表格数据
+      energyConsumptionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        meterId: undefined,
+        startReading: undefined,
+        endReading: undefined,
+        consumption: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        recordedBy: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询能耗记录列表 */
+    getList() {
+      this.loading = true;
+      listEnergyConsumption(this.queryParams).then(response => {
+        this.energyConsumptionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        energyConsumptionId: undefined,
+        meterId: undefined,
+        startReading: undefined,
+        endReading: undefined,
+        consumption: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        recordedBy: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.energyConsumptionId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加能耗记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const energyConsumptionId = row.energyConsumptionId || this.ids
+      getEnergyConsumption(energyConsumptionId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改能耗记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.energyConsumptionId != null) {
+            updateEnergyConsumption(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addEnergyConsumption(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const energyConsumptionIds = row.energyConsumptionId || this.ids;
+      this.$modal.confirm('是否确认删除能耗记录编号为"' + energyConsumptionIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEnergyConsumption(energyConsumptionIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/energyConsumption/export', {
+        ...this.queryParams
+      }, `energyConsumption_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/ems/energy/index.vue b/klp-ui/src/views/ems/energy/index.vue
new file mode 100644
index 00000000..58f730e2
--- /dev/null
+++ b/klp-ui/src/views/ems/energy/index.vue
@@ -0,0 +1,305 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="能源名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入能源名称，如：电力、自来水、天然气"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计量单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入计量单位，如：kWh、m³"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="能源编码" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入能源编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="能源描述" prop="description">
+        <el-input
+          v-model="queryParams.description"
+          placeholder="请输入能源描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="energyTypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="energyTypeId" v-if="false"/>
+      <el-table-column label="能源名称" align="center" prop="name" />
+      <el-table-column label="计量单位" align="center" prop="unit" />
+      <el-table-column label="能源编码" align="center" prop="code" />
+      <el-table-column label="能源描述" align="center" prop="description" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改能源类型（阈值已移除）对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="能源名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入能源名称，如：电力、自来水、天然气" />
+        </el-form-item>
+        <el-form-item label="计量单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位，如：kWh、m³" />
+        </el-form-item>
+        <el-form-item label="能源编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入能源编码" />
+        </el-form-item>
+        <el-form-item label="能源描述" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEnergyType, getEnergyType, delEnergyType, addEnergyType, updateEnergyType } from "@/api/ems/energyType";
+
+export default {
+  name: "EnergyType",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源类型（阈值已移除）表格数据
+      energyTypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        unit: undefined,
+        code: undefined,
+        description: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询能源类型（阈值已移除）列表 */
+    getList() {
+      this.loading = true;
+      listEnergyType(this.queryParams).then(response => {
+        this.energyTypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        energyTypeId: undefined,
+        name: undefined,
+        unit: undefined,
+        code: undefined,
+        description: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.energyTypeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加能源类型（阈值已移除）";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const energyTypeId = row.energyTypeId || this.ids
+      getEnergyType(energyTypeId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改能源类型（阈值已移除）";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.energyTypeId != null) {
+            updateEnergyType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addEnergyType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const energyTypeIds = row.energyTypeId || this.ids;
+      this.$modal.confirm('是否确认删除能源类型（阈值已移除）编号为"' + energyTypeIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEnergyType(energyTypeIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/energyType/export', {
+        ...this.queryParams
+      }, `energyType_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/ems/location/index.vue b/klp-ui/src/views/ems/location/index.vue
new file mode 100644
index 00000000..b099d7b2
--- /dev/null
+++ b/klp-ui/src/views/ems/location/index.vue
@@ -0,0 +1,303 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="区域名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入区域名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域描述" prop="description">
+        <el-input
+          v-model="queryParams.description"
+          placeholder="请输入区域描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入详细地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="locationList"
+      row-key="locationId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="区域名称" prop="name" />
+      <el-table-column label="父级区域" align="center" prop="parentId" />
+      <el-table-column label="区域描述" align="center" prop="description" />
+      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改位置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入区域名称" />
+        </el-form-item>
+        <el-form-item label="父级区域" prop="parentId">
+          <treeselect v-model="form.parentId" :options="locationOptions" :normalizer="normalizer" placeholder="请选择父级区域" />
+        </el-form-item>
+        <el-form-item label="区域描述" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLocation, getLocation, delLocation, addLocation, updateLocation } from "@/api/ems/location";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Location",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 位置表格数据
+      locationList: [],
+      // 位置树选项
+      locationOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        name: undefined,
+        parentId: undefined,
+        description: undefined,
+        address: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询位置列表 */
+    getList() {
+      this.loading = true;
+      listLocation(this.queryParams).then(response => {
+        this.locationList = this.handleTree(response.data, "locationId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换位置数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.locationId,
+        label: node.name,
+        children: node.children
+      };
+    },
+	/** 查询位置下拉树结构 */
+    getTreeselect() {
+      listLocation().then(response => {
+        this.locationOptions = [];
+        const data = { locationId: undefined, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "locationId", "parentId");
+        this.locationOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        locationId: null,
+        name: null,
+        parentId: null,
+        description: null,
+        address: null,
+        createBy: null,
+        updateBy: null,
+        createTime: null,
+        updateTime: null,
+        delFlag: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.locationId) {
+        this.form.parentId = row.locationId;
+      } else {
+        this.form.parentId = undefined;
+      }
+      this.open = true;
+      this.title = "添加位置";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+	  this.loading = true;
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.locationId;
+      }
+      getLocation(row.locationId).then(response => {
+	    this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改位置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+		  this.buttonLoading = true;
+          if (this.form.locationId != null) {
+            updateLocation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addLocation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除位置编号为"' + row.locationId + '"的数据项？').then(() => {
+        this.loading = true;
+        return delLocation(row.locationId);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/ems/meter/index.vue b/klp-ui/src/views/ems/meter/index.vue
new file mode 100644
index 00000000..33580c01
--- /dev/null
+++ b/klp-ui/src/views/ems/meter/index.vue
@@ -0,0 +1,423 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备编号" prop="meterCode">
+        <el-input
+          v-model="queryParams.meterCode"
+          placeholder="请输入设备编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="能源类型" prop="energyTypeId">
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型">
+          <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备型号" prop="model">
+        <el-input
+          v-model="queryParams.model"
+          placeholder="请输入设备型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制造商" prop="manufacturer">
+        <el-input
+          v-model="queryParams.manufacturer"
+          placeholder="请输入制造商"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安装日期" prop="installDate">
+        <el-date-picker clearable
+          v-model="queryParams.installDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择安装日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="校准日期" prop="lastCalibrationDate">
+        <el-date-picker clearable
+          v-model="queryParams.lastCalibrationDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择上次校准日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="阈值" prop="thresholdValue">
+        <el-input
+          v-model="queryParams.thresholdValue"
+          placeholder="请输入阈值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="meterList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备编号" align="center" prop="meterCode" />
+      <el-table-column label="能源类型" align="center" prop="energyTypeId">
+        <template slot-scope="scope">
+          <span>{{ getEnergy(scope.row.energyTypeId).name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装位置" align="center" prop="locationId">
+        <template slot-scope="scope">
+          <span>{{ getLocationName(scope.row.locationId) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备型号" align="center" prop="model" />
+      <el-table-column label="制造商" align="center" prop="manufacturer" />
+      <el-table-column label="安装日期" align="center" prop="installDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备状态" align="center" prop="status" />
+      <el-table-column label="校准日期" align="center" prop="lastCalibrationDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lastCalibrationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="阈值" align="center" prop="thresholdValue" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改计量设备（阈值移至此处）对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备编号" prop="meterCode">
+          <el-input v-model="form.meterCode" placeholder="请输入设备编号" />
+        </el-form-item>
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型">
+            <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="安装位置" prop="locationId">
+          <!-- <el-input v-model="form.locationId" placeholder="请输入安装位置" /> -->
+           <treeselect v-model="form.locationId" :options="locationOptions" :normalizer="normalizer" placeholder="请选择安装位置" />
+        </el-form-item>
+        <el-form-item label="设备型号" prop="model">
+          <el-input v-model="form.model" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="制造商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入制造商" />
+        </el-form-item>
+        <el-form-item label="安装日期" prop="installDate">
+          <el-date-picker clearable
+            v-model="form.installDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择安装日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="校准日期" prop="lastCalibrationDate">
+          <el-date-picker clearable
+            v-model="form.lastCalibrationDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择上次校准日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="阈值" prop="thresholdValue">
+          <el-input v-model="form.thresholdValue" placeholder="请输入阈值" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMeter, getMeter, delMeter, addMeter, updateMeter } from "@/api/ems/meter";
+import { listLocation } from "@/api/ems/location";
+import { listEnergyType } from "@/api/ems/energyType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Meter",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      locationOptions: [],
+      locationList: [],
+      energyTypeList: [],
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 计量设备（阈值移至此处）表格数据
+      meterList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        meterCode: undefined,
+        energyTypeId: undefined,
+        locationId: undefined,
+        model: undefined,
+        manufacturer: undefined,
+        installDate: undefined,
+        status: undefined,
+        lastCalibrationDate: undefined,
+        thresholdValue: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getLocationList();
+    this.getEnergyTypeList();
+  },
+  methods: {
+    /** 查询计量设备（阈值移至此处）列表 */
+    getList() {
+      this.loading = true;
+      listMeter(this.queryParams).then(response => {
+        this.meterList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.locationId,
+        label: node.name,
+        children: node.children
+      };
+    },
+    getLocationList() {
+      listLocation().then(response => {
+        this.locationOptions = [];
+        const data = { locationId: undefined, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "locationId", "parentId");
+        this.locationOptions.push(data);
+        this.locationList = response.data;
+      });
+    },
+    getEnergyTypeList() {
+      listEnergyType({ pageNum: 1, pageSize: 9999 }).then(response => {
+        this.energyTypeList = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        meterId: undefined,
+        meterCode: undefined,
+        energyTypeId: undefined,
+        locationId: undefined,
+        model: undefined,
+        manufacturer: undefined,
+        installDate: undefined,
+        status: undefined,
+        lastCalibrationDate: undefined,
+        thresholdValue: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.meterId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加计量设备（阈值移至此处）";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const meterId = row.meterId || this.ids
+      getMeter(meterId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改计量设备（阈值移至此处）";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.meterId != null) {
+            updateMeter(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addMeter(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    getLocationName(id) {
+      return this.locationList.find(item => item.locationId === id).name ?? '';
+    },
+    getEnergy(id) {
+      return this.energyTypeList.find(item => item.energyTypeId === id) ?? {};
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const meterIds = row.meterId || this.ids;
+      this.$modal.confirm('是否确认删除计量设备（阈值移至此处）编号为"' + meterIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delMeter(meterIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/meter/export', {
+        ...this.queryParams
+      }, `meter_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/ems/rate/index.vue b/klp-ui/src/views/ems/rate/index.vue
new file mode 100644
index 00000000..b418ac00
--- /dev/null
+++ b/klp-ui/src/views/ems/rate/index.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="能源类型" prop="energyTypeId">
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型">
+          <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="费率" prop="rate">
+        <el-input
+          v-model="queryParams.rate"
+          placeholder="请输入费率"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货币单位" prop="currency">
+        <el-select v-model="queryParams.currency" placeholder="请选择货币单位">
+          <el-option v-for="item in dict.type.currency_unit" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生效日期" prop="effectiveDate">
+        <el-date-picker clearable
+          v-model="queryParams.effectiveDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择生效日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="失效日期" prop="expiryDate">
+        <el-date-picker clearable
+          v-model="queryParams.expiryDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择失效日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="energyRateList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="energyRateId" v-if="false"/>
+      <el-table-column label="能源类型" align="center" prop="energyTypeId">
+        <template slot-scope="scope">
+          <span>{{ getEnergyName(scope.row.energyTypeId) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="费率" align="center" prop="rate" />
+      <el-table-column label="货币单位" align="center" prop="currency">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.currency_unit" :value="scope.row.currency" />
+        </template>
+      </el-table-column>
+      <el-table-column label="生效日期" align="center" prop="effectiveDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.effectiveDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="失效日期" align="center" prop="expiryDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expiryDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型">
+            <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费率" prop="rate">
+          <el-input v-model="form.rate" placeholder="请输入费率" />
+        </el-form-item>
+        <el-form-item label="货币单位" prop="currency">
+          <el-select v-model="form.currency" placeholder="请选择货币单位">
+            <el-option v-for="item in dict.type.currency_unit" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生效日期" prop="effectiveDate">
+          <el-date-picker clearable
+            v-model="form.effectiveDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择生效日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="失效日期" prop="expiryDate">
+          <el-date-picker clearable
+            v-model="form.expiryDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择失效日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEnergyRate, getEnergyRate, delEnergyRate, addEnergyRate, updateEnergyRate } from "@/api/ems/energyRate";
+import { listEnergyType } from "@/api/ems/energyType";
+
+export default {
+  name: "EnergyRate",
+  dicts: ['currency_unit'],
+  data() {
+    return {
+      energyTypeList: [],
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）表格数据
+      energyRateList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        energyTypeId: undefined,
+        rate: undefined,
+        currency: undefined,
+        effectiveDate: undefined,
+        expiryDate: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getEnergyTypeList();
+  },
+  methods: {
+    /** 查询能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）列表 */
+    getList() {
+      this.loading = true;
+      listEnergyRate(this.queryParams).then(response => {
+        this.energyRateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getEnergyTypeList() {
+      listEnergyType({ pageNum: 1, pageSize: 9999 }).then(response => {
+        this.energyTypeList = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        energyRateId: undefined,
+        energyTypeId: undefined,
+        rate: undefined,
+        currency: undefined,
+        effectiveDate: undefined,
+        expiryDate: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.energyRateId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加能源费率";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const energyRateId = row.energyRateId || this.ids
+      getEnergyRate(energyRateId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改能源费率";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.energyRateId != null) {
+            updateEnergyRate(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addEnergyRate(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const energyRateIds = row.energyRateId || this.ids;
+      this.$modal.confirm('是否确认删除能源费率（currency 为 INT：0=CNY,1=USD,2=EUR）编号为"' + energyRateIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEnergyRate(energyRateIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    getEnergyName(id) {
+      return this.energyTypeList.find(item => item.energyTypeId === id).name ?? '';
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/energyRate/export', {
+        ...this.queryParams
+      }, `energyRate_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>