From 4243f25a01f4e79b3f83218dfcbe94d9befee43d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 20 十月 2025 09:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004

---
 src/views/index.vue |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 95fe72c..67c8654 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -118,11 +118,11 @@
 			<div class="main-panel">
 				<div style="display: flex;justify-content: space-between;">
 					<div class="section-title">搴旀敹搴斾粯缁熻</div>
-					<el-radio-group v-model="radio1" size="large" @change="statisticsReceivable">
-						<el-radio-button label="鎸夊懆" :value="1" />
-						<el-radio-button label="鎸夋湀" :value="2" />
-						<el-radio-button label="鎸夊搴�" :value="3" />
-					</el-radio-group>
+<!--					<el-radio-group v-model="radio1" size="large" @change="statisticsReceivable">-->
+<!--						<el-radio-button label="鎸夊懆" :value="1" />-->
+<!--						<el-radio-button label="鎸夋湀" :value="2" />-->
+<!--						<el-radio-button label="鎸夊搴�" :value="3" />-->
+<!--					</el-radio-group>-->
 				</div>
 				<Echarts ref="chart"
 								 :color="barColors2"
@@ -138,23 +138,23 @@
 		
 		<!-- 搴曢儴妯悜涓ゆ爮 -->
 		<div class="dashboard-row">
-			<div class="main-panel">
-				<div class="section-title">璐ㄩ噺缁熻</div>
-				<div class="quality-cards">
-					<div class="quality-card one">鍘熸潗鏂欏凡妫�娴嬫暟 <span>{{qualityStatisticsObject.supplierNum}}浠�</span></div>
-					<div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{qualityStatisticsObject.processNum}}浠�</span></div>
-					<div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{qualityStatisticsObject.factoryNum}}浠�</span></div>
-				</div>
-				<Echarts ref="chart"
-								 :chartStyle="chartStyle"
-								 :grid="grid"
-								 :legend="barLegend"
-								 :series="barSeries1"
-								 :tooltip="tooltip"
-								 :xAxis="xAxis1"
-								 :yAxis="yAxis1"
-								 style="height: 260px"></Echarts>
-			</div>
+<!--			<div class="main-panel">-->
+<!--				<div class="section-title">璐ㄩ噺缁熻</div>-->
+<!--				<div class="quality-cards">-->
+<!--					<div class="quality-card one">鍘熸潗鏂欏凡妫�娴嬫暟 <span>{{qualityStatisticsObject.supplierNum}}浠�</span></div>-->
+<!--					<div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{qualityStatisticsObject.processNum}}浠�</span></div>-->
+<!--					<div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{qualityStatisticsObject.factoryNum}}浠�</span></div>-->
+<!--				</div>-->
+<!--				<Echarts ref="chart"-->
+<!--								 :chartStyle="chartStyle"-->
+<!--								 :grid="grid"-->
+<!--								 :legend="barLegend"-->
+<!--								 :series="barSeries1"-->
+<!--								 :tooltip="tooltip"-->
+<!--								 :xAxis="xAxis1"-->
+<!--								 :yAxis="yAxis1"-->
+<!--								 style="height: 260px"></Echarts>-->
+<!--			</div>-->
 			<div class="main-panel">
 				<div class="section-title">鍥炴涓庡紑绁ㄥ垎鏋�</div>
 				<Echarts ref="chart" :chartStyle="chartStyle" :grid="grid" :legend="lineLegend" :series="lineSeries"
@@ -744,15 +744,18 @@
 	color: #666;
 	list-style: none;
 	padding: 0;
+	height: 190px;
+	overflow-y: auto;
+	width: 460px;
 }
 .line {
 	position: relative;
-	width: 250px;
+	width: 230px;
 }
 .line::after {
 	content: '';
 	position: absolute;
-	right: 12px;
+	right: 2px;
 	top: 0;
 	bottom: 0;
 	width: 1px;

--
Gitblit v1.9.3