Merge remote-tracking branch 'origin/master'

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java

@@ -462,7 +462,7 @@ public class OnlyOfficeController {
             response.setCharacterEncoding(StandardCharsets.UTF_8.name());
             response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\"");
             response.setContentType("application/octet-stream");
-            File file = new File(filePath + ossFile.getUrl() + ossFile.getFileName());
+            File file = new File(filePath + ossFile.getUrl());
             is = new FileInputStream(file);
             os = response.getOutputStream();
             IOUtils.copy(is, os);

jero-web/src/views/onlyoffice/index.vue

@@ -14,9 +14,7 @@ import { postAction, getAction } from '../../api/manage'
 export default {
   name: 'index',
   data () {
-    return {
+    return {}
-
-    }
   },
   methods: {
     fileClick () {
@@ -28,11 +26,19 @@ export default {
               const nowTime = new Date().getTime()
               const standCode = 'x/xx xxxx-xxxx'
               const standName = '比亚迪企业标准'
-              window.open('http://127.0.0.1:8080' + '/editor?fileId=' + val.id + '&pid=' + val.pid +
+              const draftingDepartment = '起草部门'
+              const draftsman = '起草人'
+              const assessor = '评审人员'
+              const focalUnit = '归口单位'
+              // http://39.98.140.126:8999
+              // http://127.0.0.1:8080
+              window.open('http://39.98.140.126:8999' + '/editor?fileId=' + val.id + '&pid=' + val.pid +
                 '&taskIds=' + val.taskId + '&editType=' + val.editType + '&oldFileName=' + oldFileName +
-                '&fileType=' + 'docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
+                '&fileType=docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
                 '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
-                '&userId=' + val.userId + '&userName=' + 'admin' + '&isEdit=123' + '&standCode=' + standCode + '&standName=' + standName)
+                '&userId=' + val.userId + '&userName=' + 'admin' + '&isEdit=123' + '&standCode=' + standCode +
+                '&standName=' + standName + '&draftingDepartment=' + draftingDepartment + '&draftsman=' + draftsman +
+                '&assessor=' + assessor + '&focalUnit=' + focalUnit)
             }
           })
         } else {
@@ -45,7 +51,7 @@ export default {
 </script>
 
 <style scoped>
-.onlyoffice-box{
+  .onlyoffice-box {
     width: 100%;
-}
+  }
 </style>