diff --git a/report-ui/src/views/excelreport/components/share.vue b/report-ui/src/views/excelreport/components/share.vue
index c79a36da..2fd596c6 100644
--- a/report-ui/src/views/excelreport/components/share.vue
+++ b/report-ui/src/views/excelreport/components/share.vue
@@ -54,7 +54,11 @@
-
+
diff --git a/report-ui/src/views/reportManage/components/share.vue b/report-ui/src/views/reportManage/components/share.vue
index 04bf6166..e9825940 100644
--- a/report-ui/src/views/reportManage/components/share.vue
+++ b/report-ui/src/views/reportManage/components/share.vue
@@ -114,6 +114,13 @@ export default {
default: () => {
return "";
}
+ },
+ reportType: {
+ required: true,
+ type: String,
+ default:() =>{
+ return "";
+ }
}
},
data() {
@@ -124,6 +131,7 @@ export default {
dialogForm: {
shareValidType: 0,
reportCode: "",
+ reportType: "",
shareUrl: "",
shareCode: "",
sharePassword: "",
@@ -164,12 +172,11 @@ export default {
this.dialogForm.sharePassword = "";
},
async createShare() {
+ this.dialogForm.reportType = this.reportType;
this.dialogForm.reportCode = this.reportCode;
this.dialogForm.shareUrl = window.location.href;
- // console.log(this.dialogForm)
const { code, data } = await reportShareAdd(this.dialogForm);
if (code != "200") return;
- // console.log(data)
this.shareLinkFlag1 = false;
this.$message({
message: "创建链接成功!",
diff --git a/report-ui/src/views/reportManage/index.vue b/report-ui/src/views/reportManage/index.vue
index a07f047e..c9ca2033 100644
--- a/report-ui/src/views/reportManage/index.vue
+++ b/report-ui/src/views/reportManage/index.vue
@@ -13,6 +13,7 @@
:visib="visibleForShareDialog"
:reportCode="reportCodeForShareDialog"
:reportName="reportNameForShareDialog"
+ :reportType="reportTypeForShareDialog"
@handleClose="visibleForShareDialog = false"
/>
@@ -45,6 +46,7 @@ export default {
visibleForShareDialog: false,
reportCodeForShareDialog: "",
reportNameForShareDialog: "",
+ reportTypeForShareDialog: "",
crudOption: {
// 使用菜单做为页面标题
title: "报表管理",
@@ -354,13 +356,9 @@ export default {
},
//分享
shareReport(val) {
- if (val.reportType == "report_excel") {
- //excel暂不支持
- this.$message.warning("暂不支持excel报表分享");
- return;
- }
this.reportCodeForShareDialog = val.reportCode;
this.reportNameForShareDialog = val.reportName;
+ this.reportTypeForShareDialog = val.reportType;
this.visibleForShareDialog = true;
},
//复制