From 6db887e5daf29fa4cc5357ee6864811520720cb5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 15:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue |   72 +++++++++++++-----------------------
 1 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
index 57a7704..48e5b68 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
@@ -120,11 +120,20 @@
 
 <script>
 
+import {
+  getLightningProtectionDetection,
+  addLightningProtectionDetection,
+  deleteLightningProtectionDetection,
+  exportOfLightningProtectionDetection
+} from '@/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment'
+
+import axios from 'axios';
+
 export default {
   data() {
     return {
       search: {
-        size: 20,
+        size: 10,
         current: 1,
         total: 0
       },
@@ -152,42 +161,20 @@
   methods: {
     // 瀵煎嚭
     downLoadPost() {
-      this.$axios.get(this.$api.facilitiesAndEnvironment.exportOfLightningProtectionDetection,{responseType: "blob"}).then(res => {
+      exportOfLightningProtectionDetection().then(res => {
         this.outLoading = false
         const blob = new Blob([res],{ type: 'application/msword' });
         //灏咮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 = '闃查浄妫�娴嬪鍑�' + '.xlsx';
-              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 = '闃查浄妫�娴嬪鍑�' + '.xlsx';
-            link.click();
-            this.$message.success('瀵煎嚭鎴愬姛')
-          }
-        }
+        this.$download.saveAs(blob,'闃查浄妫�娴嬪鍑�.xlsx')
       })
     },
     initData() {
-      this.$axios.get(this.$api.facilitiesAndEnvironment.getLightningProtectionDetection + '?size=' + this.search.size + '&current=' + this.search.current).then(res => {
-        if (res.code === 201) return;
-        this.tableData = res.data.records;
-        this.search.total = res.data.total;
+      getLightningProtectionDetection({...this.search}).then(res => {
+        if (res.code === 200){
+          this.tableData = res.data.records;
+          this.search.total = res.data.total;
+        }
+
       });
     },
     handleSizeChange(val) {
@@ -223,13 +210,11 @@
           if (this.form.fileData.length > 0) {
             params.append("file", this.form.fileData[0].file)
           }
-          this.$axios.post(this.$api.facilitiesAndEnvironment.addLightningProtectionDetection, params, {
-            headers: {'Content-Type': 'multipart/form-data;'},
-            noQs: true
-          }).then(res => {
-            if (res.code === 201) return;
-            this.dialogVisible = false
-            this.initData()
+          addLightningProtectionDetection(params).then(res => {
+            if (res.code === 200){
+              this.dialogVisible = false
+              this.initData()
+            }
           });
         }
       });
@@ -248,7 +233,7 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
-        this.$axios.delete(this.$api.facilitiesAndEnvironment.deleteLightningProtectionDetection + '?lightningProtectionId=' + row.lightningProtectionId).then(res => {
+        deleteLightningProtectionDetection({lightningProtectionId:row.lightningProtectionId}).then(res => {
           this.$message.success('鍒犻櫎鎴愬姛锛�')
           this.initData()
         })
@@ -266,13 +251,8 @@
     },
     download(row) {
       let url = '';
-
-      // fileDownload.downloadIamge(url, row.fileName)
-      url = this.javaApi + 'img/' + row.systemFileName
-      const link = document.createElement('a');
-      link.href = url;
-      link.download = row.fileName;
-      link.click();
+      url = this.javaApi + '/img/' + row.systemFileName
+      this.$download.saveAs(url, row.fileName)
     }
   }
 }

--
Gitblit v1.9.3