style:采集设备删除采集周期、连接字段

main
黄伟杰 1 month ago
parent 755978994f
commit 8dbf3003ad

@ -3575,7 +3575,7 @@ export default {
protocol: 'Protocol', protocol: 'Protocol',
status: 'Connection Status', status: 'Connection Status',
sampleCycle: 'Sample Cycle(s)', sampleCycle: 'Sample Cycle(s)',
isEnable: 'Yes or No', isEnable: 'Enabled',
collectionTime: 'Collection Time', collectionTime: 'Collection Time',
operate: 'Operation', operate: 'Operation',

@ -3416,7 +3416,7 @@ export default {
protocol: '采集协议', protocol: '采集协议',
status: '连接状态', status: '连接状态',
sampleCycle: '采集周期(s)', sampleCycle: '采集周期(s)',
isEnable: '是或否', isEnable: '启用',
collectionTime: '采集时间', collectionTime: '采集时间',
operate: '操作', operate: '操作',

@ -79,12 +79,6 @@
<el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('DataCollection.Device.sampleCycle')" prop="sampleCycle">
<el-input
v-model="formData.sampleCycle"
:placeholder="t('DataCollection.Device.placeholderSampleCycle')"
/>
</el-form-item>
<!-- <el-form-item label="备注" prop="remark"> <!-- <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> --> </el-form-item> -->
@ -102,12 +96,6 @@
</template> </template>
<template v-else-if="formType === 'update'"> <template v-else-if="formType === 'update'">
<el-form-item :label="t('DataCollection.Device.sampleCycle')" prop="sampleCycle">
<el-input
v-model="formData.sampleCycle"
:placeholder="t('DataCollection.Device.placeholderSampleCycle')"
/>
</el-form-item>
<el-form-item :label="t('DataCollection.Device.isEnable')" prop="isEnable"> <el-form-item :label="t('DataCollection.Device.isEnable')" prop="isEnable">
<el-radio-group v-model="formData.isEnable"> <el-radio-group v-model="formData.isEnable">
<el-radio <el-radio
@ -180,11 +168,9 @@ const formRules = reactive({
create: { create: {
deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }], deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }], deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
}, },
update: { update: {
sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
}, },
setting: { setting: {

@ -101,8 +101,6 @@
<dict-tag :type="DICT_TYPE.IOT_GATEWAY_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.IOT_GATEWAY_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('DataCollection.Device.sampleCycle')" align="center" prop="sampleCycle" width="120px" />
<!-- <el-table-column label="读主题" align="center" prop="readTopic" /> <!-- <el-table-column label="读主题" align="center" prop="readTopic" />
<el-table-column label="写主题" align="center" prop="writeTopic" /> <el-table-column label="写主题" align="center" prop="writeTopic" />
<el-table-column label="网关id" align="center" prop="gatewayId" /> --> <el-table-column label="网关id" align="center" prop="gatewayId" /> -->
@ -165,11 +163,6 @@
> >
{{ t('action.edit') }} {{ t('action.edit') }}
</el-button> </el-button>
<el-button
link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
:loading="!!connectLoadingMap[scope.row.id]" @click.stop="handleToggleConnect(scope.row)">
{{ isRowConnected(scope.row) ? t('DataCollection.Device.disconnect') : t('DataCollection.Device.connect') }}
</el-button>
<el-button <el-button
link link
type="danger" type="danger"
@ -669,7 +662,13 @@ const handleDeviceEnableChange = async (row: DeviceVO, value: boolean) => {
;(row as any).isEnable = value ;(row as any).isEnable = value
try { try {
await DeviceApi.updateDeviceEnabled(row.id, value ? 'true' : 'false') await DeviceApi.updateDeviceEnabled(row.id, value ? 'true' : 'false')
message.success(t('common.updateSuccess')) const name = (row as any).deviceName ?? (row as any).deviceCode ?? ''
const suffix = value ? '已启用' : '已停用'
if (name) {
message.success(`${name}${suffix}`)
} else {
message.success(suffix)
}
} catch { } catch {
;(row as any).isEnable = oldValue ;(row as any).isEnable = oldValue
message.error(t('common.updateFail')) message.error(t('common.updateFail'))

Loading…
Cancel
Save