Z 1 rok temu
rodzic
commit
76bce50b3d
1 zmienionych plików z 18 dodań i 15 usunięć
  1. 18 15
      src/BIZComponents/addDoc/browse.vue

+ 18 - 15
src/BIZComponents/addDoc/browse.vue

@@ -35,21 +35,24 @@ export default {
     },
     setFileUrl(row) {
       let file = row.storagePath[0];
-      let url = sessionStorage.filePath + file.storePath;
-      const fileExt = file.name.substr(file.name.lastIndexOf('.') + 1);
-      this.fileType = getFileType().includes(fileExt) ? 2 : 1;
-      if (this.fileType == 2) {
-        this.fileUrl =
-          '/fm/' +
-          (['dxf', 'dwg'].includes(fileExt) ? '2DViewer' : '3DViewer') +
-          '/view.html?url=' +
-          sessionStorage.filePath +
-          '/' +
-          row.outputNdsFiles;
-      } else {
-        this.fileUrl = '/kkfile/onlinePreview?url=' + btoa(url);
-        // 'http://192.168.1.107:18082/kkfile/onlinePreview?url=' + btoa(url);
-      }
+      let fileNames=file.storePath.split('/')
+      let url = window.location.origin+'/api/main/file/getFile?objectName='+file.storePath+'&fullfilename='+fileNames[fileNames.length-1]
+      this.fileUrl = '/kkfile/onlinePreview?url=' + btoa(url);
+      
+      // const fileExt = file.name.substr(file.name.lastIndexOf('.') + 1);
+      // this.fileType = getFileType().includes(fileExt) ? 2 : 1;
+      // if (this.fileType == 2) {
+      //   this.fileUrl =
+      //     '/fm/' +
+      //     (['dxf', 'dwg'].includes(fileExt) ? '2DViewer' : '3DViewer') +
+      //     '/view.html?url=' +
+      //     sessionStorage.filePath +
+      //     '/' +
+      //     row.outputNdsFiles;
+      // } else {
+      //   this.fileUrl = '/kkfile/onlinePreview?url=' + btoa(url);
+      //   // 'http://192.168.1.107:18082/kkfile/onlinePreview?url=' + btoa(url);
+      // }
     }
   }
 };