diff --git a/src/views/manage/datas/edit.vue b/src/views/manage/datas/edit.vue index a9a3926..3a84669 100644 --- a/src/views/manage/datas/edit.vue +++ b/src/views/manage/datas/edit.vue @@ -111,17 +111,17 @@ 确 定 取 消 - + + list-type="picture" multiple accept="application/json,text/plain,image/jpeg"> 选择文件 @@ -219,7 +219,7 @@ const handleSubmit = useThrottleFn(() => { function handleChangeFiles(uploadFile, uploadFiles) { //uploadFile.status = 'success'; clearTimeout(autoTime.value); - if (uploadFile.raw.type == "application/json") { + if (uploadFile.raw.type == "application/json" || uploadFile.raw.type == "text/plain") { uploadJsonList.value.push(uploadFile); } autoTime.value = setTimeout(doEquipmentFiles, 280); @@ -228,7 +228,7 @@ function handleChangeFiles(uploadFile, uploadFiles) { /** 上传文件>回调 */ const doEquipmentFiles = () => { uploadImgFileList.value = uploadImgFileList.value.filter( - (it) => it.raw.type != "application/json" + (it) => it.raw.type != "application/json" && it.raw.type != "text/plain" ); if (form.value.dats_label_type != "no_label") { var element = document.getElementsByClassName("upload-demo-3")[0]; diff --git a/src/views/manage/equipment/addPcie.vue b/src/views/manage/equipment/addPcie.vue index f9ce5c9..98f00fe 100644 --- a/src/views/manage/equipment/addPcie.vue +++ b/src/views/manage/equipment/addPcie.vue @@ -74,7 +74,9 @@ const queryParams = reactive({ function getCurrentRow(row) { form.uuid = row.uuid; form.pcie_index = row.pcie_index; - form.infomation = row.manufacturer; + form.device_name = row.device_name; + form.device_desc = row.device_desc; + form.infomation = row.infomation; form.manufacturer = row.manufacturer; form.hardware_chip = row.hardware_chip; form.hardware_model = row.hardware_model; diff --git a/src/views/manage/equipment/index.vue b/src/views/manage/equipment/index.vue index 164bba0..29ec617 100644 --- a/src/views/manage/equipment/index.vue +++ b/src/views/manage/equipment/index.vue @@ -5,8 +5,8 @@