diff --git a/src/api/ems/report/reportPort.ts b/src/api/ems/report/reportPort.ts
index 4379f1b..4ae8203 100644
--- a/src/api/ems/report/reportPort.ts
+++ b/src/api/ems/report/reportPort.ts
@@ -2,6 +2,15 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ReportPortVO, ReportPortForm, ReportPortQuery } from '@/api/ems/report/types';
 
+// 查询能源预览接口
+export function energyPreviewReportList(query) {
+  return request({
+    url: '/ems/report/energyPreviewReportList',
+    method: 'get',
+    params: query
+  })
+}
+
 /**
  * 查询端口报表列表
  */
@@ -45,3 +54,20 @@ export function exportReportPort(query: ReportPortQuery) {
     responseType: 'blob'
   });
 }
+// 查询统计能耗报表
+export function energyStatisticalReportList(query) {
+  return request({
+    url: '/ems/report/energyStatisticalReportList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询峰平谷耗量报表
+export function peaksValleysConsumptionReportList(query) {
+  return request({
+    url: '/ems/report/peaksValleysConsumptionReportList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/ems/base/baseCollectDeviceInfo/index.vue b/src/views/ems/base/baseCollectDeviceInfo/index.vue
index b68fbc8..2d1c22a 100644
--- a/src/views/ems/base/baseCollectDeviceInfo/index.vue
+++ b/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -30,7 +30,7 @@
       <el-form-item label="启用标识" prop="isFlag">
         <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
           <el-option
-            v-for="dict in dict.type.is_flag"
+            v-for="dict in is_flag"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -110,7 +110,7 @@
       <el-table-column label="安装地址" align="center" prop="settingAddress" v-if="columns[8].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+          <dict-tag :options="is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
@@ -187,7 +187,7 @@
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
-              v-for="dict in dict.type.is_flag"
+              v-for="dict in is_flag"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
@@ -198,10 +198,12 @@
           <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index debaa09..e363e9d 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -20,7 +20,7 @@
       <el-form-item label="计量设备状态" prop="monitorStatus">
         <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
           <el-option
-            v-for="dict in dict.type.monitor_status"
+            v-for="dict in monitor_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -30,7 +30,7 @@
       <el-form-item label="是否虚拟" prop="isAmmeter">
         <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
           <el-option
-            v-for="dict in dict.type.is_ammeter"
+            v-for="dict in is_ammeter"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -86,14 +86,14 @@
       <el-table-column label="CT值" align="center" prop="ct" v-if="columns[13].visible" width="60"/>
       <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible" width="100">
         <template #default="scope">
-          <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter"/>
+          <dict-tag :options="is_ammeter" :value="scope.row.isAmmeter"/>
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
       <el-table-column label="是否断路" align="center" prop="isCircuit" v-if="columns[16].visible" />
       <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible" width="100">
         <template #default="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
+          <dict-tag :options="monitor_status" :value="scope.row.monitorStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[17].visible" />
@@ -155,7 +155,7 @@
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
             <el-radio
-              v-for="dict in dict.type.monitor_status"
+              v-for="dict in monitor_status"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
@@ -189,7 +189,7 @@
         <el-form-item label="是否虚拟" prop="isAmmeter">
           <el-radio-group v-model="form.isAmmeter">
             <el-radio
-              v-for="dict in dict.type.is_ammeter"
+              v-for="dict in is_ammeter"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
@@ -218,245 +218,280 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts" name="BaseMonitorInfo">
+import { ref, reactive, getCurrentInstance, ComponentInternalInstance, toRefs, onMounted } from 'vue';
+import type { FormInstance } from 'element-plus';
 import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
 import Treeselect from "vue3-treeselect";
 import "vue3-treeselect/dist/vue3-treeselect.css";
-import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
 import { getCollectDeviceInfo } from '@/api/ems/base/baseCollectDeviceInfo'
 
-export default {
-  name: "BaseMonitorInfo",
-  dicts: ['is_ammeter', 'monitor_status'],
-  components: {
-    Treeselect
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 计量设备信息表格数据
-      baseMonitorInfoList: [],
-      // 计量设备信息树选项
-      baseMonitorInfoOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        parentId: null,
-        monitorCode: null,
-        monitorName: null,
-        monitorAddr: null,
-        monitorType: 2,
-        monitorStatus: null,
-        collectDeviceId: null,
-        ancestors: null,
-        grade: null,
-        meterTypeId: null,
-        correctValue: null,
-        pt: null,
-        ct: null,
-        isAmmeter: null,
-        isKeyMonitor: null,
-        isCircuit: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        publicShareType: null,
-        monitorHierarchy: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        objId: [
-          { required: true, message: "自增标识不能为空", trigger: "blur" }
-        ],
-        monitorCode: [
-          { required: true, message: "计量设备编号不能为空", trigger: "blur" }
-        ],
-        monitorName: [
-          { required: true, message: "计量设备名称不能为空", trigger: "blur" }
-        ],
-      },
-      columns: [
-        {key: 0, label: `自增标识`, visible: false},
-        {key: 1, label: `父级编号`, visible: false},
-        {key: 2, label: `计量设备编号`, visible: true},
-        {key: 3, label: `计量设备名称`, visible: true},
-        {key: 4, label: `计量设备位置`, visible: true},
-        {key: 5, label: `计量设备类型`, visible: true},
-        {key: 6, label: `计量设备状态`, visible: true},
-        {key: 7, label: `采集设备编号`, visible: true},
-        {key: 8, label: `祖级列表`, visible: true},
-        {key: 9, label: `等级`, visible: false},
-        {key: 10, label: `传感器仪表`, visible: false},
-        {key: 11, label: `修正值`, visible: false},
-        {key: 12, label: `PT值`, visible: true},
-        {key: 13, label: `CT值`, visible: true},
-        {key: 14, label: `是否虚拟`, visible: true},
-        {key: 15, label: `通断复位`, visible: false},
-        {key: 16, label: `是否断路`, visible: false},
-        {key: 17, label: `创建人`, visible: false},
-        {key: 18, label: `创建时间`, visible: false},
-        {key: 19, label: `更新人`, visible: false},
-        {key: 20, label: `更新时间`, visible: false},
-        {key: 21, label: `公摊表类型`, visible: false},
-        {key: 22, label: `表具层级`, visible: false},
-      ],
-      // 采集设备选项选项
-      collectDeviceList: []
-    };
-  },
-  created() {
-    getCollectDeviceInfo({}).then(response => {
-      this.collectDeviceList = response.data
-    })
-    this.getList();
-  },
-  methods: {
-    /** 查询计量设备信息列表 */
-    getList() {
-      this.loading = true;
-      listBaseMonitorInfo(this.queryParams).then(response => {
-        this.baseMonitorInfoList = this.handleTree(response.data, "objId", "parentId");
-        this.loading = false;
-      });
-    },
-    /** 转换计量设备信息数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.objId,
-        label: node.monitorName,
-        children: node.children
-      };
-    },
-    /** 查询计量设备信息下拉树结构 */
-    getTreeselect() {
-      listBaseMonitorInfo().then(response => {
-        this.baseMonitorInfoOptions = [];
-        const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
-        this.baseMonitorInfoOptions.push(data);
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        objId: null,
-        parentId: null,
-        monitorCode: null,
-        monitorName: null,
-        monitorAddr: null,
-        monitorType: '2',
-        monitorStatus: 0,
-        collectDeviceId: null,
-        ancestors: null,
-        grade: null,
-        meterTypeId: null,
-        correctValue: null,
-        pt: 1,
-        ct: 1,
-        isAmmeter: '1',
-        isKeyMonitor: null,
-        isCircuit: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        publicShareType: null,
-        monitorHierarchy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null && row.objId) {
-        this.form.parentId = row.objId;
-      } else {
-        this.form.parentId = 0;
-      }
-      this.open = true;
-      this.title = "添加计量设备信息";
-    },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.$nextTick(() => {
-        this.refreshTable = true;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
-      getBaseMonitorInfo(row.objId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改计量设备信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.objId != null) {
-            updateBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function() {
-        return delBaseMonitorInfo(row.objId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { is_ammeter, monitor_status } = toRefs<any>(proxy?.useDict('is_ammeter', 'monitor_status'));
+
+// 遮罩层
+const loading = ref(true);
+// 显示搜索条件
+const showSearch = ref(true);
+// 计量设备信息表格数据
+const baseMonitorInfoList = ref<any[]>([]);
+// 计量设备信息树选项
+const baseMonitorInfoOptions = ref<any[]>([]);
+// 弹出层标题
+const title = ref("");
+// 是否显示弹出层
+const open = ref(false);
+// 是否展开，默认全部展开
+const isExpandAll = ref(true);
+// 重新渲染表格状态
+const refreshTable = ref(true);
+// 采集设备选项
+const collectDeviceList = ref<any[]>([]);
+
+const queryFormRef = ref<FormInstance>();
+const formRef = ref<FormInstance>();
+
+// 查询参数
+const queryParams = reactive({
+  parentId: null,
+  monitorCode: null,
+  monitorName: null,
+  monitorAddr: null,
+  monitorType: 2,
+  monitorStatus: null,
+  collectDeviceId: null,
+  ancestors: null,
+  grade: null,
+  meterTypeId: null,
+  correctValue: null,
+  pt: null,
+  ct: null,
+  isAmmeter: null,
+  isKeyMonitor: null,
+  isCircuit: null,
+  createBy: null,
+  createTime: null,
+  updateBy: null,
+  updateTime: null,
+  publicShareType: null,
+  monitorHierarchy: null
+});
+
+// 表单参数
+const form = reactive<any>({
+  objId: null,
+  parentId: null,
+  monitorCode: null,
+  monitorName: null,
+  monitorAddr: null,
+  monitorType: '2',
+  monitorStatus: 0,
+  collectDeviceId: null,
+  ancestors: null,
+  grade: null,
+  meterTypeId: null,
+  correctValue: null,
+  pt: 1,
+  ct: 1,
+  isAmmeter: '1',
+  isKeyMonitor: null,
+  isCircuit: null,
+  createBy: null,
+  createTime: null,
+  updateBy: null,
+  updateTime: null,
+  publicShareType: null,
+  monitorHierarchy: null
+});
+
+// 表单校验
+const rules = reactive({
+  objId: [
+    { required: true, message: "自增标识不能为空", trigger: "blur" }
+  ],
+  monitorCode: [
+    { required: true, message: "计量设备编号不能为空", trigger: "blur" }
+  ],
+  monitorName: [
+    { required: true, message: "计量设备名称不能为空", trigger: "blur" }
+  ],
+});
+
+const columns = ref([
+  {key: 0, label: `自增标识`, visible: false},
+  {key: 1, label: `父级编号`, visible: false},
+  {key: 2, label: `计量设备编号`, visible: true},
+  {key: 3, label: `计量设备名称`, visible: true},
+  {key: 4, label: `计量设备位置`, visible: true},
+  {key: 5, label: `计量设备类型`, visible: true},
+  {key: 6, label: `计量设备状态`, visible: true},
+  {key: 7, label: `采集设备编号`, visible: true},
+  {key: 8, label: `祖级列表`, visible: true},
+  {key: 9, label: `等级`, visible: false},
+  {key: 10, label: `传感器仪表`, visible: false},
+  {key: 11, label: `修正值`, visible: false},
+  {key: 12, label: `PT值`, visible: true},
+  {key: 13, label: `CT值`, visible: true},
+  {key: 14, label: `是否虚拟`, visible: true},
+  {key: 15, label: `通断复位`, visible: false},
+  {key: 16, label: `是否断路`, visible: false},
+  {key: 17, label: `创建人`, visible: false},
+  {key: 18, label: `创建时间`, visible: false},
+  {key: 19, label: `更新人`, visible: false},
+  {key: 20, label: `更新时间`, visible: false},
+  {key: 21, label: `公摊表类型`, visible: false},
+  {key: 22, label: `表具层级`, visible: false},
+]);
+
+/** 查询计量设备信息列表 */
+const getList = () => {
+  loading.value = true;
+  listBaseMonitorInfo(queryParams).then(response => {
+    baseMonitorInfoList.value = proxy?.handleTree(response.data, "objId", "parentId") || [];
+    loading.value = false;
+  });
 };
+
+/** 转换计量设备信息数据结构 */
+const normalizer = (node: any) => {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.objId,
+    label: node.monitorName,
+    children: node.children
+  };
+};
+
+/** 查询计量设备信息下拉树结构 */
+const getTreeselect = () => {
+  listBaseMonitorInfo().then(response => {
+    baseMonitorInfoOptions.value = [];
+    const data = { objId: 0, monitorName: '顶级节点', children: [] };
+    data.children = proxy?.handleTree(response.data, "objId", "parentId") || [];
+    baseMonitorInfoOptions.value.push(data);
+  });
+};
+
+// 取消按钮
+const cancel = () => {
+  open.value = false;
+  reset();
+};
+
+// 表单重置
+const reset = () => {
+  Object.assign(form, {
+    objId: null,
+    parentId: null,
+    monitorCode: null,
+    monitorName: null,
+    monitorAddr: null,
+    monitorType: '2',
+    monitorStatus: 0,
+    collectDeviceId: null,
+    ancestors: null,
+    grade: null,
+    meterTypeId: null,
+    correctValue: null,
+    pt: 1,
+    ct: 1,
+    isAmmeter: '1',
+    isKeyMonitor: null,
+    isCircuit: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    publicShareType: null,
+    monitorHierarchy: null
+  });
+  formRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 新增按钮操作 */
+const handleAdd = (row?: any) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.objId) {
+    form.parentId = row.objId;
+  } else {
+    form.parentId = 0;
+  }
+  open.value = true;
+  title.value = "添加计量设备信息";
+};
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  proxy?.$nextTick(() => {
+    refreshTable.value = true;
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = (row?: any) => {
+  reset();
+  getTreeselect();
+  if (row != null) {
+    form.parentId = row.parentId;
+  }
+  getBaseMonitorInfo(row.objId).then(response => {
+    Object.assign(form, response.data);
+    open.value = true;
+    title.value = "修改计量设备信息";
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  formRef.value?.validate(valid => {
+    if (valid) {
+      if (form.objId != null) {
+        updateBaseMonitorInfo(form).then(response => {
+          proxy?.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addBaseMonitorInfo(form).then(response => {
+          proxy?.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = (row?: any) => {
+  proxy?.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function() {
+    return delBaseMonitorInfo(row.objId);
+  }).then(() => {
+    getList();
+    proxy?.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+};
+
+onMounted(() => {
+  getCollectDeviceInfo({}).then(response => {
+    collectDeviceList.value = response.data
+  })
+  getList();
+});
 </script>
diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index b594a18..a6fc38b 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="计量设备状态" prop="monitorStatus">
         <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
-          <el-option v-for="dict in dict.type.monitor_status" :key="dict.value" :label="dict.label"
+          <el-option v-for="dict in monitor_status" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="是否虚拟" prop="isAmmeter">
         <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
-          <el-option v-for="dict in dict.type.is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-option v-for="dict in is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -69,7 +69,7 @@
       <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[5].visible" />
       <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
+          <dict-tag :options="monitor_status" :value="scope.row.monitorStatus" />
         </template>
       </el-table-column>
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
@@ -78,7 +78,7 @@
       <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
       <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
+          <dict-tag :options="is_ammeter" :value="scope.row.isAmmeter" />
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
@@ -133,7 +133,7 @@
         </el-form-item>
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
-            <el-radio v-for="dict in dict.type.monitor_status" :key="dict.value"
+            <el-radio v-for="dict in monitor_status" :key="dict.value"
               :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -151,7 +151,7 @@
         </el-form-item>
         <el-form-item label="是否虚拟" prop="isAmmeter">
           <el-radio-group v-model="form.isAmmeter">
-            <el-radio v-for="dict in dict.type.is_ammeter" :key="dict.value"
+            <el-radio v-for="dict in is_ammeter" :key="dict.value"
               :label="dict.value">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -168,262 +168,299 @@
           <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
 
-<script>
+<script setup lang="ts" name="BaseMonitorInfoIOTDevice">
+import { ref, reactive, getCurrentInstance, ComponentInternalInstance, toRefs, onMounted } from 'vue';
+import type { FormInstance } from 'element-plus';
 import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from 'vue3-treeselect';
 import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
 
-export default {
-  name: "BaseMonitorInfo",
-  dicts: ['is_ammeter', 'monitor_status', 'monitor_type'],
-  components: {
-    Treeselect
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 计量设备信息表格数据
-      baseMonitorInfoList: [],
-      // 计量设备信息树选项
-      baseMonitorInfoOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        parentId: null,
-        monitorCode: null,
-        monitorName: null,
-        energyType: null,
-        monitorAddr: null,
-        monitorType: null,
-        monitorStatus: null,
-        collectDeviceId: null,
-        ancestors: null,
-        grade: null,
-        meterTypeId: null,
-        correctValue: null,
-        pt: null,
-        ct: null,
-        isAmmeter: null,
-        isKeyMonitor: null,
-        isCircuit: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        publicShareType: null,
-        monitorHierarchy: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        objId: [
-          { required: true, message: "自增标识不能为空", trigger: "blur" }
-        ],
-        monitorCode: [
-          { required: true, message: "计量设备编号不能为空", trigger: "blur" }
-        ],
-        energyTypeId: [
-          { required: true, message: '能源类型不能为空', trigger: 'blur' }
-        ]
-      },
-      columns: [
-        { key: 0, label: `自增标识`, visible: false },
-        { key: 1, label: `父级编号`, visible: false },
-        { key: 2, label: `计量设备编号`, visible: true },
-        { key: 3, label: `计量设备名称`, visible: true },
-        { key: 3, label: `能源类型`, visible: true },
-        { key: 4, label: `计量设备位置`, visible: true },
-        { key: 5, label: `计量设备类型`, visible: true },
-        { key: 6, label: `计量设备状态`, visible: true },
-        { key: 7, label: `采集设备编号`, visible: true },
-        { key: 8, label: `祖级列表`, visible: true },
-        { key: 9, label: `等级`, visible: false },
-        { key: 10, label: `传感器仪表`, visible: false },
-        { key: 11, label: `修正值`, visible: false },
-        { key: 12, label: `PT值`, visible: true },
-        { key: 13, label: `CT值`, visible: true },
-        { key: 14, label: `是否虚拟`, visible: true },
-        { key: 15, label: `通断复位`, visible: false },
-        { key: 16, label: `是否断路`, visible: false },
-        { key: 17, label: `创建人`, visible: false },
-        { key: 18, label: `创建时间`, visible: false },
-        { key: 19, label: `更新人`, visible: false },
-        { key: 20, label: `更新时间`, visible: false },
-        { key: 21, label: `公摊表类型`, visible: false },
-        { key: 22, label: `表具层级`, visible: false },
-      ],
-      //能源类型选项
-      energyTypeList: []
-    };
-  },
-  created() {
-    getBaseEnergyTypeList({}).then(response => {
-      this.energyTypeList = response.data
-    })
-    this.getList()
-  },
-  methods: {
-    /** 查询计量设备信息列表 */
-    getList() {
-      this.loading = true;
-      listBaseMonitorInfo(this.queryParams).then(response => {
-        this.baseMonitorInfoList = this.handleTree(response.data, "objId", "parentId");
-        this.loading = false;
-      });
-    },
-    /** 转换计量设备信息数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.objId,
-        label: node.monitorName,
-        children: node.children
-      };
-    },
-    /** 查询计量设备信息下拉树结构 */
-    getTreeselect() {
-      listBaseMonitorInfo().then(response => {
-        this.baseMonitorInfoOptions = [];
-        const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
-        this.baseMonitorInfoOptions.push(data);
-      });
-    },
-    // 取消按钮
-    cancel() {
-      dialogOpen.value = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        objId: null,
-        parentId: null,
-        monitorCode: null,
-        monitorName: null,
-        energyType: null,
-        monitorAddr: null,
-        monitorType: null,
-        monitorStatus: null,
-        collectDeviceId: null,
-        ancestors: null,
-        grade: null,
-        meterTypeId: null,
-        correctValue: null,
-        pt: null,
-        ct: null,
-        isAmmeter: null,
-        isKeyMonitor: null,
-        isCircuit: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        publicShareType: null,
-        monitorHierarchy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null && row.objId) {
-        this.form.parentId = row.objId;
-      } else {
-        this.form.parentId = 0;
-      }
-      dialogOpen.value = true;
-      dialogTitle.value = "添加计量设备信息";
-    },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.$nextTick(() => {
-        this.refreshTable = true;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
-      getBaseMonitorInfo(row.objId).then(response => {
-        this.form = response.data;
-        dialogOpen.value = true;
-        dialogTitle.value = "修改计量设备信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.objId != null) {
-            updateBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              dialogOpen.value = false;
-              this.getList();
-            });
-          } else {
-            // this.form.monitorType = 4;
-            addBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              dialogOpen.value = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function () {
-        return delBaseMonitorInfo(row.objId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { is_ammeter, monitor_status } = toRefs<any>(proxy?.useDict('is_ammeter', 'monitor_status'));
 
-    /** 获取能源类型名称 */
-    getEnergyTypeName(energyTypeId) {
-      const energyType = this.energyTypeList.find(item => item.energyTypeId === energyTypeId);
-      return energyType ? energyType.energyName : '';
-    },
-  }
+// 遮罩层
+const loading = ref(true);
+// 显示搜索条件
+const showSearch = ref(true);
+// 计量设备信息表格数据
+const baseMonitorInfoList = ref<any[]>([]);
+// 计量设备信息树选项
+const baseMonitorInfoOptions = ref<any[]>([]);
+// 弹出层标题
+const dialogTitle = ref("");
+// 是否显示弹出层
+const dialogOpen = ref(false);
+// 是否展开，默认全部展开
+const isExpandAll = ref(true);
+// 重新渲染表格状态
+const refreshTable = ref(true);
+// 能源类型选项
+const energyTypeList = ref<any[]>([]);
+
+const queryFormRef = ref<FormInstance>();
+const formRef = ref<FormInstance>();
+
+// 查询参数
+const queryParams = reactive({
+  parentId: null,
+  monitorCode: null,
+  monitorName: null,
+  energyType: null,
+  monitorAddr: null,
+  monitorType: null,
+  monitorStatus: null,
+  collectDeviceId: null,
+  ancestors: null,
+  grade: null,
+  meterTypeId: null,
+  correctValue: null,
+  pt: null,
+  ct: null,
+  isAmmeter: null,
+  isKeyMonitor: null,
+  isCircuit: null,
+  createBy: null,
+  createTime: null,
+  updateBy: null,
+  updateTime: null,
+  publicShareType: null,
+  monitorHierarchy: null
+});
+
+// 表单参数
+const form = reactive<any>({
+  objId: null,
+  parentId: null,
+  monitorCode: null,
+  monitorName: null,
+  energyType: null,
+  monitorAddr: null,
+  monitorType: null,
+  monitorStatus: null,
+  collectDeviceId: null,
+  ancestors: null,
+  grade: null,
+  meterTypeId: null,
+  correctValue: null,
+  pt: null,
+  ct: null,
+  isAmmeter: null,
+  isKeyMonitor: null,
+  isCircuit: null,
+  createBy: null,
+  createTime: null,
+  updateBy: null,
+  updateTime: null,
+  publicShareType: null,
+  monitorHierarchy: null
+});
+
+// 表单校验
+const rules = reactive({
+  objId: [
+    { required: true, message: "自增标识不能为空", trigger: "blur" }
+  ],
+  monitorCode: [
+    { required: true, message: "计量设备编号不能为空", trigger: "blur" }
+  ],
+  energyTypeId: [
+    { required: true, message: '能源类型不能为空', trigger: 'blur' }
+  ]
+});
+
+const columns = ref([
+  { key: 0, label: `自增标识`, visible: false },
+  { key: 1, label: `父级编号`, visible: false },
+  { key: 2, label: `计量设备编号`, visible: true },
+  { key: 3, label: `计量设备名称`, visible: true },
+  { key: 4, label: `能源类型`, visible: true },
+  { key: 5, label: `计量设备位置`, visible: true },
+  { key: 6, label: `计量设备类型`, visible: true },
+  { key: 7, label: `计量设备状态`, visible: true },
+  { key: 8, label: `采集设备编号`, visible: true },
+  { key: 9, label: `祖级列表`, visible: true },
+  { key: 10, label: `等级`, visible: false },
+  { key: 11, label: `传感器仪表`, visible: false },
+  { key: 12, label: `修正值`, visible: false },
+  { key: 13, label: `PT值`, visible: true },
+  { key: 14, label: `CT值`, visible: true },
+  { key: 15, label: `是否虚拟`, visible: true },
+  { key: 16, label: `通断复位`, visible: false },
+  { key: 17, label: `是否断路`, visible: false },
+  { key: 18, label: `创建人`, visible: false },
+  { key: 19, label: `创建时间`, visible: false },
+  { key: 20, label: `更新人`, visible: false },
+  { key: 21, label: `更新时间`, visible: false },
+  { key: 22, label: `公摊表类型`, visible: false },
+  { key: 23, label: `表具层级`, visible: false },
+]);
+
+/** 查询计量设备信息列表 */
+const getList = () => {
+  loading.value = true;
+  listBaseMonitorInfo(queryParams).then(response => {
+    baseMonitorInfoList.value = proxy?.handleTree(response.data, "objId", "parentId") || [];
+    loading.value = false;
+  });
 };
+
+/** 转换计量设备信息数据结构 */
+const normalizer = (node: any) => {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.objId,
+    label: node.monitorName,
+    children: node.children
+  };
+};
+
+/** 查询计量设备信息下拉树结构 */
+const getTreeselect = () => {
+  listBaseMonitorInfo().then(response => {
+    baseMonitorInfoOptions.value = [];
+    const data = { objId: 0, monitorName: '顶级节点', children: [] };
+    data.children = proxy?.handleTree(response.data, "objId", "parentId") || [];
+    baseMonitorInfoOptions.value.push(data);
+  });
+};
+
+// 取消按钮
+const cancel = () => {
+  dialogOpen.value = false;
+  reset();
+};
+
+// 表单重置
+const reset = () => {
+  Object.assign(form, {
+    objId: null,
+    parentId: null,
+    monitorCode: null,
+    monitorName: null,
+    energyType: null,
+    monitorAddr: null,
+    monitorType: null,
+    monitorStatus: null,
+    collectDeviceId: null,
+    ancestors: null,
+    grade: null,
+    meterTypeId: null,
+    correctValue: null,
+    pt: null,
+    ct: null,
+    isAmmeter: null,
+    isKeyMonitor: null,
+    isCircuit: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    publicShareType: null,
+    monitorHierarchy: null
+  });
+  formRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 新增按钮操作 */
+const handleAdd = (row?: any) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.objId) {
+    form.parentId = row.objId;
+  } else {
+    form.parentId = 0;
+  }
+  dialogOpen.value = true;
+  dialogTitle.value = "添加计量设备信息";
+};
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  proxy?.$nextTick(() => {
+    refreshTable.value = true;
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = (row?: any) => {
+  reset();
+  getTreeselect();
+  if (row != null) {
+    form.parentId = row.parentId;
+  }
+  getBaseMonitorInfo(row.objId).then(response => {
+    Object.assign(form, response.data);
+    dialogOpen.value = true;
+    dialogTitle.value = "修改计量设备信息";
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  formRef.value?.validate(valid => {
+    if (valid) {
+      if (form.objId != null) {
+        updateBaseMonitorInfo(form).then(response => {
+          proxy?.$modal.msgSuccess("修改成功");
+          dialogOpen.value = false;
+          getList();
+        });
+      } else {
+        addBaseMonitorInfo(form).then(response => {
+          proxy?.$modal.msgSuccess("新增成功");
+          dialogOpen.value = false;
+          getList();
+        });
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = (row?: any) => {
+  proxy?.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function () {
+    return delBaseMonitorInfo(row.objId);
+  }).then(() => {
+    getList();
+    proxy?.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+};
+
+/** 获取能源类型名称 */
+const getEnergyTypeName = (energyTypeId: any) => {
+  const energyType = energyTypeList.value.find(item => item.energyTypeId === energyTypeId);
+  return energyType ? energyType.energyName : '';
+};
+
+onMounted(() => {
+  getBaseEnergyTypeList({}).then(response => {
+    energyTypeList.value = response.data
+  })
+  getList()
+});
 </script>
diff --git a/src/views/ems/base/baseMonitorInfoSteam/index.vue b/src/views/ems/base/baseMonitorInfoSteam/index.vue
index e837b9d..a254d04 100644
--- a/src/views/ems/base/baseMonitorInfoSteam/index.vue
+++ b/src/views/ems/base/baseMonitorInfoSteam/index.vue
@@ -40,7 +40,7 @@
           v-model="queryParams.collectDeviceId"
           placeholder="请输入采集设备编号"
           clearable
-          @keyup.enter.native="handleQuery"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="是否虚拟" prop="isAmmeter">
diff --git a/src/views/ems/base/baseMonitorInfoWater/index.vue b/src/views/ems/base/baseMonitorInfoWater/index.vue
index 654de20..6170b20 100644
--- a/src/views/ems/base/baseMonitorInfoWater/index.vue
+++ b/src/views/ems/base/baseMonitorInfoWater/index.vue
@@ -28,7 +28,7 @@
       <el-form-item label="计量设备状态" prop="monitorStatus">
         <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
           <el-option
-            v-for="dict in dict.type.monitor_status"
+            v-for="dict in monitor_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -65,7 +65,7 @@
           type="primary"
           plain
           icon="Plus"
-         
+
           @click="handleAdd"
           v-hasPermi="['ems/base:baseMonitorInfo:add']"
         >新增</el-button>
@@ -75,7 +75,7 @@
           type="info"
           plain
           icon="Sort"
-         
+
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
@@ -97,7 +97,7 @@
 <!--      <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[5].visible" />-->
       <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
+          <dict-tag :options="monitor_status" :value="scope.row.monitorStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
@@ -106,7 +106,7 @@
       <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
       <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter"/>
+          <dict-tag :options="is_ammeter" :value="scope.row.isAmmeter"/>
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
@@ -128,21 +128,21 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template #default="scope">
           <el-button
-           
+
             type="text"
             icon="Edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems/base:baseMonitorInfo:edit']"
           >修改</el-button>
           <el-button
-           
+
             type="text"
             icon="Plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['ems/base:baseMonitorInfo:add']"
           >新增</el-button>
           <el-button
-           
+
             type="text"
             icon="Delete"
             @click="handleDelete(scope.row)"
@@ -170,7 +170,7 @@
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
             <el-radio
-              v-for="dict in dict.type.monitor_status"
+              v-for="dict in monitor_status"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
@@ -210,18 +210,20 @@
           <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from 'vue3-treeselect';
+
 
 export default {
   name: "BaseMonitorInfo",
diff --git a/src/views/ems/base/baseMonitorThreshold/index.vue b/src/views/ems/base/baseMonitorThreshold/index.vue
index 2485200..969b56b 100644
--- a/src/views/ems/base/baseMonitorThreshold/index.vue
+++ b/src/views/ems/base/baseMonitorThreshold/index.vue
@@ -7,7 +7,7 @@
             v-model="filterBoxName"
             placeholder="请输入计量设备名称"
             clearable
-           
+
             prefix-icon="Search"
             style="margin-bottom: 20px"
           />
@@ -41,7 +41,7 @@
           <el-form-item label="计量设备类型" prop="monitorType">
             <el-select v-model="queryParams.monitorType" placeholder="请选择计量设备类型" >
               <el-option
-                v-for="dict in dict.type.monitor_type"
+                v-for="dict in monitor_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -79,7 +79,7 @@
               type="success"
               plain
               icon="Edit"
-             
+
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['ems/base:baseMonitorThreshold:edit']"
@@ -91,7 +91,7 @@
               type="danger"
               plain
               icon="Delete"
-             
+
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['ems/base:baseMonitorThreshold:remove']"
@@ -103,7 +103,7 @@
               type="warning"
               plain
               icon="Download"
-             
+
               @click="handleExport"
               v-hasPermi="['ems/base:baseMonitorThreshold:export']"
             >导出
@@ -119,7 +119,7 @@
           <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible" width="100"/>
           <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[2].visible" width="100">
             <template #default="scope">
-              <dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
+              <dict-tag :options="monitor_type" :value="scope.row.monitorType"/>
             </template>
           </el-table-column>
           <el-table-column label="A相电流最大值" align="center" prop="iAMax" v-if="columns[3].visible" width="110"/>
@@ -179,7 +179,7 @@
         <el-form-item label="计量设备类型" prop="monitorType" >
           <el-radio-group v-model="form.monitorType" disabled>
             <el-radio
-              v-for="dict in dict.type.monitor_type"
+              v-for="dict in monitor_type"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{ dict.label }}
@@ -232,10 +232,12 @@
           <el-input-number v-model="form.lineLossRate" placeholder="请输入线损率(%)"/>
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -248,7 +250,7 @@ import {
   addBaseMonitorThreshold,
   updateBaseMonitorThreshold
 } from '@/api/ems/base/baseMonitorThreshold'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Treeselect from 'vue3-treeselect'
 import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
 
 export default {
diff --git a/src/views/ems/base/baseMonitorWorkUnit/index.vue b/src/views/ems/base/baseMonitorWorkUnit/index.vue
index 139ae29..91f740f 100644
--- a/src/views/ems/base/baseMonitorWorkUnit/index.vue
+++ b/src/views/ems/base/baseMonitorWorkUnit/index.vue
@@ -61,7 +61,7 @@
           <el-form-item label="设备计量类型" prop="monitorType">
             <el-select v-model="queryParams.monitorType" placeholder="请选择计算方式">
               <el-option
-                v-for="dict in dict.type.monitor_type"
+                v-for="dict in monitor_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -71,7 +71,7 @@
           <el-form-item label="计算方式" prop="formulaMode">
             <el-select v-model="queryParams.formulaMode" placeholder="请选择计算方式" clearable>
               <el-option
-                v-for="dict in dict.type.formula_mode"
+                v-for="dict in formula_mode"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -153,24 +153,24 @@
           <el-table-column label="统计单元名称" align="center" prop="workUnitName" v-if="columns[14].visible"/>
           <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[3].visible">
             <template #default="scope">
-              <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
+              <dict-tag :options="monitor_status" :value="scope.row.monitorStatus"/>
             </template>
           </el-table-column>
           <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
             <template #default="scope">
-              <dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
+              <dict-tag :options="monitor_type" :value="scope.row.monitorType"/>
             </template>
           </el-table-column>
           <el-table-column label="计算方式" align="center" prop="formulaMode" v-if="columns[5].visible">
             <template #default="scope">
-              <dict-tag :options="dict.type.formula_mode" :value="scope.row.formulaMode"/>
+              <dict-tag :options="formula_mode" :value="scope.row.formulaMode"/>
             </template>
           </el-table-column>
           <el-table-column label="比率" align="center" prop="proportion" v-if="columns[6].visible"/>
           <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
           <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
             <template #default="scope">
-              <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+              <dict-tag :options="is_flag" :value="scope.row.isFlag"/>
             </template>
           </el-table-column>
           <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
@@ -230,7 +230,7 @@
         <el-form-item label="计量设备类型" prop="monitorType">
           <el-radio-group v-model="form.monitorType">
             <el-radio
-              v-for="dict in dict.type.monitor_type"
+              v-for="dict in monitor_type"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{ dict.label }}
@@ -240,7 +240,7 @@
         <el-form-item label="计算方式" prop="formulaMode">
           <el-radio-group v-model="form.formulaMode">
             <el-radio
-              v-for="dict in dict.type.formula_mode"
+              v-for="dict in formula_mode"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{ dict.label }}
@@ -248,15 +248,15 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="比率" prop="proportion">
-          <el-input-number v-model="form.proportion" placeholder="请输入比率"/>
+          <el-input v-model="form.proportion" placeholder="请输入比率" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-<!--        <el-form-item label="备注" prop="remark">-->
-<!--          <el-input v-model="form.remark" placeholder="请输入备注"/>-->
-<!--        </el-form-item>-->
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
-              v-for="dict in dict.type.is_flag"
+              v-for="dict in is_flag"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
@@ -264,10 +264,12 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/ems/base/baseSharePrice/index.vue b/src/views/ems/base/baseSharePrice/index.vue
index b49999b..e5562f0 100644
--- a/src/views/ems/base/baseSharePrice/index.vue
+++ b/src/views/ems/base/baseSharePrice/index.vue
@@ -12,7 +12,7 @@
       <el-form-item label="分时电价类型" prop="priceType">
         <el-select v-model="queryParams.priceType" placeholder="请选择分时电价类型" clearable>
           <el-option
-            v-for="dict in dict.type.price_type"
+            v-for="dict in price_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -81,7 +81,7 @@
       <el-table-column label="记录月份" align="center" prop="yearMonthDate" v-if="columns[1].visible"/>
       <el-table-column label="分时电价类型" align="center" prop="priceType" v-if="columns[2].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.price_type" :value="scope.row.priceType"/>
+          <dict-tag :options="price_type" :value="scope.row.priceType"/>
         </template>
       </el-table-column>
       <el-table-column label="用电起始小时" align="center" prop="startHour" v-if="columns[3].visible"/>
@@ -127,7 +127,7 @@
         <el-form-item label="分时电价类型" prop="priceType">
           <el-radio-group v-model="form.priceType">
             <el-radio
-              v-for="dict in dict.type.price_type"
+              v-for="dict in price_type"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
@@ -163,10 +163,12 @@
           <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/ems/base/baseWorkUnit/index.vue b/src/views/ems/base/baseWorkUnit/index.vue
index f928a17..d287429 100644
--- a/src/views/ems/base/baseWorkUnit/index.vue
+++ b/src/views/ems/base/baseWorkUnit/index.vue
@@ -20,7 +20,7 @@
       <el-form-item label="启用标识" prop="isFlag">
         <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
           <el-option
-            v-for="dict in dict.type.is_flag"
+            v-for="dict in is_flag"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -76,7 +76,7 @@
       <el-table-column label="统计单元类型" align="center" prop="workUnitType" v-if="columns[8].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template #default="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+          <dict-tag :options="is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[10].visible"/>
@@ -122,7 +122,7 @@
     </el-table>
 
     <!-- 添加或修改统计单元信息对话框 -->
-    <el-dialog :title="dialogTitle" v-model="dialogOpen" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="父级统计单元" prop="parentId">
           <treeselect v-model="form.parentId" :options="baseWorkUnitOptions" :normalizer="normalizer"
@@ -144,7 +144,7 @@
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
-              v-for="dict in dict.type.is_flag"
+              v-for="dict in is_flag"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
@@ -152,10 +152,12 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
-      <div #footer class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -274,7 +276,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      dialogOpen.value = false
+      this.open = false
       this.reset()
     },
     // 表单重置
@@ -315,8 +317,8 @@ export default {
       } else {
         this.form.parentId = 0
       }
-      dialogOpen.value = true
-      dialogTitle.value = '添加统计单元信息'
+      this.open = true
+      this.title = '添加统计单元信息'
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
@@ -335,8 +337,8 @@ export default {
       }
       getBaseWorkUnit(row.objId).then(response => {
         this.form = response.data
-        dialogOpen.value = true
-        dialogTitle.value = '修改统计单元信息'
+        this.open = true
+        this.title = '修改统计单元信息'
       })
     },
     /** 提交按钮 */
@@ -346,13 +348,13 @@ export default {
           if (this.form.objId != null) {
             updateBaseWorkUnit(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
-              dialogOpen.value = false
+              this.open = false
               this.getList()
             })
           } else {
             addBaseWorkUnit(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
-              dialogOpen.value = false
+              this.open = false
               this.getList()
             })
           }
diff --git a/src/views/ems/record/recordAlarmData/index.vue b/src/views/ems/record/recordAlarmData/index.vue
index cf5230d..d20e504 100644
--- a/src/views/ems/record/recordAlarmData/index.vue
+++ b/src/views/ems/record/recordAlarmData/index.vue
@@ -39,7 +39,7 @@
       <el-form-item label="异常状态" prop="alarmStatus">
         <el-select v-model="queryParams.alarmStatus" placeholder="请选择异常状态" clearable>
           <el-option
-            v-for="dict in  alarm_status"
+            v-for="dict in  ems_alarm_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -128,7 +128,7 @@
       </el-table-column>
       <el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[5].visible">
         <template slot-scope="scope">
-          <dict-tag :options=" alarm_status" :value="scope.row.alarmStatus" />
+          <dict-tag :options=" ems_alarm_status" :value="scope.row.alarmStatus" />
         </template>
       </el-table-column>
       <el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[6].visible" />
@@ -201,7 +201,7 @@
         <el-form-item label="异常状态" prop="alarmStatus">
           <el-radio-group v-model="form.alarmStatus">
             <el-radio
-              v-for="dict in  alarm_status"
+              v-for="dict in  ems_alarm_status"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{ dict.label }}
@@ -315,8 +315,8 @@ export default {
     this.getList();
   },
   computed: {
-    alarm_status() {
-      return this.useDict('alarm_status');
+    ems_alarm_status() {
+      return this.useDict('ems_alarm_status');
 
     },
     alarm_type() {
diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index 9eec0cd..c5c136a 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -7,7 +7,7 @@
                     v-model="workUnitName"
                     placeholder="请输入物联网设备名称"
                     clearable
-                   
+
                     prefix-icon="Search"
                     style="margin-bottom: 20px"
                 />
@@ -133,7 +133,7 @@
                             type="primary"
                             plain
                             icon="Plus"
-                           
+
                             @click="handleAdd"
                             v-hasPermi="['ems/record:recordIOTInstant:add']"
                         >新增</el-button>
@@ -143,7 +143,7 @@
                             type="success"
                             plain
                             icon="Edit"
-                           
+
                             :disabled="single"
                             @click="handleUpdate"
                             v-hasPermi="['ems/record:recordIOTInstant:edit']"
@@ -154,7 +154,7 @@
                             type="danger"
                             plain
                             icon="Delete"
-                           
+
                             :disabled="multiple"
                             @click="handleDelete"
                             v-hasPermi="['ems/record:recordIOTInstant:remove']"
@@ -165,7 +165,7 @@
                             type="warning"
                             plain
                             icon="Download"
-                           
+
                             @click="handleExport"
                             v-hasPermi="['ems/record:recordIOTInstant:export']"
                         >导出</el-button>
@@ -204,14 +204,14 @@
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                         <template #default="scope">
                             <el-button
-                                   
+
                                     type="text"
                                     icon="Edit"
                                     @click="handleUpdate(scope.row)"
                                     v-hasPermi="['ems/record:recordIOTInstant:edit']"
                             >修改</el-button>
                             <el-button
-                                   
+
                                     type="text"
                                     icon="Delete"
                                     @click="handleDelete(scope.row)"
@@ -309,8 +309,8 @@
         updateRecordIOTInstant }
         from "@/api/ems/record/recordIOTInstant";
     import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
-    import Treeselect from '@riophae/vue-treeselect'
-    import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+    import Treeselect from 'vue3-treeselect'
+
     export default {
         name: "RecordIOTInstant",
         components: {
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 7624e02..80b5b7c 100644
--- a/src/views/ems/record/recordVibrationInstant/index.vue
+++ b/src/views/ems/record/recordVibrationInstant/index.vue
@@ -8,7 +8,7 @@
             v-model="workUnitName"
             placeholder="请输入计量设备名称"
             clearable
-           
+
             prefix-icon="Search"
             style="margin-bottom: 20px"
           />
@@ -126,7 +126,7 @@
               type="primary"
               plain
               icon="Plus"
-             
+
               @click="handleAdd"
               v-hasPermi="['ems/record:recordVibrationInstant:add']"
             >新增</el-button>
@@ -136,7 +136,7 @@
               type="success"
               plain
               icon="Edit"
-             
+
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['ems/record:recordVibrationInstant:edit']"
@@ -147,7 +147,7 @@
               type="danger"
               plain
               icon="Delete"
-             
+
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['ems/record:recordVibrationInstant:remove']"
@@ -158,7 +158,7 @@
               type="warning"
               plain
               icon="Download"
-             
+
               @click="handleExport"
               v-hasPermi="['ems/record:recordVibrationInstant:export']"
             >导出</el-button>
@@ -188,14 +188,14 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="133">
             <template #default="scope">
               <el-button
-               
+
                 type="text"
                 icon="Edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['ems/record:recordVibrationInstant:edit']"
               >修改</el-button>
               <el-button
-               
+
                 type="text"
                 icon="Delete"
                 @click="handleDelete(scope.row)"
@@ -291,7 +291,7 @@ import {
   vibrationInstantList
 } from "@/api/ems/record/recordVibrationInstant";
 import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Treeselect from 'vue3-treeselect'
 import {parseTime} from "@/utils/ruoyi";
 
 export default {
diff --git a/src/views/ems/report/currentSteamCurve/copy.vue b/src/views/ems/report/currentSteamCurve/copy.vue
index 9ee6bf7..9505e79 100644
--- a/src/views/ems/report/currentSteamCurve/copy.vue
+++ b/src/views/ems/report/currentSteamCurve/copy.vue
@@ -91,8 +91,8 @@
   <script>
 
   import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
-  import Treeselect from '@riophae/vue-treeselect'
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import Treeselect from 'vue3-treeselect'
+
   import { parseTime } from '@/utils/ruoyi'
   import Chart from '@/components/Charts/Chart'
   import * as echarts from 'echarts'
diff --git a/src/views/ems/report/currentSteamCurve/good.vue b/src/views/ems/report/currentSteamCurve/good.vue
index b4299de..944bcb7 100644
--- a/src/views/ems/report/currentSteamCurve/good.vue
+++ b/src/views/ems/report/currentSteamCurve/good.vue
@@ -89,8 +89,8 @@
   <script>
 
   import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
-  import Treeselect from '@riophae/vue-treeselect'
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import Treeselect from 'vue3-treeselect'
+
   import { parseTime } from '@/utils/ruoyi'
   import Chart from '@/components/Charts/Chart'
   import * as echarts from 'echarts'
diff --git a/src/views/ems/report/peaksValleysConsumptionReport/index.vue b/src/views/ems/report/peaksValleysConsumptionReport/index.vue
index e01818c..b7b7c76 100644
--- a/src/views/ems/report/peaksValleysConsumptionReport/index.vue
+++ b/src/views/ems/report/peaksValleysConsumptionReport/index.vue
@@ -8,7 +8,7 @@
             v-model="workUnitName"
             placeholder="请输入统计单元名称"
             clearable
-           
+
             prefix-icon="Search"
             style="margin-bottom: 20px"
           />
@@ -65,7 +65,7 @@
               type="warning"
               plain
               icon="Download"
-             
+
               @click="handleExport"
             >导出
             </el-button>
@@ -98,8 +98,8 @@
 <script>
 
 import { getWorkUnitTrees } from '@/api/ems/base/baseWorkUnit'
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from 'vue3-treeselect';
+
 import { peaksValleysConsumptionReportList } from '@//api/ems/report/reportPort.js'
 import { parseTime } from '@//utils/ruoyi'