From 99d1c9fbcfaf391c5403752b0a491fb37418ebe9 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 27 二月 2025 17:15:29 +0800
Subject: [PATCH] 解决日月年综合分析图表bug
---
zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue | 30 +-------------
zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue | 32 ++--------------
zhitan-vue/vite.config.js | 6 +-
zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue | 4 +
4 files changed, 13 insertions(+), 59 deletions(-)
diff --git a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
index 8ef4282..1d2d092 100644
--- a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
@@ -33,7 +33,7 @@
</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-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
@@ -131,6 +131,8 @@
energyList.value = response.data
if (response.data && response.data.length !== 0) {
selectChange(response.data[0])
+ } else {
+ lineChartData.value = {}
}
})
}
diff --git a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
index 588b94d..cc43f28 100644
--- a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
@@ -33,7 +33,7 @@
</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-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
@@ -126,6 +126,8 @@
energyList.value = response.data.tabledata
if (energyList.value && energyList.value.length !== 0) {
selectChange(energyList.value[0])
+ } else {
+ lineChartData.value = {}
}
})
}
@@ -148,32 +150,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,
diff --git a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
index 1b4eb04..d916e04 100644
--- a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
@@ -33,7 +33,7 @@
</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-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
@@ -127,6 +127,8 @@
energyList.value = response.data
if (response.data && response.data.length !== 0) {
selectChange(response.data[0])
+ } else {
+ lineChartData.value = {}
}
})
}
@@ -143,7 +145,7 @@
let title = ""
response.data.forEach((item) => {
expectedData.push(numFilter(item.value))
- actualData.push(item.timeCode.slice(item.timeCode.length - 2, item.timeCode.length) + "鏃�")
+ actualData.push(item.timeCode.slice(item.timeCode.length - 2, item.timeCode.length) + "鏈�")
title = item.indexName + "(" + (item.unitId || "") + ")"
})
@@ -152,32 +154,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,
diff --git a/zhitan-vue/vite.config.js b/zhitan-vue/vite.config.js
index 1357748..a4c5dbc 100644
--- a/zhitan-vue/vite.config.js
+++ b/zhitan-vue/vite.config.js
@@ -4,9 +4,9 @@
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {
- mode='production'
+ mode = "production"
const env = loadEnv(mode, process.cwd())
- console.log(mode,'==========env')
+ console.log(mode, "==========env")
const { VITE_APP_ENV } = env
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
@@ -33,7 +33,7 @@
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
"/dev-api": {
- target: "http://139.159.201.118:8201",
+ target: "http://localhost",
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, ""),
},
--
Gitblit v1.9.3