From 0dd7648593cd62c88d173aa0a4555b750c8ae89a Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 31 Oct 2024 11:28:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fac_cal/mpointstat.vue | 124 +++++++++++++++----------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index d2c499dd..eaef4894 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -42,65 +42,67 @@
 				></el-button>
 			</div>
 		</el-header>
-		<el-container>
-			<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				row-key="id"
-				stripe
-				:params="params"
-                :query="query"
-				highlightCurrentRow
-				@row-click="rowClick"
-				@dataChange="dataChange"
-			>
-				<el-table-column type="index" width="50" />
-				<el-table-column label="测点" prop="mpoint_name">
-				</el-table-column>
-                <el-table-column label="所属集合" prop="mgroup_name">
-				</el-table-column>
-				<el-table-column label="类型" prop="type" width="80"> </el-table-column>
-				<el-table-column label="年" prop="year" width="80"> </el-table-column>
-                <el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
-				<el-table-column label="月" prop="month" width="50"> </el-table-column>
-                <el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
-				<el-table-column label="日" prop="day" width="50"> </el-table-column>
-                <el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
-                <el-table-column label="时" prop="hour" width="50"> </el-table-column>
-				<el-table-column label="当前值" prop="val"></el-table-column>
-				<el-table-column
-					label="校正值"
-					prop="val_correct"
-				></el-table-column>
-				<el-table-column
-					label="原始计算值"
-					prop="val_origin"
-				></el-table-column>
-				<el-table-column
-					label="操作"
-					fixed="right"
-					align="center"
-					width="140"
+		<el-main class="nopadding">
+			<el-container>
+				<el-aside style="width: 50%; float: right;">
+        		<!-- 折线图组件 -->
+					<scTable
+					ref="table"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="params"
+					:query="query"
+					highlightCurrentRow
+					@row-click="rowClick"
+					@dataChange="dataChange"
 				>
-					<template #default="scope">
-						<el-button
-							link
-							size="small"
-							v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
-							@click="handle_edit(scope.row)"
-							type="primary"
-							>校正</el-button
-						>
-					</template>
-				</el-table-column>
-			</scTable>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="测点" prop="mpoint_name">
+					</el-table-column>
+					<el-table-column label="所属集合" prop="mgroup_name">
+					</el-table-column>
+					<el-table-column label="类型" prop="type" width="80"> </el-table-column>
+					<el-table-column label="年" prop="year" width="80"> </el-table-column>
+					<el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
+					<el-table-column label="月" prop="month" width="50"> </el-table-column>
+					<el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
+					<el-table-column label="日" prop="day" width="50"> </el-table-column>
+					<el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
+					<el-table-column label="时" prop="hour" width="50"> </el-table-column>
+					<el-table-column label="当前值" prop="val"></el-table-column>
+					<el-table-column
+						label="校正值"
+						prop="val_correct"
+					></el-table-column>
+					<el-table-column
+						label="原始计算值"
+						prop="val_origin"
+					></el-table-column>
+					<el-table-column
+						label="操作"
+						fixed="right"
+						align="center"
+						width="140"
+					>
+						<template #default="scope">
+							<el-button
+								link
+								size="small"
+								v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
+								@click="handle_edit(scope.row)"
+								type="primary"
+								>校正</el-button
+							>
+						</template>
+					</el-table-column>
+					</scTable>
+      			</el-aside>
+				<el-main>
+					<scEcharts :option="chartOption" height="400px" />
+				</el-main>
+			</el-container>		
 		</el-main>
-		<el-aside style="width: 50%; float: right;">
-        <!-- 折线图组件 -->
-        <scEcharts :option="chartOption" height="400px" />
-      </el-aside>
-		</el-container>
 	</el-container>
 		<el-dialog title="校正" v-model="visible">
 			<el-main style="padding: 0 20px 20px 20px">
@@ -167,7 +169,7 @@ export default {
                 end_time: null
             },
 			chartOption: {
-				color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
+				color: ["#191970"],
 				tooltip: {
 					trigger: "axis",
 					axisPointer: {
@@ -232,14 +234,13 @@ export default {
 
 		option.series = [
 			{
-				name: '总生产',
+				name: tableData[0].mpoint_name,
 				type: 'line', // 折线图类型
 				data: tableData.map((item) => parseFloat(item.val)), // 将字符串转为数字
 				smooth: true, // 平滑曲线
 			}
 		];
-		option.legend.data = ['总生产'];
-
+		option.legend.data = [tableData[0].mpoint_name];
 		// 更新图表选项
 		that.chartOption = option;
 	},
@@ -254,7 +255,6 @@ export default {
 		},
 		handle_add() {},
 		handleQuery() {
-            console.log(this.query)
             if (this.timeRange) {
                 this.query.start_time = this.timeRange[0]
                 this.query.end_time = this.timeRange[1]