From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue | 42 +++++++++---------------------------------
1 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
index c63c0fe..f6b537e 100644
--- a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
@@ -18,7 +18,7 @@
v-model="queryParams.dataTime"
type="month"
:clearable="false"
- value-format="yyyy-MM"
+ value-format="YYYY-MM"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -33,9 +33,9 @@
</el-form>
</div>
- <div class="table-bg-style">
+ <div class="table-bg-style" style="padding-bottom: 12px">
<div class="table-box">
- <el-table :data="energyList" v-loading="loading" border max-height="380px">
+ <el-table :data="energyList" v-loading="loading" border max-height="380px" height="380">
<el-table-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
<template #default="scope">
<div style="width: 100%; text-align: left">
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
@@ -68,11 +68,10 @@
</div>
</template>
</el-table-column>
- <el-table-column v-for="index in 31" :key="index" :label="index + '鏃�'" align="center" min-width="100">
- <template #default="scope">{{ numFilter(scope.row[`value${index - 1}`]) }}</template>
+ <el-table-column v-for="index in 31" :key="index" :label="index + '鏃�'" align="center" min-width="100px">
+ <template #default="scope">{{ numFilter(scope.row[`value${index}`]) }}</template>
</el-table-column>
</el-table>
-
<div>
<line-chart ref="LineChartRef" :chartData="lineChartData" />
</div>
@@ -124,9 +123,12 @@
getDataList({
...queryParams.value,
}).then((response) => {
+ console.log("1111111111", response)
energyList.value = response.data.tabledata
if (energyList.value && energyList.value.length !== 0) {
selectChange(energyList.value[0])
+ } else {
+ lineChartData.value = {}
}
})
}
@@ -149,32 +151,6 @@
console.log(expectedData)
lineChartData.value = {
- // xData: [
- // "0鏃�",
- // "1鏃�",
- // "2鏃�",
- // "3鏃�",
- // "4鏃�",
- // "5鏃�",
- // "6鏃�",
- // "7鏃�",
- // "8鏃�",
- // "9鏃�",
- // "10鏃�",
- // "11鏃�",
- // "12鏃�",
- // "13鏃�",
- // "14鏃�",
- // "15鏃�",
- // "16鏃�",
- // "17鏃�",
- // "18鏃�",
- // "19鏃�",
- // "20鏃�",
- // "21鏃�",
- // "22鏃�",
- // "23鏃�",
- // ],
xData: actualData,
yData: expectedData,
title,
--
Gitblit v1.9.3