fix(ems): 修复数据字典引用错误

- 在 baseCollectDeviceInfo 组件中,将 isFlag 字段的字典类型从 is_flag 修改为 base_collect_device_info_is_flag
- 在 baseMonitorInfoIOTDevice 组件中,将 monitorStatus 和 isAmmeter 字段的字典类型分别修改为 monitor_info_monitor_status 和 monitor_infois_ammeter
IOT
zch 2 months ago
parent dc5b922edf
commit 8fbf4465c1

@ -110,7 +110,7 @@
<el-table-column label="安装地址" align="center" prop="settingAddress" v-if="columns[8].visible"/> <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"> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <dict-tag :options="dict.type.base_collect_device_info_is_flag" :value="scope.row.isFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/> <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
@ -187,7 +187,7 @@
<el-form-item label="启用标识" prop="isFlag"> <el-form-item label="启用标识" prop="isFlag">
<el-radio-group v-model="form.isFlag"> <el-radio-group v-model="form.isFlag">
<el-radio <el-radio
v-for="dict in dict.type.is_flag" v-for="dict in dict.type.base_collect_device_info_is_flag"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{ dict.label }} >{{ dict.label }}

@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="计量设备状态" prop="monitorStatus"> <el-form-item label="计量设备状态" prop="monitorStatus">
<el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable> <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 dict.type.monitor_info_monitor_status" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -31,7 +31,7 @@
</el-form-item> </el-form-item>
<el-form-item label="是否虚拟" prop="isAmmeter"> <el-form-item label="是否虚拟" prop="isAmmeter">
<el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable> <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.monitor_infois_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -64,7 +64,7 @@
<el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[5].visible" /> <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"> <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" /> <dict-tag :options="dict.type.monitor_info_monitor_status" :value="scope.row.monitorStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" /> <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
@ -73,7 +73,7 @@
<el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" /> <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"> <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" /> <dict-tag :options="dict.type.monitor_infois_ammeter" :value="scope.row.isAmmeter" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" /> <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
@ -128,7 +128,7 @@
</el-form-item> </el-form-item>
<el-form-item label="计量设备状态" prop="monitorStatus"> <el-form-item label="计量设备状态" prop="monitorStatus">
<el-radio-group v-model="form.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 dict.type.monitor_info_monitor_status" :key="dict.value"
:label="parseInt(dict.value)">{{ dict.label }}</el-radio> :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -146,7 +146,7 @@
</el-form-item> </el-form-item>
<el-form-item label="是否虚拟" prop="isAmmeter"> <el-form-item label="是否虚拟" prop="isAmmeter">
<el-radio-group v-model="form.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 dict.type.monitor_infois_ammeter" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio> :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>

Loading…
Cancel
Save