yangjun
/
grgw_vue_xz_2025
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整页面温度显示字段

This commit is contained in:
曹磊 2025-09-22 16:02:05 +08:00
parent e2c1f7e4cc
commit 919cfcc867
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/jeecgboot","http://localhost:8050/jeecg-boot"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/jeecgboot","http://localhost:8060/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8050/jeecg-boot VITE_GLOB_DOMAIN_URL=http://localhost:8060/jeecg-boot
#后台接口父地址(必填) #后台接口父地址(必填)
VITE_GLOB_API_URL=/jeecgboot VITE_GLOB_API_URL=/jeecgboot

2
.env.production
View File

@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
VITE_GLOB_API_URL=/api VITE_GLOB_API_URL=/api
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8050/jeecg-boot VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8060/jeecg-boot
# 接口父路径前缀 # 接口父路径前缀
VITE_GLOB_API_URL_PREFIX= VITE_GLOB_API_URL_PREFIX=

28
src/views/dashboard/Analysis/index.vue
View File

@ -70,7 +70,7 @@
</a-col> </a-col>
</a-row> </a-row>
</a-col> </a-col>
</a-row> </a-row>
<a-modal title="切换锅炉房" :visible="visible" @ok="handleOk" <a-modal title="切换锅炉房" :visible="visible" @ok="handleOk"
:okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
@ -92,7 +92,7 @@
import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue'; import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api"; import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api";
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -249,8 +249,8 @@ function getStaticTwo(){
var dataSource2 = []; var dataSource2 = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
names.push(dataList.value[i].datatime); names.push(dataList.value[i].datatime);
dataSource.push({value:dataList.value[i].view005}); dataSource.push({value:dataList.value[i].view035});
dataSource2.push({value:dataList.value[i].view006}); dataSource2.push({value:dataList.value[i].view036});
} }
const staticParam = document.querySelector('.staticTwo') as HTMLElement; const staticParam = document.querySelector('.staticTwo') as HTMLElement;
chartTwo = echarts.init(staticParam); chartTwo = echarts.init(staticParam);
@ -549,7 +549,7 @@ function getStaticThree(){
] ]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartThree.__autoTooltipTimer) { if (chartThree.__autoTooltipTimer) {
@ -697,7 +697,7 @@ function getStaticFour(){
}] }]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartFour.__autoTooltipTimer) { if (chartFour.__autoTooltipTimer) {
@ -739,7 +739,7 @@ function getStaticFour(){
} }
function getStaticFive(){ function getStaticFive(){
var names = []; var names = [];
var dataSource = []; var dataSource = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
@ -845,7 +845,7 @@ function getStaticFive(){
} }
}] }]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartFive.__autoTooltipTimer) { if (chartFive.__autoTooltipTimer) {
@ -887,7 +887,7 @@ function getStaticFive(){
} }
function getStaticSix(){ function getStaticSix(){
var names = []; var names = [];
var dataSource = []; var dataSource = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
@ -1007,7 +1007,7 @@ console.log("🚀 ~ handleCheckGlf ~ item:", item)
} }
loadData(); loadData();
} }
function handleOk(){ function handleOk(){
var list = heatsource.value var list = heatsource.value
companyName.value = list.filter(item => item.sourceId == sourceId.value)[0].companyName companyName.value = list.filter(item => item.sourceId == sourceId.value)[0].companyName
visible.value = false; visible.value = false;
@ -1036,7 +1036,7 @@ async function loadData() {
getStaticFour(); getStaticFour();
getStaticFive(); getStaticFive();
getStaticSix(); getStaticSix();
} }
async function getHeatsource(){ async function getHeatsource(){
heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId}); heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId});
@ -1050,7 +1050,7 @@ onMounted(async () => {
companyName.value = list[0].companyName companyName.value = list[0].companyName
} }
loadData(); loadData();
setInterval(() => { setInterval(() => {
var list = heatsource.value var list = heatsource.value
if(list.length>0){ if(list.length>0){
@ -1130,7 +1130,7 @@ onBeforeUnmount(() => {
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
height: 20vh; /* 需要设置容器高度 */ height: 20vh; /* 需要设置容器高度 */
background: url(../../../assets/dp/icon1.png) no-repeat; background: url(../../../assets/dp/icon1.png) no-repeat;
background-position: center center; background-position: center center;
background-size: 95% 80%; background-size: 95% 80%;
@ -1143,7 +1143,7 @@ onBeforeUnmount(() => {
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
height: 20vh; /* 需要设置容器高度 */ height: 20vh; /* 需要设置容器高度 */
background: url(../../../assets/dp/icon2.png) no-repeat; background: url(../../../assets/dp/icon2.png) no-repeat;
background-position: center center; background-position: center center;
background-size: 95% 80%; background-size: 95% 80%;

32
src/views/dashboard/Analysis/index1.vue
View File

@ -70,7 +70,7 @@
</a-col> </a-col>
</a-row> </a-row>
</a-col> </a-col>
</a-row> </a-row>
<a-modal title="切换锅炉房" :visible="visible" @ok="handleOk" <a-modal title="切换锅炉房" :visible="visible" @ok="handleOk"
:okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
@ -92,7 +92,7 @@
import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue'; import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api"; import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api";
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -249,8 +249,8 @@ function getStaticTwo(){
var dataSource2 = []; var dataSource2 = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
names.push(dataList.value[i].datatime); names.push(dataList.value[i].datatime);
dataSource.push({value:dataList.value[i].view005}); dataSource.push({value:dataList.value[i].view035});
dataSource2.push({value:dataList.value[i].view006}); dataSource2.push({value:dataList.value[i].view036});
} }
const staticParam = document.querySelector('.staticTwo') as HTMLElement; const staticParam = document.querySelector('.staticTwo') as HTMLElement;
chartTwo = echarts.init(staticParam); chartTwo = echarts.init(staticParam);
@ -549,7 +549,7 @@ function getStaticThree(){
] ]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartThree.__autoTooltipTimer) { if (chartThree.__autoTooltipTimer) {
@ -697,7 +697,7 @@ function getStaticFour(){
}] }]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartFour.__autoTooltipTimer) { if (chartFour.__autoTooltipTimer) {
@ -739,7 +739,7 @@ function getStaticFour(){
} }
function getStaticFive(){ function getStaticFive(){
var names = []; var names = [];
var dataSource = []; var dataSource = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
@ -845,7 +845,7 @@ function getStaticFive(){
} }
}] }]
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
// 清理旧定时器（避免重复） // 清理旧定时器（避免重复）
if (chartFive.__autoTooltipTimer) { if (chartFive.__autoTooltipTimer) {
@ -887,7 +887,7 @@ function getStaticFive(){
} }
function getStaticSix(){ function getStaticSix(){
var names = []; var names = [];
var dataSource = []; var dataSource = [];
for(var i=0;i<dataList.value.length;i++){ for(var i=0;i<dataList.value.length;i++){
@ -1014,7 +1014,7 @@ console.log("🚀 ~ handleCheckGlf ~ item:", item)
} }
loadData(); loadData();
} }
function handleOk(){ function handleOk(){
var list = heatsource.value var list = heatsource.value
companyName.value = list.filter(item => item.sourceId == sourceId.value)[0].companyName companyName.value = list.filter(item => item.sourceId == sourceId.value)[0].companyName
visible.value = false; visible.value = false;
@ -1043,7 +1043,7 @@ async function loadData() {
getStaticFour(); getStaticFour();
getStaticFive(); getStaticFive();
getStaticSix(); getStaticSix();
} }
async function getHeatsource(){ async function getHeatsource(){
heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId}); heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId});
@ -1068,7 +1068,7 @@ onMounted(async () => {
companyName.value = list[0].companyName companyName.value = list[0].companyName
} }
loadData(); loadData();
setInterval(() => { setInterval(() => {
var list = heatsource.value var list = heatsource.value
if(list.length>0){ if(list.length>0){
@ -1085,7 +1085,7 @@ onMounted(async () => {
} }
loadData(); loadData();
}, 60 * 1000); }, 60 * 1000);
window.addEventListener("resize", resizeChart); window.addEventListener("resize", resizeChart);
}); });
@ -1097,7 +1097,7 @@ onBeforeUnmount(() => {
if (chartFour) { chartFour.dispose(); chartFour = null; } if (chartFour) { chartFour.dispose(); chartFour = null; }
if (chartFive) { chartFive.dispose(); chartFive = null; } if (chartFive) { chartFive.dispose(); chartFive = null; }
if (chartSix) { chartSix.dispose(); chartSix = null; } if (chartSix) { chartSix.dispose(); chartSix = null; }
}); });
</script> </script>
@ -1157,7 +1157,7 @@ onBeforeUnmount(() => {
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
height: 20vh; /* 需要设置容器高度 */ height: 20vh; /* 需要设置容器高度 */
background: url(../../../assets/dp/icon1.png) no-repeat; background: url(../../../assets/dp/icon1.png) no-repeat;
background-position: center center; background-position: center center;
background-size: 95% 80%; background-size: 95% 80%;
@ -1170,7 +1170,7 @@ onBeforeUnmount(() => {
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
height: 20vh; /* 需要设置容器高度 */ height: 20vh; /* 需要设置容器高度 */
background: url(../../../assets/dp/icon2.png) no-repeat; background: url(../../../assets/dp/icon2.png) no-repeat;
background-position: center center; background-position: center center;
background-size: 95% 80%; background-size: 95% 80%;

4
src/views/staticList/XzGlfghsList.vue
View File

@ -74,8 +74,8 @@ function prepareOptions(records: any[]) {
const { city } = splitByRegion(records); const { city } = splitByRegion(records);
const cityX = buildXAxis(city, 'datatime'); const cityX = buildXAxis(city, 'datatime');
const citySW = city.map((r: any) => safeNum(r.view005)); const citySW = city.map((r: any) => safeNum(r.view035));
const cityHW = city.map((r: any) => safeNum(r.view006)); const cityHW = city.map((r: any) => safeNum(r.view036));
cityOption = { cityOption = {
title: { text: '供/回水温度监测', left: 'center', top: 10 }, title: { text: '供/回水温度监测', left: 'center', top: 10 },
tooltip: { trigger: 'axis' }, tooltip: { trigger: 'axis' },

6
src/views/staticList/XzGlfghsListHistory.vue
View File

@ -34,7 +34,7 @@ const { userInfo } = useUserStore();
const disabledDate = (current) => { const disabledDate = (current) => {
const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); // 最小允许日期 const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); // 最小允许日期
const currentMonth = dayjs().startOf('month'); // 当前月份（如 2025-09-01） const currentMonth = dayjs().startOf('month'); // 当前月份（如 2025-09-01）
// 如果日期早于 2025-08 或晚于当前月份，则禁用 // 如果日期早于 2025-08 或晚于当前月份，则禁用
return ( return (
current.isBefore(minDate, 'month') || // 早于 2025-08 current.isBefore(minDate, 'month') || // 早于 2025-08
@ -85,8 +85,8 @@ function prepareOptions(records: any[]) {
const { city } = splitByRegion(records); const { city } = splitByRegion(records);
const cityX = buildXAxis(city, 'datatime'); const cityX = buildXAxis(city, 'datatime');
const citySW = city.map((r: any) => safeNum(r.view005)); const citySW = city.map((r: any) => safeNum(r.view035));
const cityHW = city.map((r: any) => safeNum(r.view006)); const cityHW = city.map((r: any) => safeNum(r.view036));
cityOption = { cityOption = {
title: { text: '历史供/回水温度监测', left: 'center', top: 10 }, title: { text: '历史供/回水温度监测', left: 'center', top: 10 },
tooltip: { trigger: 'axis' }, tooltip: { trigger: 'axis' },