zangch
/
JDAirPort.Ems.UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ems): 调整计量设备列表和表单的显示内容

Browse Source 
- 注释掉计量设备编号、位置、采集设备编号等搜索条件
- 修改能源类型列的显示方式
- 注释掉表单中的采集设备编号、等级、传感器仪表等字段
- 调整表格列的显示状态
- 更新表单验证规则
boardTest
zch 4 weeks ago
parent a0e04c4014
commit 1cd2243184
1 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File

101
src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
Unescape Escape View File

@ -1,10 +1,10 @@
<template>
<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-form-item>
<!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <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" />
@ -15,25 +15,25 @@
: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-form-item>
<!-- <el-form-item label="计量设备位置" prop="monitorAddr">-->
<!-- <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-select>
</el-form-item>
<el-form-item label="采集设备编号" prop="collectDeviceId">
<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-select>
</el-form-item>
<!-- <el-form-item label="采集设备编号" prop="collectDeviceId">-->
<!-- <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-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -56,10 +56,12 @@
<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="energyName" v-if="columns[4].visible">
</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">
@ -132,36 +134,36 @@
:label="parseInt(dict.value)">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="采集设备编号" prop="collectDeviceId">
<el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号" />
</el-form-item>
<el-form-item label="等级" prop="grade">
<el-input v-model="form.grade" placeholder="请输入等级" />
</el-form-item>
<el-form-item label="传感器仪表" prop="meterTypeId">
<el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />
</el-form-item>
<el-form-item label="修正值" prop="correctValue">
<el-input v-model="form.correctValue" placeholder="请输入修正值" />
</el-form-item>
<!-- <el-form-item label="采集设备编号" prop="collectDeviceId">-->
<!-- <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="等级" prop="grade">-->
<!-- <el-input v-model="form.grade" placeholder="请输入等级" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="传感器仪表" prop="meterTypeId">-->
<!-- <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="修正值" prop="correctValue">-->
<!-- <el-input v-model="form.correctValue" placeholder="请输入修正值" />-->
<!-- </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-group>
</el-form-item>
<el-form-item label="通断复位" prop="isKeyMonitor">
<el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />
</el-form-item>
<el-form-item label="是否断路" prop="isCircuit">
<el-input v-model="form.isCircuit" placeholder="请输入是否断路" />
</el-form-item>
<el-form-item label="公摊表类型" prop="publicShareType">
<el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />
</el-form-item>
<el-form-item label="表具层级" prop="monitorHierarchy">
<el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
</el-form-item>
<!-- <el-form-item label="通断复位" prop="isKeyMonitor">-->
<!-- <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否断路" prop="isCircuit">-->
<!-- <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="公摊表类型" prop="publicShareType">-->
<!-- <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="表具层级" prop="monitorHierarchy">-->
<!-- <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -237,9 +239,12 @@ export default {
monitorCode: [
{ required: true, message: "计量设备编号不能为空", trigger: "blur" }
],
energyTypeId: [
monitorType: [
{ required: true, message: '能源类型不能为空', trigger: 'blur' }
]
],
monitorName: [
{ required: true, message: "计量设备名称不能为空", trigger: "blur" }
],
},
columns: [
{ key: 0, label: `自增标识`, visible: false },
@ -250,13 +255,13 @@ export default {
{ 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: 7, label: `采集设备编号`, visible: false },
{ key: 8, label: `祖级列表`, visible: false },
{ 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: 12, label: `PT值`, visible: false },
{ key: 13, label: `CT值`, visible: false },
{ key: 14, label: `是否虚拟`, visible: true },
{ key: 15, label: `通断复位`, visible: false },
{ key: 16, label: `是否断路`, visible: false },

Write Preview
Loading…
Cancel
Save