diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue index e62f049..fd7b37d 100644 --- a/src/views/equipmentManagement/devices/index.vue +++ b/src/views/equipmentManagement/devices/index.vue @@ -90,6 +90,7 @@ + @@ -370,7 +371,7 @@ const handleDelete = async (row?: deviceVO) => { // 批量删除逻辑 let arrey = ids.value.map((item) => item.id); 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) { await api.deleteDevice(arrey); await getList(); @@ -379,7 +380,7 @@ const handleDelete = async (row?: deviceVO) => { return; } // 单行删除逻辑 - const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项?') as any); + const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项?')); if (!err) { await api.deleteDevice([row.id]); await getList(); @@ -466,6 +467,8 @@ const handleAdd = async () => { // 新增时默认不显示 showMacField.value = false; showImeiField.value = false; + // 每次打开弹框时获取最新的设备类型数据 + getDeviceType(); }; /** 修改按钮操作 */ @@ -473,6 +476,8 @@ const handleUpdate = async (row?: deviceForm) => { reset(); dialog.visible = true; dialog.title = '修改设备'; + // 每次打开弹框时获取最新的设备类型数据 + getDeviceType(); try { if (row) { Object.assign(form.value, row); @@ -546,7 +551,9 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => { }; // 覆盖默认的上传行为,可以自定义上传的实现 -const httpRequestImg = (parm) => { }; +const httpRequestImg = (parm): Promise => { + return Promise.resolve(); +}; const beforeUpload = (file) => { const isLt2M = file.size / 1024 / 1024 < 2; const isJPG = file.type === "image/jpeg" || file.type === "image/png";