From 9bebd9d3460900d75d31a762469fe46c2256a80e Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Thu, 23 Oct 2025 18:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ems?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 .../ems/base/baseMonitorInfoSteam/index.vue   | 148 ++++++++++--------
 2 files changed, 88 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index a4c6477..a676e98 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "vue3-print-nb": "^0.1.4",
     "vue3-scroll-seamless": "^1.0.6",
     "vue3-seamless-scroll": "^3.0.2",
+    "vue3-treeselect": "^0.1.10",
     "vuedraggable": "4.1.0",
     "vxe-table": "4.5.22"
   },
diff --git a/src/views/ems/base/baseMonitorInfoSteam/index.vue b/src/views/ems/base/baseMonitorInfoSteam/index.vue
index 4613e76..e837b9d 100644
--- a/src/views/ems/base/baseMonitorInfoSteam/index.vue
+++ b/src/views/ems/base/baseMonitorInfoSteam/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"
@@ -46,7 +46,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"
@@ -68,7 +68,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['ems/base:baseMonitorInfo:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -77,7 +78,8 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        >展开/折叠
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -96,7 +98,7 @@
       <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[4].visible" />
       <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
         <template slot-scope="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" />
@@ -105,7 +107,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 slot-scope="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" />
@@ -132,30 +134,34 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems/base:baseMonitorInfo:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['ems/base:baseMonitorInfo:add']"
-          >新增</el-button>
+          >新增
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['ems/base:baseMonitorInfo:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 添加或修改计量设备信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" 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="120px">
         <el-form-item label="父级编号" prop="parentId">
-          <treeselect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+          <treeselect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+                      placeholder="请选择父级编号" />
         </el-form-item>
         <el-form-item label="计量设备编号" prop="monitorCode">
           <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
@@ -169,10 +175,11 @@
         <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>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="采集设备编号" prop="collectDeviceId">
@@ -190,10 +197,11 @@
         <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>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="通断复位" prop="isKeyMonitor">
@@ -218,13 +226,28 @@
 </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 {
+  listBaseMonitorInfo,
+  getBaseMonitorInfo,
+  delBaseMonitorInfo,
+  addBaseMonitorInfo,
+  updateBaseMonitorInfo
+} from '@/api/ems/base/baseMonitorInfo';
+import Treeselect from 'vue3-treeselect';
+import 'vue3-treeselect/dist/vue3-treeselect.css';
 
 export default {
-  name: "BaseMonitorInfo",
-  dicts: ['is_ammeter', 'monitor_status'],
+  name: 'BaseMonitorInfo',
+  computed: {
+    is_ammeter() {
+      return this.useDict('is_ammeter');
+
+    },
+    monitor_status() {
+      return this.useDict('monitor_status');
+
+    }
+  },
   components: {
     Treeselect
   },
@@ -239,7 +262,7 @@ export default {
       // 计量设备信息树选项
       baseMonitorInfoOptions: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 是否展开，默认全部展开
@@ -276,36 +299,36 @@ export default {
       // 表单校验
       rules: {
         objId: [
-          { required: true, message: "自增标识不能为空", trigger: "blur" }
+          { required: true, message: '自增标识不能为空', trigger: 'blur' }
         ],
         monitorCode: [
-          { required: true, message: "计量设备编号不能为空", trigger: "blur" }
-        ],
+          { 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},
+        { 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 }
       ]
     };
   },
@@ -317,7 +340,7 @@ export default {
     getList() {
       this.loading = true;
       listBaseMonitorInfo(this.queryParams).then(response => {
-        this.baseMonitorInfoList = this.handleTree(response.data, "objId", "parentId");
+        this.baseMonitorInfoList = this.handleTree(response.data, 'objId', 'parentId');
         this.loading = false;
       });
     },
@@ -335,9 +358,10 @@ export default {
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
       listBaseMonitorInfo().then(response => {
+        console.log(response);
         this.baseMonitorInfoOptions = [];
         const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
+        data.children = this.handleTree(response.data, 'objId', 'parentId');
         this.baseMonitorInfoOptions.push(data);
       });
     },
@@ -373,7 +397,8 @@ export default {
         publicShareType: null,
         monitorHierarchy: null
       };
-      this.resetForm("form");
+      console.log(this.$refs);
+      this.$refs.form.resetFields();
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -381,12 +406,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.$refs.queryForm.resetFields();
       this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
+      // this.reset();
       this.getTreeselect();
       if (row != null && row.objId) {
         this.form.parentId = row.objId;
@@ -394,7 +419,7 @@ export default {
         this.form.parentId = 0;
       }
       this.open = true;
-      this.title = "添加计量设备信息";
+      this.title = '添加计量设备信息';
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
@@ -414,24 +439,24 @@ export default {
       getBaseMonitorInfo(row.objId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改计量设备信息";
+        this.title = '修改计量设备信息';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
-/*            this.form.monitorType = 4;*/
+            /*            this.form.monitorType = 4;*/
             updateBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-/*             this.form.monitorType = 4;*/
+            /*             this.form.monitorType = 4;*/
             addBaseMonitorInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -445,8 +470,9 @@ export default {
         return delBaseMonitorInfo(row.objId);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => {
+      });
     }
   }
 };