From 7319ab1ce998a7d13f0192a4ccaf92d4a02929f8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 11 十二月 2024 14:33:43 +0800
Subject: [PATCH] 电路试验上传文件报错
---
src/components/view/b1-report-preparation.vue | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 74f279d..01d848c 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -157,9 +157,9 @@
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
</div>
<div style="height: 78vh;" v-if="issuedVisible">
- <!-- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" /> -->
- <filePreview v-if="issuedVisible" :fileUrl="currentFile.url"
- :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/>
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <!-- <filePreview v-if="issuedVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/> -->
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">涓嶉�氳繃</el-button>
@@ -182,9 +182,9 @@
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
</div>
<div style="height: 78vh;" v-if="approveVisible">
- <!-- <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" /> -->
- <filePreview v-if="approveVisible" :fileUrl="currentFile.url"
- :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/>
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ <!-- <filePreview v-if="approveVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 100%;overflow-y: auto;"/> -->
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
@@ -586,9 +586,27 @@
// console.log(this.$refs.Word.getValue())
},
async selectAllByOne(row) {
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
- this.lookFileVisible = true
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ const { href } = this.$router.resolve({
+ path: `/wordEdit`,
+ query: {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
+ })
+ window.open(href, '_blank');
+ // this.lookFileVisible = true
},
download(row) {
let url = row.urlS ? row.urlS : row.url;
@@ -611,8 +629,22 @@
},
handleIssued(row) {
this.currentInfo = row;
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ this.option = {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
this.issuedVisible = true;
},
// 瀹℃牳閫氳繃
@@ -637,8 +669,22 @@
},
handleApprove(row) {
this.currentInfo = row;
- let url = row.urlS ? row.urlS : row.url;
- this.currentFile.url = this.javaApi + url;
+ // let url = row.urlS ? row.urlS : row.url;
+ // this.currentFile.url = this.javaApi + url;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+ this.option = {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: true,
+ user_id: 1,
+ user_name: userName,
+ }
this.approveVisible = true;
},
// 鎵瑰噯閫氳繃
--
Gitblit v1.9.3