From 11317bf89e4d4194f84229c3d89a786b323c6be4 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期四, 23 一月 2020 15:16:16 +0800
Subject: [PATCH] merge

---
 src/components/square.vue |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/square.vue b/src/components/square.vue
index fc93bcd..f7c0a4c 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -51,7 +51,7 @@
 	 </div>
 	 
 	  <span slot="footer" class="dialog-footer">
-	    <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download">涓� 杞�</el-button>
+	    <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download(selectOne)">涓� 杞�</el-button>
 	  </span>
 	</el-dialog>
 	
@@ -73,6 +73,7 @@
 		  ref="upload"
 			:on-change="onChange"
 		  :on-exceed="handleExceed"
+		  :on-success="uploadSuccess"
 			>
 		  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
 		  <div slot="tip" class="el-upload__tip">涓嶈秴杩�50M</div>
@@ -83,7 +84,9 @@
 	    <el-button type="primary" @click="createTopic">纭� 瀹�</el-button>
 	  </div>
 	</el-dialog>
-	
+	<div style="width: 0px; height: 0px;">
+	  <iframe ref="frame_export" style="width: 0px; height: 0px;"></iframe>
+	</div>
 		</div>
 </template>
 
@@ -133,6 +136,17 @@
 			this.getData();
 		},
 		methods: {
+			download(val) {
+				if(val) {
+					this.$refs.frame_export.src = "/api/api/file/download/" + val.id;
+				}else {
+						this.$message({message:'鑾峰彇鍦板潃澶辫触', type: 'warning'});
+				}
+				
+			},
+			uploadSuccess() {
+				this.dialogFormVisible = false;
+			},
 			onChange(file, fileList) {
 				this.fileList = [];
 				this.fileList = fileList;

--
Gitblit v1.8.0