Browse Source

下载模型文件时,FetchUrl有值时打开新窗口

niuheng 3 years ago
parent
commit
c28cffc0e5
1 changed files with 38 additions and 7 deletions
  1. 38 7
      src/components/model/file/floorTable.vue

+ 38 - 7
src/components/model/file/floorTable.vue

@@ -195,15 +195,13 @@ export default {
     },
     // 下载模型文件
     downloadModel(item) {
-      let url =
-        item.FetchUrl ||
-        (item.Url.match(/(\/image-service\S*)$/g)
-          ? item.Url.match(/(\/image-service\S*)$/g)[0]
-          : "");
+      if (item.FetchUrl) return window.open(item.FetchUrl);
+      let url = item.Url.match(/(\/image-service\S*)$/g)
+        ? item.Url.match(/(\/image-service\S*)$/g)[0]
+        : "";
       if (url) {
         let a = document.createElement("a");
         a.href = url;
-        a.target = "_blank";
         a.download = `${this.modelFolderName}${item.FloorName}模型文件v${item.Version}.rvt`;
         document.body.appendChild(a);
         a.click();
@@ -223,9 +221,9 @@ export default {
           ? item.Url.match(/(\/image-service\S*)$/g)[0]
           : "");
       if (url) {
+        return window.open(url);
         let a = document.createElement("a");
         a.href = url;
-        a.target = "_blank";
         a.download = `${this.projectId}${item.FolderId}${item.FloorName}.rvt`;
         document.body.appendChild(a);
         a.click();
@@ -349,4 +347,37 @@ export default {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </style>