feat:【IoT 物联网】移除 deviceKey 参数

pull/764/MERGE
YunaiV 2025-06-14 09:06:49 +08:00
parent 8d234700cf
commit aac0ad3e16
3 changed files with 2 additions and 33 deletions

View File

@ -3,7 +3,6 @@ import request from '@/config/axios'
// IoT 设备 VO // IoT 设备 VO
export interface DeviceVO { export interface DeviceVO {
id: number // 设备 ID主键自增 id: number // 设备 ID主键自增
deviceKey: string // 设备唯一标识符
deviceName: string // 设备名称 deviceName: string // 设备名称
productId: number // 产品编号 productId: number // 产品编号
productKey: string // 产品标识 productKey: string // 产品标识

View File

@ -23,19 +23,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="DeviceKey" prop="deviceKey">
<el-input
v-model="formData.deviceKey"
placeholder="请输入 DeviceKey"
:disabled="formType === 'update'"
>
<template #append>
<el-button @click="generateDeviceKey" :disabled="formType === 'update'">
重新生成
</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="DeviceName" prop="deviceName"> <el-form-item label="DeviceName" prop="deviceName">
<el-input <el-input
v-model="formData.deviceName" v-model="formData.deviceName"
@ -108,7 +95,6 @@ const formType = ref('') // 表单的类型create - 新增update - 修改
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
productId: undefined, productId: undefined,
deviceKey: undefined as string | undefined,
deviceName: undefined, deviceName: undefined,
nickname: undefined, nickname: undefined,
picUrl: undefined, picUrl: undefined,
@ -119,14 +105,6 @@ const formData = ref({
}) })
const formRules = reactive({ const formRules = reactive({
productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }], productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
deviceKey: [
{ required: true, message: 'DeviceKey 不能为空', trigger: 'blur' },
{
pattern: /^[a-zA-Z0-9]+$/,
message: 'DeviceKey 只能包含字母和数字',
trigger: 'blur'
}
],
deviceName: [ deviceName: [
{ required: true, message: 'DeviceName 不能为空', trigger: 'blur' }, { required: true, message: 'DeviceName 不能为空', trigger: 'blur' },
{ {
@ -183,8 +161,6 @@ const open = async (type: string, id?: number) => {
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} else {
generateDeviceKey()
} }
// //
@ -234,7 +210,6 @@ const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
productId: undefined, productId: undefined,
deviceKey: undefined,
deviceName: undefined, deviceName: undefined,
nickname: undefined, nickname: undefined,
picUrl: undefined, picUrl: undefined,
@ -255,9 +230,4 @@ const handleProductChange = (productId: number) => {
const product = products.value?.find((item) => item.id === productId) const product = products.value?.find((item) => item.id === productId)
formData.value.deviceType = product?.deviceType formData.value.deviceType = product?.deviceType
} }
/** 生成 DeviceKey */
const generateDeviceKey = () => {
formData.value.deviceKey = generateRandomStr(16)
}
</script> </script>

View File

@ -208,11 +208,11 @@
<dict-tag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="item.deviceType" /> <dict-tag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="item.deviceType" />
</div> </div>
<div class="mb-2.5 last:mb-0"> <div class="mb-2.5 last:mb-0">
<span class="text-[#717c8e] mr-2.5">DeviceKey</span> <span class="text-[#717c8e] mr-2.5">备注名称</span>
<span <span
class="text-[#0b1d30] inline-block align-middle overflow-hidden text-ellipsis whitespace-nowrap max-w-[130px]" class="text-[#0b1d30] inline-block align-middle overflow-hidden text-ellipsis whitespace-nowrap max-w-[130px]"
> >
{{ item.deviceKey }} {{ item.deviceName || '-' }}
</span> </span>
</div> </div>
</div> </div>