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/maintenance.vue |   49 +++++++++++++++----------------------------------
 1 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/maintenance.vue b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
index 8510263..ab1d867 100644
--- a/src/views/CNAS/resourceDemand/device/component/maintenance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
@@ -118,8 +118,10 @@
 <script>
 import {
   exportMaintenanceRecord,
-  deviceMaintainDelete,
+  deleteDeviceMaintenance,
   selectDeviceByCode,
+  addDeviceMaintenance,
+  getDeviceMaintenancePage,
 } from '@/api/cnas/resourceDemand/device.js'
 export default {
   props: {
@@ -180,33 +182,8 @@
       exportMaintenanceRecord({ deviceId: this.clickNodeVal.value }).then(res => {
         this.outLoading = false
         const blob = new Blob([res], { type: 'application/octet-stream' });
+        this.$download.saveAs(blob, '璁惧缁存姢淇濆吇璁板綍.doc')
         this.$message.success('瀵煎嚭鎴愬姛')
-        //灏咮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('瀵煎嚭鎴愬姛')
-          }
-        }
       })
     },
     //鎿嶄綔璇︽儏鍒犻櫎
@@ -216,9 +193,10 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
-        deviceMaintainDelete(row.id).then(res => {
+        deleteDeviceMaintenance({ id: row.id }).then(res => {
         })
-        this.MaintainParam.splice(index, 1);
+        // this.MaintainParam.splice(index, 1);
+        this.getAllMessage(this.clickNodeVal.value)
         this.$message({
           type: 'success',
           message: '鍒犻櫎鎴愬姛!'
@@ -246,15 +224,15 @@
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.formData.deviceId = this.clickNodeVal.value;
-          this.$axios.post(this.$api.deviceCheck.deviceMaintainAdd, this.formData).then(res => {
+          addDeviceMaintenance(this.formData).then(res => {
             if (res.code == 200) {
               this.$message.success('娣诲姞鎴愬姛');
               this.getAllMessage(this.clickNodeVal.value)
+              this.dialogVisible = false;
+              this.formData = {}; //娓呯┖琛ㄥ崟
             }
           })
-          this.MaintainParam.push(this.formData)
-          this.dialogVisible = false;
-          this.formData = {}; //娓呯┖琛ㄥ崟
+          // this.MaintainParam.push(this.formData)
         }
       })
     },
@@ -269,7 +247,10 @@
     },
     //鑾峰彇琛ㄥ崟璁惧缁存姢淇℃伅
     getAllMessage(deviceId) {
-      this.$axios.get(this.$api.deviceCheck.getDeviceMaintenancePage + "?deviceId=" + deviceId + "&size=" + this.search.size + "&current=" + this.search.current + "&deviceNumber=" + this.search.deviceNumber).then(res => {
+      getDeviceMaintenancePage({
+        deviceId,
+        ...this.search
+      }).then(res => {
         if (res.code == 200) {
           this.MaintainParam = res.data.records
           this.search.total = res.data.total

--
Gitblit v1.9.3