Merge remote-tracking branch 'origin/master'

jero-web/src/store/modules/user.js

@@ -144,21 +144,21 @@ const user = {
             path: '/documentTool/documentComparison',
             redirect: null,
             route: '1'
-          },
-          {
-            component: 'onlyoffice/index',
-            meta: {
-              componentName: 'onlyoffice',
-              icon: 'icon-24gf-folderOpen',
-              internalOrExternal: false,
-              keepAlive: false,
-              title: 'onlyoffice'
-            },
-            name: 'onlyoffice',
-            path: '/onlyoffice',
-            redirect: null,
-            route: '1'
           }
+          // {
+          //   component: 'onlyoffice/index',
+          //   meta: {
+          //     componentName: 'onlyoffice',
+          //     icon: 'icon-24gf-folderOpen',
+          //     internalOrExternal: false,
+          //     keepAlive: false,
+          //     title: 'onlyoffice'
+          //   },
+          //   name: 'onlyoffice',
+          //   path: '/onlyoffice',
+          //   redirect: null,
+          //   route: '1'
+          // }
         ]
         commit('SET_PERMISSIONLIST', menuData)
         resolve(menuData)

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

@@ -10,6 +10,8 @@
 
 <script>
 import { postAction, getAction } from '../../api/manage'
+import { ACCESS_TOKEN, OAUTH2_LOGIN_PAGE_PATH } from '@/store/mutation-types'
+import Vue from 'vue'
 
 export default {
   name: 'index',
@@ -32,6 +34,8 @@ export default {
               const focalUnit = '归口单位'
               const watermark = '比亚迪'
               const replaceStand = ''
+              const Authorization = 'token'
+              const appId = 'appId'
               // http://39.98.140.126:8999
               // http://127.0.0.1:8080
               window.open(window.CONFIG.onlyOfficeRoute + '/editor?fileId=' + val.id + '&pid=' + val.pid +
@@ -40,7 +44,8 @@ export default {
                 '&key=' + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
                 '&userId=' + val.userId + '&userName=admin' + '&standCode=' + standCode +
                 '&standName=' + standName + '&replaceStand=' + replaceStand + '&draftsman=' + draftsman +
-                '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark)
+                '&draftingDepartment=' + draftingDepartment + '&focalUnit=' + focalUnit + '&watermark=' + watermark +
+                '&Authorization=' + Authorization + '&appId=' + appId)
             }
           })
         } else {