From c395fe0fac6040116f46638adee7b78acc2ba0c1 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Mon, 27 Dec 2021 13:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/base.css                       | 32 +++----------------
 .../formal/analysis/commonLineChart.vue       |  6 ++--
 .../homePage/formal/analysis/index.vue        | 12 ++++---
 .../homePage/formal/analysis/lineBarChart.vue |  2 +-
 .../materialAnalysis/filter/index.vue         |  5 ++-
 5 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/assets/css/base.css b/src/assets/css/base.css
index b47465f..fe45148 100644
--- a/src/assets/css/base.css
+++ b/src/assets/css/base.css
@@ -23,33 +23,12 @@ li {
   height: 100%;
 }
 /* table样式 */
-.el-table th {
-	background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%);
-}
-.el-table--border td {
-  border-bottom: 2px solid #D5D5D5;
-}
-.el-table--border td {
-	border-right: 2px solid #D5D5D5;
-}
-.el-table th.is-leaf {
-	border-right: none !important;
-}
-.el-table tr td:first-child {
-	border-left: 2px solid #D5D5D5;
-}
-.el-table thead {
-	color: #3D3D42;
-}
-.el-table th>.cell {
-	font-size: 16px;
-	font-family: PingFangSC-Medium, PingFang SC;
+.el-table--mini td, .el-table--mini th {
+	padding: 3px 0;
 	color: #3D3D42;
 }
-.el-table .el-table__body .cell {
-	font-size: 14px;
-	font-family: PingFangSC-Medium, PingFang SC;
-	color: #5C5A5A;
+.el-table__row:nth-child(even) {
+  background: #F7F7F7;
 }
 .el-table .el-table__body tr.current-row>td {
 	background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
@@ -57,9 +36,6 @@ li {
 .el-table .el-table__body tr.current-row>td  div {
 	color: #fff;
 }
-.el-table--mini td, .el-table--mini th{
-	padding: 3px 0;
-}
 /* button样式 */
 .el-button {
 	color: #5C5A5A;
diff --git a/src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue b/src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
index 9371769..2b0ee67 100644
--- a/src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
+++ b/src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
@@ -60,7 +60,7 @@ export default {
 									yAxis: this.maxValue,
 									label: {
 										formatter: '{c}%{b}',
-										position: 'end'
+										position: 'middle'
 									}
 								},
 								{
@@ -68,7 +68,7 @@ export default {
 									yAxis: this.minValue,
 									label: {
 										formatter: '{c}%{b}',
-										position: 'end'
+										position: 'middle'
 									}
 								}
 							]
@@ -96,7 +96,7 @@ export default {
         grid: {
           top: '10%',
           left: '5%',
-          right: '15%',
+          right: '0%',
           bottom: '0%',
           containLabel: true
         },
diff --git a/src/views/plan/workbench/homePage/formal/analysis/index.vue b/src/views/plan/workbench/homePage/formal/analysis/index.vue
index f404878..8469ce5 100644
--- a/src/views/plan/workbench/homePage/formal/analysis/index.vue
+++ b/src/views/plan/workbench/homePage/formal/analysis/index.vue
@@ -10,7 +10,7 @@
 								<el-radio label="2">环比</el-radio>
 							</el-radio-group>
 						</div>
-						<div class="mt30">
+						<div class="mt30" @change="singleRadioChange">
 							<el-radio v-model="allTheSingle" label="1">所有超差</el-radio>
 							<el-radio v-model="allTheSingle" label="2">指定零件</el-radio>
 						</div>
@@ -59,12 +59,12 @@
 					</el-table>
 				</div>
 			</el-col>
-			<el-col :span="9">
+			<el-col :span="allTheSingle === '2' ? 9 : 11">
 				<div class="">
 					<CommonLineChart :dataList="dataList.PerCustomerDeviationDetailItem|| []" />
 				</div>
 			</el-col>
-			<el-col :span="7">
+			<el-col :span="allTheSingle === '2' ? 7 : 9">
 				<div class="">
 					<LineBarChart :dataList="dataList.CustomerDeviationDetailItem || []" />
 				</div>
@@ -88,7 +88,7 @@ export default {
 		return {
 			queryParams: {},
 			withTheRingRadio: "1", // 同比或者环比
-			allTheSingle: "1", // 所有超差或者指定零件
+			allTheSingle: "2", // 所有超差或者指定零件
 			versionData: [], // 版本列表
 			tableData: [],
 			loading: false,
@@ -134,6 +134,10 @@ export default {
 		ringRadioChange() {
 			this.queryParams.versionId = ''
 		},
+		// 监听所有超差、指定零件
+		singleRadioChange() {
+			this.getLineBarChartData()
+		},
 		// 搜索
 		handleQuery() {
 			if (this.allTheSingle === '1') {
diff --git a/src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue b/src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
index 38ab453..957526a 100644
--- a/src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
+++ b/src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
@@ -81,7 +81,7 @@ export default {
         grid: {
           top: '10%',
           left: '5%',
-          right: '15%',
+          right: '0%',
           bottom: '0%',
           containLabel: true
         },
diff --git a/src/views/plan/workbench/materialAnalysis/filter/index.vue b/src/views/plan/workbench/materialAnalysis/filter/index.vue
index 64b77cf..cac44ec 100644
--- a/src/views/plan/workbench/materialAnalysis/filter/index.vue
+++ b/src/views/plan/workbench/materialAnalysis/filter/index.vue
@@ -6,6 +6,8 @@
 			<el-form class="clearfix">
 				<el-form-item label="原材料">
 					<el-select
+						filterable
+						clearable
 						style="width: 230px;"
 						v-model="queryParams.artcle"
 						placeholder="请选择原材料">
@@ -17,6 +19,7 @@
 				</el-form-item>
 				<el-form-item label="规格">
 					<el-select
+						clearable
 						style="width: 230px;"
 						v-model="queryParams.optionId"
 						placeholder="请选择规格">
@@ -63,7 +66,7 @@ export default {
 	},
 	created() {
 		// 获取原材料
-		get(`/admin/base/article/selectlist`, {ArtTypeId: 'MATERIALS'}).then(({ code, data }) => {
+		get(`/admin/base/article/selectdata`, {ArtTypeId: 'MATERIALS'}).then(({ code, data }) => {
 			if (code === 200) {
 				this.specificationsData = data
 			}