FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source 
# Conflicts:
#	src/sysConfig/index.js
This commit is contained in:
super_liu
2021-12-23 21:49:51 +08:00
parent 56d4001250 b5b9d29410
commit b3c7d44667
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/preview/index.js
+5 -2
View File
@@ -1,8 +1,9 @@
/** /**
* 文件预览 * 文件预览
*/ */
import { onlyOfficeUrl } from '@/sysConfig' import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import { getBusStandFileByAttId } from 'api/process' import { getBusStandFileByAttId } from 'api/process'
let Base64 = require('js-base64').Base64;
export default attId => { export default attId => {
getBusStandFileByAttId({ getBusStandFileByAttId({
attId attId
@@ -15,7 +16,9 @@ export default attId => {
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}else { }else {
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
} }
} }
}).catch(e => { }).catch(e => {
src/sysConfig/index.js
+8 -3
View File
@@ -20,6 +20,10 @@ const webLoginType = 'idm'
// 配置onlyOffice 前端服务 // 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088' const onlyOfficeUrl = 'http://10.100.5.116:8088'
const onlyOfficeUrl = 'http://10.100.5.116:8088'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -54,14 +58,15 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
module.exports = { module.exports = {
baseUrl: 'https://' + serverIP + ':' + interfacePORT, baseUrl: 'http://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType, webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin, ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl, onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl, devWebUrl: devWebUrl,
serverUrl: 'https://' + serverIP, // 服务器IP地址 serverUrl: 'http://' + serverIP, // 服务器IP地址
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址