From 5ea16bde8ada44508349f91ede6086801c41eb0b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 19 Mar 2024 17:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js                          | 40 +++++++--------
 src/views/statistics/good_check.vue          | 30 ++++++++---
 src/views/statistics/inm_check.vue           | 46 ++++++++---------
 src/views/statistics/inm_statistics.vue      | 31 +++++++++---
 src/views/statistics/material_statistics.vue | 37 ++++++++++----
 src/views/statistics/pass_num.vue            | 53 +++++++++++++-------
 src/views/statistics/ppass_num.vue           | 19 +++++--
 src/views/statistics/product_check.vue       | 33 ++++++++----
 src/views/statistics/task_rate.vue           | 30 ++++++++---
 src/views/statistics/user_statistics.vue     | 16 ++++--
 10 files changed, 227 insertions(+), 108 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 5e791df6..e83671c2 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2379,26 +2379,26 @@ const routes = [
             },
             "component": "statistics/good_check.vue"
           },
-          {
-            "name": "behavior_check",
-            "path": "/statistic/behavior_check",
-            "meta": {
-              "title": "性能检验",
-              "icon": "el-icon-cellphone",
-              "perms": ["statistic_qm"]
-            },
-            "component": "statistics/behavior_check.vue"
-          },
-          {
-            "name": "enter_check",
-            "path": "/statistic/enter_check",
-            "meta": {
-              "title": "入厂检验",
-              "icon": "el-icon-cellphone",
-              "perms": ["statistic_qm"]
-            },
-            "component": "statistics/enter_check.vue"
-          },
+          // {
+          //   "name": "behavior_check",
+          //   "path": "/statistic/behavior_check",
+          //   "meta": {
+          //     "title": "性能检验",
+          //     "icon": "el-icon-cellphone",
+          //     "perms": ["statistic_qm"]
+          //   },
+          //   "component": "statistics/behavior_check.vue"
+          // },
+          // {
+          //   "name": "enter_check",
+          //   "path": "/statistic/enter_check",
+          //   "meta": {
+          //     "title": "入厂检验",
+          //     "icon": "el-icon-cellphone",
+          //     "perms": ["statistic_qm"]
+          //   },
+          //   "component": "statistics/enter_check.vue"
+          // },
         ]
       },
       //物料统计
diff --git a/src/views/statistics/good_check.vue b/src/views/statistics/good_check.vue
index 45bc925a..528b43bd 100644
--- a/src/views/statistics/good_check.vue
+++ b/src/views/statistics/good_check.vue
@@ -40,8 +40,9 @@
 						</el-card>
 					</el-col>
 					<el-col :lg="16">
-						<el-card shadow="never">
-							<el-table :data="tableData">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('ZJ')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData" id="exportDivZJ">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="日期" prop="date">
 								</el-table-column>
@@ -66,8 +67,9 @@
 						</el-card>
 					</el-col>
 					<el-col :lg="16">
-						<el-card shadow="never">
-							<el-table :data="tableData">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('ZB')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData" id="exportDivZB">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="日期" prop="date">
 								</el-table-column>
@@ -92,8 +94,9 @@
 						</el-card>
 					</el-col>
 					<el-col :lg="16">
-						<el-card shadow="never">
-							<el-table :data="tableData">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('AVG')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData" id="exportDivAVG">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="日期" prop="date">
 								</el-table-column>
@@ -285,9 +288,22 @@
 				this.getData7();
 				this.getData10();
 			},
+			handleExport(val) {
+				this.exportLoading = true;
+				let id = '#exportDiv' + val;
+				let name =  val+'成品检验统计';
+				this.$XLSX(id, name);
+				this.exportLoading = false;
+			},
 		},
 	}
 </script>
 
-<style>
+<style scoped>
+.tables{
+	position: absolute;
+	top:4px;
+	right: 6px;
+	z-index: 10;
+}
 </style>
