From 18e0e35bfbe10edaf3adfda955a1d41b91f535ad Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Apr 2023 11:52:35 +0800
Subject: [PATCH] 1

---
 src/views/modules/eam/com_eam_object_add_update.vue |  8 ++++++++
 src/views/modules/eam/eam_device_list.vue           | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue
index e6f24c3..ebb7955 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -78,6 +78,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item class="customer-item" label="关联机台:" >
+              <el-input v-model="pageData.resourceID" style="width: 120px;" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="saveEamObject()">保存</el-button>
@@ -115,6 +122,7 @@ export default {
         groupID: '',
         supplierID: '',
         manufacturerID: '',
+        resourceID: '',
         seqNo: '',
         purchessDate: '',
         active: 'Y',
diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 493cb5e..55db6f3 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -148,7 +148,7 @@
             label="操作">
             <template slot-scope="scope">
               <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>
-              <a  @click="downloadFile(scope.row.url)" >下载2</a>
+              <a  @click="downloadFile(scope.row)" >下载2</a>
             </template>
           </el-table-column>
         </el-table>
@@ -922,6 +922,7 @@
   import {
     deleteResourceSpare,
   } from '@/api/partspare/resourcespare.js'
+  import FileSaver from 'file-saver';
   /*引入組件*/
   import comAddUpdateEamObject from "./com_eam_object_add_update";/*新增或者修改的組件*/
   import comEamObjectUploadFile from "./com_eam_object_upload_file";/*上传文件的組件*/
@@ -3122,8 +3123,11 @@
 
         return this.exportList;
       },
-      downloadFile(url){
-
+      downloadFile(row){
+        var file = new Blob("http://192.168.1.130:80/file/"+row.url, {
+          type: 'application/'+'txt'
+        });
+        FileSaver.saveAs(file,row.fileName);
       },
       startDownload() {
         //  this.exportData = this.dataList