From bbc5a0a0eb523d0277d55224f303088ebceb5f90 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 01 十二月 2023 15:29:47 +0800
Subject: [PATCH] 概述-入库跳转参数调整，将localStorage存储修改为query传参
---
src/views/overview/AddOverviewDialog.vue | 15 ++++++++-------
src/views/overview/OverviewListView.vue | 2 +-
src/views/overview/index.vue | 1 -
src/router/index.js | 6 ------
src/views/overview/previewExcel.vue | 16 ++++++++--------
5 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 36f7228..dffb3c5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,12 +119,6 @@
// document.title = to.meta.title
}
})
-router.beforeEach((to, from, next) => {
- if(from.name==="overview"){
- localStorage.removeItem('pdfParams');
- }
- next();
-});
// router.beforeEach((to, from, next) => {
// must call `next`
// console.log(to, from)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index a97b037..a6d3605 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -371,7 +371,6 @@
},
methods: {
setStatusList() {
- console.log(this.editConfig.infomation, "edit")
if (this.editConfig.infomation.status === 5) {
this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
@@ -804,15 +803,17 @@
baseOperationType: this.editConfig.infomation.baseOperationType || undefined,
cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3
};
- localStorage.setItem('pdfParams', JSON.stringify(pdfParams));
+ var { href } = this.$router.resolve({
+ path: '/overview/previewExcel',
+ query:{
+ ...pdfParams
+ }
+
+ });
+ window.open(href, '_blank');
}
} catch (error) {
console.error(error);
- } finally {
- var { href } = this.$router.resolve({
- name: 'previewExcel',
- });
- window.open(href, '_blank');
}
}
}
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 13ef17d..dd47909 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -234,7 +234,7 @@
async getData() {
await getOperation({
number: this.keyword,
- operationTypeId: this.params.id,
+ operationTypeId: this.$route.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
status: this.params.status
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 9ddec17..313c233 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -104,7 +104,6 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- console.log(res.data)
if (res.code === 200) {
const list = res.data.map((item) => {
return {
diff --git a/src/views/overview/previewExcel.vue b/src/views/overview/previewExcel.vue
index e135c30..39e9dc0 100644
--- a/src/views/overview/previewExcel.vue
+++ b/src/views/overview/previewExcel.vue
@@ -1,11 +1,11 @@
<template>
<div>
- <button @click="cropAndDownload">鎴彇鍥剧墖</button>
+ <!-- <button @click="cropAndDownload">鎴彇鍥剧墖</button> -->
<!-- 鏄剧ず瑁佸壀鍚庣殑鍥剧墖 -->
- <div style="width: 800px;">
+ <!-- <div style="width: 800px;">
<img style="width: 100%;" id="export-pdf" v-if="croppedImage" :src="croppedImage" alt="Cropped Image" />
- </div>
+ </div> -->
<div ref="elementToCrop" >
<div style="width: 100%;">
<vue-office-excel :minRowLength="0" :src="excel" @rendered="rendered"/>
@@ -27,14 +27,14 @@
return {
excel:'',
cutAfterWidth:0,
- croppedImage: null, // 鍥剧墖
+ // croppedImage: null, // 鍥剧墖
};
},
computed: {
},
created() {
- this.excel=JSON.parse(localStorage.getItem('pdfParams', '[]')).url
- this.cutAfterWidth=JSON.parse(localStorage.getItem('pdfParams', '[]')).cutAfterWidth
+ this.excel=this.$route.query.url
+ this.cutAfterWidth=this.$route.query.cutAfterWidth
},
mounted() {
},
@@ -43,8 +43,8 @@
methods: {
rendered(){
console.log("娓叉煋瀹屾垚")
- if(JSON.parse(localStorage.getItem('pdfParams', '[]')).url){
- this.excel=JSON.parse(localStorage.getItem('pdfParams', '[]')).url
+ if(this.$route.query.url){
+ this.excel=this.$route.query.url
this.cropAndDownload()
}
},
--
Gitblit v1.8.0