diff --git a/src/views/statistics/inm_check.vue b/src/views/statistics/inm_check.vue
index 68818b64..156109a9 100644
--- a/src/views/statistics/inm_check.vue
+++ b/src/views/statistics/inm_check.vue
@@ -40,8 +40,9 @@
 						</el-card>
 					</el-col>
 					<el-col :lg="16">
-						<el-card shadow="never">
-							<el-table :data="tableData">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('ZJ')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData" id="exportDivZJ">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="批次号" prop="date">
 								</el-table-column>
@@ -74,12 +75,13 @@
 				<el-row :gutter="15">
 					<el-col :lg="8">
 						<el-card shadow="never">
-							<scEcharts height="300px" :option="option1"></scEcharts>
+							<scEcharts height="300px" :option="option2"></scEcharts>
 						</el-card>
 					</el-col>
 					<el-col :lg="16">
-						<el-card shadow="never">
-							<el-table :data="tableData">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('ZB')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData" id="exportDivZB">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="日期" prop="date">
 								</el-table-column>
@@ -194,7 +196,6 @@
 			this.start_date =year+'-'+month+'-01';
 			this.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
 			this.queryDate = year+'-'+month;
-			this.getData6();
 			this.getData7();
 			this.getData10();
 		},
@@ -209,20 +210,8 @@
 				}
 				this.option.xAxis.data = this.xAxisData;
 				this.option2.xAxis.data = this.xAxisData;
-				this.option3.xAxis.data = this.xAxisData;
-				this.option4.xAxis.data = this.xAxisData;
-			},
-			getData6(){
-				let that = this;
-				let exec = that.queryType=='月'?'lineWeek':'lineMonth';
-				let obj = {
-					query: { start_date: this.start_date, end_date: this.end_date, dept_name: "6车间" },
-				};
-				that.$API.bi.dataset.exec.req(exec, obj).then((doInRes) => {
-					console.log('6生产车间统计:',doInRes);
-					debugger;
-				});
 			},
+			//预制棒检验统计
 			getData7(){
 				let that = this;
 				let obj = {
@@ -234,6 +223,7 @@
 					debugger;
 				});
 			},
+			//预制管检验统计
 			getData10(){
 				let that = this;
 				let obj = {
@@ -265,15 +255,25 @@
 						this.end_date = this.currentYear+'-12-31';
 					}
 				}
-				debugger;
-				console.log(this.query)
-				this.getData6();
 				this.getData7();
 				this.getData10();
 			},
+			handleExport(val) {
+				this.exportLoading = true;
+				let id = '#exportDiv' + val;
+				let name = val == 'ZJ' ? '预制棒检验统计' : '预制管检验统计';
+				this.$XLSX(id, name);
+				this.exportLoading = false;
+			},
 		},
 	}
 </script>
 
-<style>
+<style scoped>
+.tables{
+	position: absolute;
+	top:10px;
+	right: 10px;
+	z-index: 10;
+}
 </style>
diff --git a/src/views/statistics/inm_statistics.vue b/src/views/statistics/inm_statistics.vue
index 31a1a23f..2864b75e 100644
--- a/src/views/statistics/inm_statistics.vue
+++ b/src/views/statistics/inm_statistics.vue
@@ -53,8 +53,9 @@
 								<div id="bachart1" style="width:100%;height:300px;"></div>
 								<!-- <scEcharts height="300px" :option="option1"></scEcharts> -->
 							</el-col>
-							<el-col>
-								<el-table :data="tableData1">
+							<el-card shadow="never" style="width: 100%;position: relative;">
+								<el-button @click="handleExport('ZJ')" class="tables" type="primary">导出</el-button>
+								<el-table :data="tableData1" id="exportDivZJ">
 									<el-table-column type="index" width="50" />
 									<el-table-column label="日期" prop="date">
 									</el-table-column>
@@ -63,7 +64,7 @@
 									<el-table-column label="数量" prop="count">
 									</el-table-column>
 								</el-table>
-							</el-col>
+							</el-card>
 						</el-row>
 					</el-card>
 				</el-col>
