From 7be77bb648c8dc92539d02f4d678ff60b2d5f3db Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 19 六月 2025 17:51:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/GroupUtilizationRateChart.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/GroupUtilizationRateChart.vue b/src/views/mdc/base/GroupUtilizationRateChart.vue
index ad8c62d..a7f005b 100644
--- a/src/views/mdc/base/GroupUtilizationRateChart.vue
+++ b/src/views/mdc/base/GroupUtilizationRateChart.vue
@@ -28,7 +28,7 @@
<a-col :md="4" :sm="4">
<a-form-item label="璁惧绫诲瀷">
<a-select v-model="queryParam.equipmentType" placeholder="璇烽�夋嫨璁惧绫诲瀷" allowClear>
- <a-select-option v-for="item in equipmentTypeList" :key="item.id">
+ <a-select-option v-for="item in equipmentTypeList" :key="item.equipmentTypeName">
{{ item.equipmentTypeName }}
</a-select-option>
</a-select>
@@ -129,7 +129,7 @@
* @param shiftDataList 鐝鏁版嵁鍒楄〃
*/
initChart({ dataList, dateList, shiftSubList, shiftDataList }) {
- const defaultLegendData = ['24灏忔椂', '24灏忔椂锛堝幓闄ゆ晠闅滆澶囷級', '鐝', '绱杩愯鏃堕棿(h)']
+ const defaultLegendData = ['24灏忔椂', '24灏忔椂锛堝幓闄ゆ晠闅滄椂闂达級', '鐝', '绱杩愯鏃堕棿(h)']
const defaultSeries = [
{
type: 'line',
@@ -139,7 +139,7 @@
},
{
type: 'line',
- name: '24灏忔椂锛堝幓闄ゆ晠闅滆澶囷級',
+ name: '24灏忔椂锛堝幓闄ゆ晠闅滄椂闂达級',
yAxisIndex: 0,
data: dataList ? dataList.map(item => item.amendUtilizationRate) : []
},
--
Gitblit v1.9.3