diff --git a/src/views/projectFront/constructionManage/schemeLedger.vue b/src/views/projectFront/constructionManage/schemeLedger.vue index f67e1015..4bae6bc2 100644 --- a/src/views/projectFront/constructionManage/schemeLedger.vue +++ b/src/views/projectFront/constructionManage/schemeLedger.vue @@ -84,12 +84,12 @@ - + + + + + { return row.schemeAttachment[0].name.indexOf(item) == -1; }); console.log(every); - // this.previewUrl = every ? `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${src}` : row.schemeAttachment[0].url; - let src = row.schemeAttachment[0].url; - this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url; + this.previewUrl = every ? `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${encodeURIComponent(src)}` : row.schemeAttachment[0].url; + // let src = row.schemeAttachment[0].url; + // this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : row.schemeAttachment[0].url; console.log(this.previewUrl); // https://view.xdocin.com/view?src=${encodeURIComponent(src)}; // http://42.180.188.17:9809/image/665e7d0dbe74b65b6b7c0619.docx @@ -798,6 +820,8 @@ export default { if (item.isAuthorize == 1) this.isAuthorize.selectionData.push(item.userId); if (item.isModified == 1) this.isModified.selectionData.push(item.userId); if (item.isDeleted == 1) this.isDeleted.selectionData.push(item.userId); + if (item.isView == 1) this.isView.selectionData.push(item.userId); + prev.push(item); return prev; @@ -963,7 +987,7 @@ export default { }, computed: { dateRange() { - const { preview, download, qrcode, isAuthorize, isModified, isDeleted } = this + const { preview, download, qrcode, isAuthorize, isModified,isView, isDeleted } = this return { preview: preview.selectionData, download: download.selectionData, @@ -971,6 +995,7 @@ export default { isAuthorize: isAuthorize.selectionData, isModified: isModified.selectionData, isDeleted: isDeleted.selectionData, + isView: isView.selectionData, } } }, diff --git a/src/views/projectFront/firstModelManage/firstModelLedger.vue b/src/views/projectFront/firstModelManage/firstModelLedger.vue index 485b8f4d..13d17d6b 100644 --- a/src/views/projectFront/firstModelManage/firstModelLedger.vue +++ b/src/views/projectFront/firstModelManage/firstModelLedger.vue @@ -199,6 +199,7 @@ import { } from "@/assets/js/api/project"; import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit"; import { isJSON } from "@/util/nowDate/index"; +import { encode } from 'js-base64' export default { data() { return { @@ -525,7 +526,7 @@ export default { }); console.log(every); let src = row.url.includes('http://') ? row.url : this.$store.state.FILEURL + row.url; - this.previewUrl = every ? `https://ofd.xdocin.com/view?src=${encodeURIComponent(src)}` : src; + this.previewUrl = every ? `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${encodeURIComponent(encode(src))}` : src; console.log(this.previewUrl); this.cardDialog = true; },