@@ -71,7 +72,7 @@
 					<el-card shadow="never" style="margin-bottom: 8px;">
 						<el-header>
 							<div class="right-panel">
-								<h2>棒交付数</h2>
+								<h2>管交付数</h2>
 								<!-- <el-select v-model="product" clearable @change="productChange">
 									<el-option v-for="item in outData" 
 									:key="item.id" 
@@ -87,8 +88,9 @@
 								<div id="bachart2" style="width:100%;height:300px;"></div>
 								<!-- <scEcharts height="300px" :option="option2"></scEcharts> -->
 							</el-col>
-							<el-col>
-								<el-table :data="tableData2">
+							<el-card shadow="never" style="width: 100%;position: relative;">
+								<el-button @click="handleExport('ZB')" class="tables" type="primary">导出</el-button>
+								<el-table :data="tableData2" id="exportDivZB">
 									<el-table-column type="index" width="50" />
 									<el-table-column label="日期" prop="date">
 									</el-table-column>
@@ -97,7 +99,7 @@
 									<el-table-column label="数量" prop="count">
 									</el-table-column>
 								</el-table>
-							</el-col>
+							</el-card>
 						</el-row>
 					</el-card>
 				</el-col>
@@ -347,9 +349,22 @@
 				}
 				this.getTableData();
 			},
+			handleExport(val) {
+				this.exportLoading = true;
+				let id = '#exportDiv' + val;
+				let name = val == 'ZJ' ? '棒交付统计' : '管交付统计';
+				this.$XLSX(id, name);
+				this.exportLoading = false;
+			},
 		},
 	}
 </script>
 
-<style>
+<style scoped>
+.tables {
+    position: absolute;
+    top: 4px;
+    right: 6px;
+    z-index: 10;
+}
 </style>
diff --git a/src/views/statistics/material_statistics.vue b/src/views/statistics/material_statistics.vue
index d6343ed4..c675c2ea 100644
--- a/src/views/statistics/material_statistics.vue
+++ b/src/views/statistics/material_statistics.vue
@@ -53,8 +53,9 @@
 								<div id="bachart1" style="width:100%;height:300px;"></div>
 								<!-- <scEcharts height="300px" :option="option2"></scEcharts> -->
 							</el-col>
-							<el-col>
-								<el-table :data="tableData1">
+							<el-card shadow="never" style="width: 100%;position: relative;">
+								<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
+								<el-table :data="tableData1" id="exportDiv1">
 									<el-table-column type="index" width="50" />
 									<el-table-column label="日期" prop="date">
 										<template #default="scope">
@@ -68,7 +69,7 @@
 									<el-table-column label="数量" prop="数量">
 									</el-table-column>
 								</el-table>
-							</el-col>
+							</el-card>
 						</el-row>
 					</el-card>
 				</el-col>
@@ -92,8 +93,9 @@
 								<div id="bachart2" style="width:100%;height:300px;"></div>
 								<!-- <scEcharts height="300px" :option="option2"></scEcharts> -->
 							</el-col>
-							<el-col>
-								<el-table :data="tableData2">
+							<el-card shadow="never" style="width: 100%;position: relative;">
+								<el-button @click="handleExport('2')" class="tables" type="primary">导出</el-button>
+								<el-table :data="tableData2" id="exportDiv2">
 									<el-table-column type="index" width="50" />
 									<el-table-column label="日期" prop="date">
 										<template #default="scope">
@@ -107,7 +109,7 @@
 									<el-table-column label="数量" prop="数量">
 									</el-table-column>
 								</el-table>
-							</el-col>
+							</el-card>
 						</el-row>
 					</el-card>
 				</el-col>
@@ -189,11 +191,15 @@
 			that.currentMonth = month;
 			that.start_date =year+'-'+month+'-01';
 			that.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
-			let month1=month;
+			console.log('that.start_date',that.start_date)
+			console.log('that.end_date',that.end_date)
+			let month1 = month;
 			if(month1<10){month1='0'+month1}
 			that.queryDate = year+'-'+month1;
-			that.firstWeekNum = that.getWeekOfYear(new Date(that.firstWeekNum));
+			that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
 			that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
+			console.log('that.firstWeekNum',that.firstWeekNum)
+			console.log('that.endWeekNum',that.endWeekNum)
 			let duration = that.endWeekNum - that.firstWeekNum + 1;
 			for(let i =1;i<=duration;i++ ){
 				that.xAxisOrigin.push('第'+i+'周');
@@ -359,9 +365,22 @@
 				this.getInmData();
 				this.getOutData();
 			},
+			handleExport(val) {
+				this.exportLoading = true;
+				let id = '#exportDiv' + val;
+				let name = val == '1' ? '采购统计' : '消耗统计';
+				this.$XLSX(id, name);
+				this.exportLoading = false;
+			},
 		},
 	}
 </script>
 
-<style>
+<style scoped>
+.tables {
+    position: absolute;
+    top: 4px;
+    right: 6px;
+    z-index: 10;
+}
 </style>
diff --git a/src/views/statistics/pass_num.vue b/src/views/statistics/pass_num.vue
index 91cd0240..f1372a2a 100644
--- a/src/views/statistics/pass_num.vue
+++ b/src/views/statistics/pass_num.vue
@@ -20,13 +20,13 @@
 				<el-row :gutter="10">
 					<el-col :lg="12">
 						<el-card shadow="never">
-							<div id="bachart1" style="width:100%;height:300px;"></div>
-							<!-- <scEcharts height="300px" :option="option"></scEcharts> -->
+							<div id="bachart1"></div>
 						</el-card>
 					</el-col>
 					<el-col :lg="12">
-						<el-card shadow="never">
-							<el-table :data="tableData7">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('7')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData7" id="exportDiv7" :height="300">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
@@ -55,13 +55,13 @@
 				<el-row :gutter="10">
 					<el-col :lg="12">
 						<el-card shadow="never">
-							<div id="bachart2" style="width:100%;height:300px;"></div>
-							<!-- <scEcharts height="300px" :option="option2"></scEcharts> -->
+							<div id="bachart2"></div>
 						</el-card>
 					</el-col>
 					<el-col :lg="12">
-						<el-card shadow="never">
-							<el-table :data="tableData10">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('10')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData10" id="exportDiv10" :height="300">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
@@ -90,13 +90,13 @@
 				<el-row :gutter="10">
 					<el-col :lg="12">
 						<el-card shadow="never">
-							<div id="bachart3" style="width:100%;height:300px;"></div>
-							<!-- <scEcharts height="300px" :option="option3"></scEcharts> -->
+							<div id="bachart3"></div>
 						</el-card>
 					</el-col>
 					<el-col :lg="12">
-						<el-card shadow="never">
-							<el-table :data="tableData6">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('6')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableData6" id="exportDiv6" :height="300">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
@@ -125,13 +125,13 @@
 				<el-row :gutter="10">
 					<el-col :lg="12">
 						<el-card shadow="never">
-							<div id="bachart4" style="width:100%;height:300px;"></div>
-							<!-- <scEcharts height="300px" :option="option4"></scEcharts> -->
+							<div id="bachart4"></div>
 						</el-card>
 					</el-col>
 					<el-col :lg="12">
-						<el-card shadow="never">
-							<el-table :data="tableDataAVG">
+						<el-card shadow="never" style="position: relative;">
+							<el-button @click="handleExport('AVG')" class="tables" type="primary">导出</el-button>
+							<el-table :data="tableDataAVG" id="exportDivAVG" :height="300">
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
@@ -483,8 +483,27 @@ export default {
 			this.getData10();
 			this.getDataDAVG();
 		},
+		handleExport(val) {
+			this.exportLoading = true;
+			let id = '#exportDiv' + val;
+			let name = val == 'AVG' ? val + '合格数统计' : val+'车间合格数统计';
+			this.$XLSX(id, name);
+			this.exportLoading = false;
+		},
 	},
 }
 </script>
 
