diff --git a/src/api/bigscreen.js b/src/api/bigscreen.js index 69555fc..34580d3 100644 --- a/src/api/bigscreen.js +++ b/src/api/bigscreen.js @@ -13,10 +13,12 @@ export function insertDashboard(data) { // 预览、查询大屏详情 export function detailDashboard(data) { + let reportCode = data.reportCode; return request({ - url: 'reportDashboard/' + data, + url: 'reportDashboard/' + reportCode, headers: { 'Share-Token': getShareToken(), 'Authorization': getToken() }, method: 'get', + params: data }) } diff --git a/src/views/bigScreenReport/aj/index.vue b/src/views/bigScreenReport/aj/index.vue index ee94ff4..65c2a06 100644 --- a/src/views/bigScreenReport/aj/index.vue +++ b/src/views/bigScreenReport/aj/index.vue @@ -33,7 +33,8 @@ export default { sharePassword: "", dialogVisible: false, reportCode: "", - shareToken: "" + shareToken: "", + otherParam:"" }; }, @@ -49,6 +50,9 @@ export default { this.reportCode = data.reportCode; this.sharePassword = data.sharePassword; this.shareToken = data.shareToken; + if(this.isNotBlank(data.otherParam)){ + this.otherParam = "?"+data.otherParam; + } if (this.sharePassword) { this.dialogVisible = true; } else { @@ -65,11 +69,12 @@ export default { } }, pushAj() { + console.log("ssss",this.reportCode,this.otherParam) setShareToken(this.shareToken); this.$router.push({ path: "/bigscreen/viewer", query: { - reportCode: this.reportCode + reportCode: this.reportCode+this.otherParam, } }); }, diff --git a/src/views/bigscreenDesigner/designer/index.vue b/src/views/bigscreenDesigner/designer/index.vue index d7428d8..12c5727 100644 --- a/src/views/bigscreenDesigner/designer/index.vue +++ b/src/views/bigscreenDesigner/designer/index.vue @@ -554,7 +554,7 @@ export default { this.layerWidget = layerWidgetArr; }, async initEchartData() { - const reportCode = this.$route.query.reportCode; + const reportCode = this.$route.query; this.$showLoading(); const { code, data } = await detailDashboard(reportCode); this.$hideLoading(); diff --git a/src/views/bigscreenDesigner/viewer/index.vue b/src/views/bigscreenDesigner/viewer/index.vue index 869afc5..d3bf4fc 100644 --- a/src/views/bigscreenDesigner/viewer/index.vue +++ b/src/views/bigscreenDesigner/viewer/index.vue @@ -39,7 +39,7 @@ export default { methods: { ...mapMutations('dataSource', ['SET_STATIC_DATA','SET_REFRESHTIME']), async getData() { - const reportCode = this.$route.query.reportCode; + const reportCode = this.$route.query; this.$showLoading(); const { code, data } = await detailDashboard(reportCode); this.$hideLoading(); diff --git a/src/views/screenDesigner/index.vue b/src/views/screenDesigner/index.vue index ba283f0..e34460c 100644 --- a/src/views/screenDesigner/index.vue +++ b/src/views/screenDesigner/index.vue @@ -153,7 +153,7 @@ export default { methods: { // 初始化 echrats async initEchartData() { - const reportCode = this.$route.query.reportCode; + const reportCode = this.$route.query; const { code, data } = await detailDashboard(reportCode); if (code != 200) return; const processData = handleInitEchartsData(data, getToolByCode); diff --git a/src/views/screenDesigner/preview.vue b/src/views/screenDesigner/preview.vue index 1ce7598..d507e24 100644 --- a/src/views/screenDesigner/preview.vue +++ b/src/views/screenDesigner/preview.vue @@ -1,6 +1,6 @@