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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!36
This commit is contained in:
高嵩
2023-04-06 00:33:11 +08:00
parent c1d45457e1 ec9514ee63
commit d60e178099
2 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+5 -2
View File
@@ -652,7 +652,7 @@
<div class="prc-content-border" v-show="opinionsShow"> <div class="prc-content-border" v-show="opinionsShow">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled"> <el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled pxwj">
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
@@ -674,7 +674,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-top: 6px; float: left;" style="margin-top: 6px; float: right;"
@click="fileUpload('madelSub')"> @click="fileUpload('madelSub')">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
</el-button> </el-button>
@@ -1167,4 +1167,7 @@
.process-manuscript /deep/ .el-form-item__error { .process-manuscript /deep/ .el-form-item__error {
right: 45px !important; right: 45px !important;
} }
.pxwj /deep/ .el-form-item__error{
right: 45px !important;
}
</style> </style>
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+43 -16
View File
@@ -898,6 +898,7 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
import axios from '@/common/axiosV2'
export default { export default {
name: "bussLibrary5", name: "bussLibrary5",
@@ -1445,27 +1446,53 @@
previewShow(attId) { previewShow(attId) {
this.iframeLoading = true this.iframeLoading = true
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if(attId.indexOf('ATT_FILE') === 0){
getBusStandFileByAttId({ getBusStandFileByAttId({
attId attId
}).then(res => { }).then(res => {
if(res){ if(res){
const history = res; const history = res;
const editFileInfo = res.data const editFileInfo = res.data
if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){ if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
}else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){ }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id) this.iframeUrl = './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)
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf'; this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
}
this.iframeLoading = false
this.$forceUpdate()
resolve(history)
} }
this.iframeLoading = false
this.$forceUpdate()
resolve(history)
}
}).catch(e => { }).catch(e => {
}) })
}else{
axios({
url: 'api/lawss/activiti/selectOnlineFile',
method: 'get',
params: attId
}).then(res=>{
if(res){
const history = res;
const editFileInfo = res.data
if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
}else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
}else {
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)
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
}
this.iframeLoading = false
this.$forceUpdate()
resolve(history)
}
}).catch(e=>{})
}
}) })
}, },
previewIframe(targetName, action){ previewIframe(targetName, action){