Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangzhijiang
2024-03-21 10:36:35 +08:00
2 changed files with 18 additions and 2 deletions
+17 -1
View File
@@ -9,6 +9,23 @@
<!--<link rel="icon" href="<%= BASE_URL %>logo.png"> -->
<script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
<script src="<%= BASE_URL %>api_address_config.js"></script>
<!-- 全局配置 -->
<% if (process.env.NODE_ENV === 'development' ) { %>
<script>
window.CONFIG = {
//onlyoffice前端路由
'onlyOfficeRoute': 'http://127.0.0.1:8080',
};
</script>
<% } %>
<% if (process.env.NODE_ENV === 'production' ) { %>
<script>
window.CONFIG = {
//onlyoffice前端路由
'onlyOfficeRoute': 'http://127.0.0.1:8080',
};
</script>
<% } %>
<style>
html,
body,
@@ -280,7 +297,6 @@
overflow-x: auto !important;
}
</style>
<!-- 全局配置 -->
</head>
<body>
+1 -1
View File
@@ -34,7 +34,7 @@ export default {
const replaceStand = ''
// http://39.98.140.126:8999
// http://127.0.0.1:8080
window.open('http://127.0.0.1:8082' + '/editor?fileId=' + val.id + '&pid=' + val.pid +
window.open(window.CONFIG.onlyOfficeRoute + '/editor?fileId=' + val.id + '&pid=' + val.pid +
'&taskIds=' + val.taskId + '&oldFileName=' + oldFileName + '&assessor=' + assessor +
'&fileType=docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
'&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +