fix bugs

src/views/equipment/analysis/quality/index.vue

@@ -6,15 +6,15 @@
 -->
 
 <template>
-	<div class="app-container">
+	<div class="app-container" style="flex: 1; height: 1px; display: flex; flex-direction: column;">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
-			<el-col class="custom-tabs">
+		<el-row type="flex" style="flex: 1;">
+			<el-col class="custom-tabs" style="flex: 1;">
 				<el-tabs
 					v-model="activeName"
 					:stretch="true"
@@ -32,7 +32,7 @@
 						<div
 							v-if="activeName == 'graph'"
 							class="graph"
-							style="height: 40vh; display: flex; flex-direction: column">
+							style="height: 100%; display: flex; flex-direction: column">
 							<div class="blue-title">各设备加工数量</div>
 							<LineChart v-if="list && list.length" :list="list" />
 							<div v-else class="no-data-bg"></div>
@@ -63,13 +63,13 @@ export default {
 			activeName: 'table', // defaults to 'table'
 			searchBarFormConfig: [
 				// 产品
-				{
-					__index: 'product',
-					type: 'select',
-					label: '产品',
-					placeholder: '请选择产品',
-					param: 'productId',
-				},
+				// {
+				// 	__index: 'product',
+				// 	type: 'select',
+				// 	label: '产品',
+				// 	placeholder: '请选择产品',
+				// 	param: 'productId',
+				// },
 				// 产线
 				{
 					__index: 'line',
@@ -156,17 +156,17 @@ export default {
 				{
 					// width: 160,
 					prop: 'inQuantity',
-					label: '进片数量',
+					label: '加工数量',
 				},
 				{
 					// width: 160,
 					prop: 'outQuantity',
-					label: '出片数量',
+					label: '合格数量',
 				},
 				{
 					// width: 160,
 					prop: 'nokQuantity',
-					label: '破损/不合格数',
+					label: '不合格数量',
 				},
 				{
 					// width: 160,
@@ -377,6 +377,9 @@ export default {
 }
 
 :deep(.custom-tabs) {
+	.el-tabs {
+		height: 100%;
+	}
 	.el-tabs__header {
 		margin-bottom: 8px;
 		display: inline-block;
@@ -389,6 +392,14 @@ export default {
 		line-height: 36px !important;
 		height: 36px;
 	}
+
+	.el-tabs__content {
+		height: calc(100% - 48px);
+	}
+
+	#pane-graph {
+		height: 100%;
+	}
 }
 
 .blue-title {