From 7edce9d027ae6b4b17457baa9bbd900db9b32baf Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期一, 03 三月 2025 15:01:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue | 59 ++++++++++++++++------------------------------------------- 1 files changed, 16 insertions(+), 43 deletions(-) diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue b/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue index 6ebd342..dc5e05f 100644 --- a/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue +++ b/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue @@ -38,7 +38,11 @@ <script> import FailureForm from "./failureForm.vue"; - +import { + pageDeviceBreakdownMaintenance, + exportDeviceBreakdownMaintenance, + delDeviceBreakdownMaintenance, +} from '@/api/cnas/resourceDemand/device.js' export default { name: "equipment-failure", // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� @@ -71,19 +75,10 @@ // 鏌ヨ getYearTableDetailData(deviceId) { this.yearTableDetailDataLoading = true - this.$axios.post(this.$api.deviceBreakdownMaintenance.pageDeviceBreakdownMaintenance, { - page: { - current: this.pagination1.current, - size: this.pagination1.size, - }, - entity: { - deviceId: deviceId, - } - }, { - headers: { - 'Content-Type': 'application/json' - }, - noQs: true + pageDeviceBreakdownMaintenance({ + current: this.pagination1.current, + size: this.pagination1.size, + deviceId: deviceId, }).then(res => { if (res.code == 200) { this.yearTableDetailData = res.data.records @@ -117,37 +112,13 @@ // 瀵煎嚭 handleDownOne(id) { this.outLoading = true - this.$axios.get(this.$api.deviceBreakdownMaintenance.exportDeviceBreakdownMaintenance + '?maintenanceId=' + id, { - responseType: "blob" + exportDeviceBreakdownMaintenance({ + maintenanceId: id }).then(res => { this.outLoading = false const blob = new Blob([res], { type: 'application/octet-stream' }); - //灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆 - let reader = new FileReader(); - reader.readAsText(blob, 'utf-8'); - reader.onload = () => { - try { - let result = JSON.parse(reader.result); - if (result.message) { - this.$message.error(result.message); - } else { - const url = URL.createObjectURL(blob); - const link = document.createElement('a'); - link.href = url; - link.download = '浠櫒璁惧淇悊鐢宠琛�.doc'; - link.click(); - this.$message.success('瀵煎嚭鎴愬姛') - } - } catch (err) { - console.log(err); - const url = URL.createObjectURL(blob); - const link = document.createElement('a'); - link.href = url; - link.download = '浠櫒璁惧淇悊鐢宠琛�.doc'; - link.click(); - this.$message.success('瀵煎嚭鎴愬姛') - } - } + this.$download.saveAs(blob, '浠櫒璁惧淇悊鐢宠琛�.doc') + this.$message.success('瀵煎嚭鎴愬姛') }) }, // 鍒犻櫎 @@ -157,7 +128,9 @@ cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => { - this.$axios.get(this.$api.deviceBreakdownMaintenance.delDeviceBreakdownMaintenance + '?maintenanceId=' + id).then(res => { + delDeviceBreakdownMaintenance({ + maintenanceId: id + }).then(res => { this.$message.success('鍒犻櫎鎴愬姛锛�'); this.getYearTableDetailData(this.clickNodeVal.value); }); -- Gitblit v1.9.3