From 085b4aa1c7dbdc641dcea4bef5f1b9539cc5cade Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 3 Dec 2024 17:53:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=A3=92=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/statistics_bang.vue | 554 ++++++++++++------ src/views/statistics/statistics_guan.vue | 703 ++++++++++++++++------- 2 files changed, 875 insertions(+), 382 deletions(-) diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue index d91eca98..23402cb1 100644 --- a/src/views/statistics/statistics_bang.vue +++ b/src/views/statistics/statistics_bang.vue @@ -37,222 +37,466 @@ - + + - + + - + - + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - - + + @@ -267,18 +511,19 @@ export default { name: "chart", data() { return { - query: { - batch: "", - date:'' + params: { + batch__contains:'ZJ2', }, + query:{ + last_time:'' + }, + apiObj: this.$API.wpm.batchst, options:[], tableData:[], }; }, mounted() { - let that = this; - that.getOptions(); - // that.getTableData(); + this.getOptions(); }, methods: { //获取物料批次 @@ -295,18 +540,7 @@ export default { } }); }, - //获取表格数据 - getTableData(){ - let that = this; - let obj = {}; - obj.query = that.query; - that.tableData =[]; - that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => { - if(res.data2.ds0){ - that.tableData = res.data2.ds0; - } - }); - }, + searchTypeChange(){ this.query.batch = ''; }, @@ -314,7 +548,7 @@ export default { }, handleQuery(){ - this.getTableData(); + this.$refs.table.queryData(this.query); }, }, }; diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue index e2bd7311..f9bb0c0b 100644 --- a/src/views/statistics/statistics_guan.vue +++ b/src/views/statistics/statistics_guan.vue @@ -37,237 +37,508 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + ref="table" + :apiObj="apiObj" + :params="params" + :query="query" + id="exportDiv" + stripe + > + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +