Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectFileServiceImpl.java

@@ -118,6 +118,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
     }
 
     public void downloadLocal(HttpServletResponse response, String downLoadpath, ProjectFile file, String path) throws FileNotFoundException, UnsupportedEncodingException {
+        System.out.println("123123");
 //        // 下载本地文件
 //        String fileName = file.getFileName().toString(); // 文件的默认保存名
 //        // 读到流中

ys_vue/src/views/project/projectDetail.vue

@@ -104,11 +104,11 @@
                                 <el-table-column prop="indate" label="上传时间" width="200" align="center" sortable></el-table-column>
                                 <el-table-column label="操作" width="220" align="center" sortable>
                                     <template slot-scope="scope" v-if="download == 1">
-                                        <a :href="scope.row.url" :download="scope.row.fileName">
+                                        <!-- <a :href="scope.row.url" :download="scope.row.fileName"> -->
                                             <el-button size="small" @click="dowloadFile(scope.row)">
                                                 下载
                                             </el-button>
-                                        </a>
+                                        <!-- </a> -->
                                         <el-button size="small" type="danger" @click="fileDel(scope.row.id)" v-if="scope.row.uploaderId == user.id">删除</el-button>
                                     </template>
                                     <template slot-scope="scope" v-else>
@@ -913,7 +913,15 @@
             dowloadFile(row) {
                 this.http.post(this.port.project.dowloadFile, {
                     id: row.id
-                }, res => {
+                } , res => {
+                    const elink = document.createElement('a')
+                    elink.download = row.fileName
+                    elink.style.display = 'none'
+                    const blob = new Blob([res])
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    document.body.removeChild(elink)
                     this.getOperList();
                 }, error => {
                 })