From f4e6a890da2884777281031a9c736c7659c2a74a Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 14:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/channel/modbus/tag/TagForm.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/data/channel/modbus/tag/TagForm.vue b/src/views/data/channel/modbus/tag/TagForm.vue
index a8ec15d..d248a96 100644
--- a/src/views/data/channel/modbus/tag/TagForm.vue
+++ b/src/views/data/channel/modbus/tag/TagForm.vue
@@ -55,7 +55,7 @@
<el-form-item label="是否启用" prop="enabled">
<el-select v-model="formData.enabled" placeholder="请选择">
<el-option
- v-for="dict in getBoolDictOptions(DICT_TYPE.IS_ENABLED)"
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -82,7 +82,7 @@
import * as ModBusTagApi from '@/api/data/channel/modbus/tag'
import { CommonEnabled } from '@/utils/constants'
import {isPositiveInteger} from '@/utils/validate'
- import { DICT_TYPE, getStrDictOptions, getBoolDictOptions } from '@/utils/dict'
+ import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
defineOptions({name: 'ModBusTagForm'})
@@ -98,7 +98,7 @@
dataType: undefined,
enabled: CommonEnabled.ENABLE,
format: undefined,
- device: '1',
+ device: '',
address: '',
samplingRate: undefined,
tagDesc: '',
--
Gitblit v1.9.3