Merge branch 'develop' into FOTON

# Conflicts:
#	public/static/onlyOffice/onlinePreview.html

public/static/onlyOffice/editor.html

@@ -19,7 +19,6 @@
     <div id="iframeEditor"></div>
 </div>
 <script type="text/javascript">
-    import { baseUrl } from '@/sysConfig'
 
     // var preview = GetQueryValue('preview')
     // var vm = new Vue({
@@ -109,7 +108,7 @@
     "documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
     "editorConfig": {
       // 此处配置回调地址
-      "callbackUrl": baseUrl+`/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
+      "callbackUrl": `127.0.0.1:8080/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
       "mode":"edit",
       "lang":"zh-CN",
       // "customization": {