liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

设备增加蓝牙设备的蓝牙名称,修复设备类型下拉数据bug

Browse Source
This commit is contained in:
微微一笑
2025-07-10 13:33:41 +08:00
parent 421df91afe
commit 3df4bc3c9b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/equipmentManagement/devices/index.vue
View File

@ -90,6 +90,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceMac" label="设备MAC" /> <el-table-column prop="deviceMac" label="设备MAC" />
<el-table-column prop="bluetoothName" label="蓝牙名称" />
<el-table-column prop="deviceImei" label="设备IMEI" /> <el-table-column prop="deviceImei" label="设备IMEI" />
<el-table-column prop="typeName" label="设备类型" /> <el-table-column prop="typeName" label="设备类型" />
<el-table-column prop="bindingStatus" label="绑定状态"> <el-table-column prop="bindingStatus" label="绑定状态">
@ -370,7 +371,7 @@ const handleDelete = async (row?: deviceVO) => {
// 批量删除逻辑 // 批量删除逻辑
let arrey = ids.value.map((item) => item.id); let arrey = ids.value.map((item) => item.id);
if (!row) { if (!row) {
const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`) as any); const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`));
if (!err) { if (!err) {
await api.deleteDevice(arrey); await api.deleteDevice(arrey);
await getList(); await getList();
@ -379,7 +380,7 @@ const handleDelete = async (row?: deviceVO) => {
return; return;
} }
// 单行删除逻辑 // 单行删除逻辑
const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？') as any); const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？'));
if (!err) { if (!err) {
await api.deleteDevice([row.id]); await api.deleteDevice([row.id]);
await getList(); await getList();
@ -466,6 +467,8 @@ const handleAdd = async () => {
// 新增时默认不显示 // 新增时默认不显示
showMacField.value = false; showMacField.value = false;
showImeiField.value = false; showImeiField.value = false;
// 每次打开弹框时获取最新的设备类型数据
getDeviceType();
}; };
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -473,6 +476,8 @@ const handleUpdate = async (row?: deviceForm) => {
reset(); reset();
dialog.visible = true; dialog.visible = true;
dialog.title = '修改设备'; dialog.title = '修改设备';
// 每次打开弹框时获取最新的设备类型数据
getDeviceType();
try { try {
if (row) { if (row) {
Object.assign(form.value, row); Object.assign(form.value, row);
@ -546,7 +551,9 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
}; };
// 覆盖默认的上传行为，可以自定义上传的实现 // 覆盖默认的上传行为，可以自定义上传的实现
const httpRequestImg = (parm) => { }; const httpRequestImg = (parm): Promise<any> => {
return Promise.resolve();
};
const beforeUpload = (file) => { const beforeUpload = (file) => {
const isLt2M = file.size / 1024 / 1024 < 2; const isLt2M = file.size / 1024 / 1024 < 2;
const isJPG = file.type === "image/jpeg" || file.type === "image/png"; const isJPG = file.type === "image/jpeg" || file.type === "image/png";