change -能源类型用字典显示

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
+        <el-input v-model="queryParams.monitorCode" placeholder="请输入计量设备编号" clearable
-          v-model="queryParams.monitorCode"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入计量设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="计量设备名称" prop="monitorName">
-        <el-input
+        <el-input v-model="queryParams.monitorName" placeholder="请输入计量设备名称" clearable
-          v-model="queryParams.monitorName"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入计量设备名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="能源类型" prop="monitorType">
         <el-select v-model="queryParams.monitorType" placeholder="请选择能源类型">
-          <el-option
+          <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
-            v-for="item in energyTypeList"
+            :value="item.energyTypeId"></el-option>
-            :key="item.energyTypeId"
-            :label="item.energyName"
-            :value="item.energyTypeId"
-          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="计量设备位置" prop="monitorAddr">
-        <el-input
+        <el-input v-model="queryParams.monitorAddr" placeholder="请输入计量设备位置" clearable
-          v-model="queryParams.monitorAddr"
+          @keyup.enter.native="handleQuery" />
-          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
+          <el-option v-for="dict in dict.type.monitor_status" :key="dict.value" :label="dict.label"
-            v-for="dict in dict.type.monitor_status"
+            :value="dict.value" />
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="采集设备编号" prop="collectDeviceId">
-        <el-input
+        <el-input v-model="queryParams.collectDeviceId" placeholder="请输入采集设备编号" clearable
-          v-model="queryParams.collectDeviceId"
+          @keyup.enter.native="handleQuery" />
-          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
+          <el-option v-for="dict in dict.type.is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
-            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,39 +42,25 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['ems/base:baseMonitorInfo:add']">新增</el-button>
-          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
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</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
+    <el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId"
-      v-if="refreshTable"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-      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">
@@ -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
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            size="mini"
+            v-hasPermi="['ems/base:baseMonitorInfo:edit']">修改</el-button>
-            type="text"
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
-            icon="el-icon-edit"
+            v-hasPermi="['ems/base:baseMonitorInfo:add']">新增</el-button>
-            @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['ems/base:baseMonitorInfo:edit']"
+            v-hasPermi="['ems/base:baseMonitorInfo:remove']">删除</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
-            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="请输入计量设备编号" />
@@ -176,12 +119,8 @@
         </el-form-item>
         <el-form-item label="能源类型" prop="monitorType">
           <el-select v-model="form.monitorType" placeholder="请选择能源类型">
-          <el-option
+            <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
-            v-for="item in energyTypeList"
+              :value="item.energyTypeId"></el-option>
-            :key="item.energyTypeId"
-            :label="item.energyName"
-            :value="item.energyTypeId"
-          ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="计量设备位置" prop="monitorAddr">
@@ -189,11 +128,8 @@
         </el-form-item>
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
-            <el-radio
+            <el-radio v-for="dict in dict.type.monitor_status" :key="dict.value"
-              v-for="dict in dict.type.monitor_status"
+              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
-              :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
+            <el-radio v-for="dict in dict.type.is_ammeter" :key="dict.value"
-              v-for="dict in dict.type.is_ammeter"
+              :label="dict.value">{{ dict.label }}</el-radio>
-              :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
   },