src/views/equipment/analysis/quality/components/lineChart.vue

@@ -41,7 +41,7 @@ export default {
 				opt.push([eq.equipmentName, eq.okQuantity, eq.nokQuantity]);
 			});
 			return {
-				color: ['#8EF0AB', '#288AFF'],
+				color: ['#288AFF', '#8EF0AB'],
 				tooltip: {
 					trigger: 'axis',
 					axisPointer: {
@@ -51,7 +51,7 @@ export default {
 				legend: {
 					itemWidth: 12,
 					itemHeight: 12,
-					right: 0,
+					right: 0
 				},
 				grid: {
 					left: '1%',
@@ -90,13 +90,6 @@ export default {
 					},
 				},
 				series: [
-					{
-						name: '不合格数量',
-						type: 'bar',
-						barWidth: 20,
-						stack: 's',
-						data: opt.map((item) => item[2]),
-					},
 					{
 						name: '合格数量',
 						type: 'bar',
@@ -104,6 +97,13 @@ export default {
 						stack: 's',
 						data: opt.map((item) => item[1]),
 					},
+					{
+						name: '不合格数量',
+						type: 'bar',
+						barWidth: 20,
+						stack: 's',
+						data: opt.map((item) => item[2]),
+					},
 				],
 			};
 		},

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

@@ -19,7 +19,7 @@
 					v-model="activeName"
 					:stretch="true"
 					@tab-click="handleTabClick">
-					<el-tab-pane label="数据列表" name="table">
+					<el-tab-pane :label="'数据列表'" name="table">
 						<!-- 列表 -->
 						<base-table
 							:table-props="tableProps"
@@ -28,7 +28,7 @@
 							:table-data="list"
 							@emitFun="handleEmitFun"></base-table>
 					</el-tab-pane>
-					<el-tab-pane label="柱状图" name="graph">
+					<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
 						<div v-if="activeName == 'graph'" class="graph" style="height: 40vh; display: flex; flex-direction: column;">
 							<div class="blue-title">各设备加工数量</div>
 							<LineChart :list="list" />
@@ -373,8 +373,8 @@ export default {
 	}
 
 	.el-tabs__item {
-		padding-left: 8px !important;
-		padding-right: 8px !important;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
 		line-height: 36px !important;
 		height: 36px;
 	}