-<style></style>
+<style scoped>
+#bachart1,#bachart2,
+#bachart3,#bachart4{
+	width:100%;
+	height:300px;
+}
+.tables{
+	position: absolute;
+	top:6px;
+	left: 4px;
+	z-index: 10;
+}
+</style>
diff --git a/src/views/statistics/ppass_num.vue b/src/views/statistics/ppass_num.vue
index 995f9df5..821386e5 100644
--- a/src/views/statistics/ppass_num.vue
+++ b/src/views/statistics/ppass_num.vue
@@ -23,8 +23,9 @@
 					</el-card>
 				</el-col>
 				<el-col :lg="12">
-					<el-card shadow="never">
-						<el-table :data="tableData" :height="tableHeight">
+					<el-card shadow="never" style="position: relative;">
+						<el-button @click="handleExport" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData" :height="tableHeight" id="exportDiv">
 							<el-table-column type="index" width="50" />
 							<el-table-column label="工段" prop="工段">
 							</el-table-column>
@@ -172,8 +173,20 @@ export default {
 			}
 			this.getData6();
 		},
+		handleExport() {
+			this.exportLoading = true;
+			this.$XLSX('#exportDiv', '工序合格数');
+			this.exportLoading = false;
+		},
 	},
 }
 </script>
 
-<style></style>
+<style scoped>
+.tables{
+	position: absolute;
+	top:6px;
+	left: 4px;
+	z-index: 10;
+}
+</style>
diff --git a/src/views/statistics/product_check.vue b/src/views/statistics/product_check.vue
index 7e42db8d..07686ff3 100644
--- a/src/views/statistics/product_check.vue
+++ b/src/views/statistics/product_check.vue
@@ -21,8 +21,9 @@
 					<el-col :lg="8">
 						<scEcharts height="300px" :option="option1"></scEcharts>
 					</el-col>
-					<el-col :lg="16">
-						<el-table :data="tableData7">
+					<el-col :lg="16" style="position: relative;">
+						<el-button @click="handleExport('7')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData7" id="exportDiv7">
 							<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
 							</el-table-column>
 							<el-table-column label="月" prop="月" v-else width="60">
@@ -65,8 +66,9 @@
 					<el-col :lg="8">
 						<scEcharts height="300px" :option="option2"></scEcharts>
 					</el-col>
-					<el-col :lg="16">
-						<el-table :data="tableData10">
+					<el-col :lg="16" style="position: relative;">
+						<el-button @click="handleExport('10')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData10" id="exportDiv10">
 							<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
 							</el-table-column>
 							<el-table-column label="月" prop="月" v-else width="60">
@@ -113,8 +115,9 @@
 					<el-col :lg="8">
 						<scEcharts height="300px" :option="option3"></scEcharts>
 					</el-col>
-					<el-col :lg="16">
-						<el-table :data="tableData8">
+					<el-col :lg="16" style="position: relative;">
+						<el-button @click="handleExport('8')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData8" id="exportDiv8">
 							<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
 							</el-table-column>
 							<el-table-column label="月" prop="月" v-else width="60">
@@ -159,7 +162,6 @@
 		</el-main>
 	</el-container>
 </template>
-
 <script>
 import scEcharts from '@/components/scEcharts';
 export default {
@@ -368,8 +370,21 @@ export default {
 			this.getData7();
 			this.getData10();
 		},
+		handleExport(val) {
+			this.exportLoading = true;
+			let id = '#exportDiv' + val;
+			let name = val == '8' ? '退火生产检验统计' : val+'车间生产检验统计';
+			this.$XLSX(id, name);
+			this.exportLoading = false;
+		},
 	},
 }
 </script>
-
-<style></style>
+<style scoped>
+.tables{
+	position: absolute;
+	top:4px;
+	right: 14px;
+	z-index: 10;
+}
+</style>
diff --git a/src/views/statistics/task_rate.vue b/src/views/statistics/task_rate.vue
index f4cdd158..d9b486e6 100644
--- a/src/views/statistics/task_rate.vue
+++ b/src/views/statistics/task_rate.vue
@@ -51,8 +51,9 @@
 			</el-row>
 			<el-row :gutter="10">
 				<el-col :lg="8">
-					<el-card shadow="never">
-						<el-table :data="tableData1" :height="tableHeight">
+					<el-card shadow="never" style="position: relative;">
+						<el-button @click="handleExport('7')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData1" id="exportDiv7" :height="tableHeight">
 							<el-table-column type="index" width="50" />
 							<el-table-column label="任务编号" prop="number">
 							</el-table-column>
@@ -66,8 +67,9 @@
 					</el-card>
 				</el-col>
 				<el-col :lg="8">
-					<el-card shadow="never">
-						<el-table :data="tableData2" :height="tableHeight">
+					<el-card shadow="never" style="position: relative;">
+						<el-button @click="handleExport('10')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData2" id="exportDiv10" :height="tableHeight">
 							<el-table-column type="index" width="50" />
 							<el-table-column label="任务编号" prop="number">
 							</el-table-column>
@@ -81,8 +83,9 @@
 					</el-card>
 				</el-col>
 				<el-col :lg="8">
-					<el-card shadow="never">
-						<el-table :data="tableData3" :height="tableHeight">
+					<el-card shadow="never" style="position: relative;">
+						<el-button @click="handleExport('6')" class="tables" type="primary">导出</el-button>
+						<el-table :data="tableData3" id="exportDiv6" :height="tableHeight">
 							<el-table-column type="index" width="50" />
 							<el-table-column label="任务编号" prop="number">
 							</el-table-column>
@@ -326,9 +329,22 @@
 				this.getData7();
 				this.getData10();
 			},
+			handleExport(val) {
+				this.exportLoading = true;
+				let id = '#exportDiv' + val;
+				let name = val+'车间完成率';
+				this.$XLSX(id, name);
+				this.exportLoading = false;
+			},
 		},
 	}
 </script>
 
-<style>
+<style scoped>
+.tables{
+	position: absolute;
+	top:6px;
+	left: 4px;
+	z-index: 10;
+}
 </style>
diff --git a/src/views/statistics/user_statistics.vue b/src/views/statistics/user_statistics.vue
index c1968c03..68b1c491 100644
--- a/src/views/statistics/user_statistics.vue
+++ b/src/views/statistics/user_statistics.vue
@@ -12,16 +12,16 @@
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 		</el-header>
-		<el-main>
-			<el-row :gutter="15">
+		<el-main id="elMain">
+			<el-row :gutter="15" style="height: 100%;">
 				<el-col :lg="12">
-					<el-card shadow="never">
-						<scEcharts height="300px" :option="option"></scEcharts>
+					<el-card shadow="never" style="height: 100%;">
+						<scEcharts :height="chartHeight" :option="option" id="chartHeight"></scEcharts>
 					</el-card>
 				</el-col>
 				<el-col :lg="12">
 					<el-card shadow="never">
-						<el-table :data="tableData" style="width: 100%">
+						<el-table :data="tableData" style="width: 100%" :height="chartHeight">
 							<el-table-column label="日期" prop="date">
 								<template #default="scope">
 									{{ scope.row.年 }}-{{ scope.row.月 }}
@@ -95,6 +95,8 @@ export default {
 					barWidth: '15px',
 				}
 			},
+			tableHeight: 0,
+			chartHeight:0,
 		}
 	},
 	mounted() {
@@ -109,6 +111,10 @@ export default {
 		this.queryDate = year + '-' + month;
 		this.getData();
 		this.getDept();
+		
+		let mainHeight = document.getElementById('elMain').clientHeight;
+		this.tableHeight = (mainHeight-30)+'px';
+		this.chartHeight = (mainHeight-50)+'px';
 	},
 	methods: {
 		getDept() {