From 5c7b61081180179c5302e4744781fb0ac1b9738f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Wed, 28 Aug 2024 17:21:39 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=94=A8=E5=AD=97=E5=85=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/baseMonitorInfoIOTDevice/index.vue   | 205 ++++++------------
 1 file changed, 69 insertions(+), 136 deletions(-)

diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index 4121027..5eef614 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -2,65 +2,36 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="计量设备编号" prop="monitorCode">
-        <el-input
-          v-model="queryParams.monitorCode"
-          placeholder="请输入计量设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.monitorCode" placeholder="请输入计量设备编号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="计量设备名称" prop="monitorName">
-        <el-input
-          v-model="queryParams.monitorName"
-          placeholder="请输入计量设备名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.monitorName" placeholder="请输入计量设备名称" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="能源类型" prop="monitorType">
         <el-select v-model="queryParams.monitorType" placeholder="请选择能源类型">
-          <el-option
-            v-for="item in energyTypeList"
-            :key="item.energyTypeId"
-            :label="item.energyName"
-            :value="item.energyTypeId"
-          ></el-option>
+          <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
+            :value="item.energyTypeId"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="计量设备位置" prop="monitorAddr">
-        <el-input
-          v-model="queryParams.monitorAddr"
-          placeholder="请输入计量设备位置"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.monitorAddr" placeholder="请输入计量设备位置" clearable
+          @keyup.enter.native="handleQuery" />
       </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"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.monitor_status" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="采集设备编号" prop="collectDeviceId">
-        <el-input
-          v-model="queryParams.collectDeviceId"
-          placeholder="请输入采集设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.collectDeviceId" placeholder="请输入采集设备编号" clearable
+          @keyup.enter.native="handleQuery" />
       </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 dict.type.is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -71,43 +42,29 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['ems/base:baseMonitorInfo:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['ems/base:baseMonitorInfo:add']">新增</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-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="baseMonitorInfoList"
-      row-key="objId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column label="父级编号" prop="parentId" v-if="columns[1].visible" />
       <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[2].visible" />
       <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[3].visible" />
-      <el-table-column label="能源类型" align="center" prop="monitorType" v-if="columns[4].visible" />
+      <el-table-column label="能源类型" align="center" prop="monitorType" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          {{ dict.type.monitor_type.find(e=>e.value == scope.row.monitorType).label}}
+        </template>
+      </el-table-column>
       <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 slot-scope="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
+          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
         </template>
       </el-table-column>
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
@@ -116,7 +73,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="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
@@ -137,27 +94,12 @@
       <el-table-column label="表具层级" align="center" prop="monitorHierarchy" v-if="columns[22].visible" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['ems/base:baseMonitorInfo:edit']"
-          >修改</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
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems/base:baseMonitorInfo:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/base:baseMonitorInfo:edit']">修改</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 size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/base:baseMonitorInfo:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -166,7 +108,8 @@
     <el-dialog :title="title" :visible.sync="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="请输入计量设备编号" />
@@ -175,25 +118,18 @@
           <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" />
         </el-form-item>
         <el-form-item label="能源类型" prop="monitorType">
-        <el-select v-model="form.monitorType" placeholder="请选择能源类型">
-          <el-option
-            v-for="item in energyTypeList"
-            :key="item.energyTypeId"
-            :label="item.energyName"
-            :value="item.energyTypeId"
-          ></el-option>
-        </el-select>
+          <el-select v-model="form.monitorType" placeholder="请选择能源类型">
+            <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
+              :value="item.energyTypeId"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="计量设备位置" prop="monitorAddr">
           <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
         </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"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.monitor_status" :key="dict.value"
+              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="采集设备编号" prop="collectDeviceId">
@@ -210,11 +146,8 @@
         </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"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.is_ammeter" :key="dict.value"
+              :label="dict.value">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="通断复位" prop="isKeyMonitor">
@@ -246,7 +179,7 @@ import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
 
 export default {
   name: "BaseMonitorInfo",
-  dicts: ['is_ammeter', 'monitor_status'],
+  dicts: ['is_ammeter', 'monitor_status', 'monitor_type'],
   components: {
     Treeselect
   },
@@ -309,33 +242,33 @@ export default {
         ]
       },
       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},
+        { 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:[]
+      energyTypeList: []
     };
   },
   created() {
@@ -473,12 +406,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function () {
         return delBaseMonitorInfo(row.objId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };