From 919cfcc867f89e92002302aba57dd5841cfaab6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 22 Sep 2025 16:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=B8=A9?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- .env.production | 2 +- src/views/dashboard/Analysis/index.vue | 28 ++++++++--------- src/views/dashboard/Analysis/index1.vue | 32 ++++++++++---------- src/views/staticList/XzGlfghsList.vue | 4 +-- src/views/staticList/XzGlfghsListHistory.vue | 6 ++-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.env.development b/.env.development index 5d8b39e..dcc7669 100644 --- a/.env.development +++ b/.env.development @@ -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 diff --git a/.env.production b/.env.production index 8cc62d9..1c60ea9 100644 --- a/.env.production +++ b/.env.production @@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false 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= diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue index 642f889..9100992 100644 --- a/src/views/dashboard/Analysis/index.vue +++ b/src/views/dashboard/Analysis/index.vue @@ -70,7 +70,7 @@ - + @@ -92,7 +92,7 @@ import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue'; import * as echarts from 'echarts'; import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api"; - + import { useUserStore } from '/@/store/modules/user'; import { defHttp } from '/@/utils/http/axios'; import dayjs from 'dayjs'; @@ -249,8 +249,8 @@ function getStaticTwo(){ var dataSource2 = []; for(var i=0;i item.sourceId == sourceId.value)[0].companyName visible.value = false; @@ -1036,7 +1036,7 @@ async function loadData() { getStaticFour(); getStaticFive(); getStaticSix(); - + } async function getHeatsource(){ heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId}); @@ -1050,7 +1050,7 @@ onMounted(async () => { companyName.value = list[0].companyName } loadData(); - + setInterval(() => { var list = heatsource.value if(list.length>0){ @@ -1130,7 +1130,7 @@ onBeforeUnmount(() => { justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ height: 20vh; /* 需要设置容器高度 */ - + background: url(../../../assets/dp/icon1.png) no-repeat; background-position: center center; background-size: 95% 80%; @@ -1143,7 +1143,7 @@ onBeforeUnmount(() => { justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ height: 20vh; /* 需要设置容器高度 */ - + background: url(../../../assets/dp/icon2.png) no-repeat; background-position: center center; background-size: 95% 80%; diff --git a/src/views/dashboard/Analysis/index1.vue b/src/views/dashboard/Analysis/index1.vue index 670bec0..0f425d2 100644 --- a/src/views/dashboard/Analysis/index1.vue +++ b/src/views/dashboard/Analysis/index1.vue @@ -70,7 +70,7 @@ - + @@ -92,7 +92,7 @@ import { ref, onMounted, nextTick, onUnmounted,onBeforeUnmount } from 'vue'; import * as echarts from 'echarts'; import { heatsourcelist } from "@/views/base/simconfig/Simconfig.api"; - + import { useUserStore } from '/@/store/modules/user'; import { defHttp } from '/@/utils/http/axios'; import dayjs from 'dayjs'; @@ -249,8 +249,8 @@ function getStaticTwo(){ var dataSource2 = []; for(var i=0;i item.sourceId == sourceId.value)[0].companyName visible.value = false; @@ -1043,7 +1043,7 @@ async function loadData() { getStaticFour(); getStaticFive(); getStaticSix(); - + } async function getHeatsource(){ heatsource.value = await heatsourcelist({sourceId: userInfo.sourceId}); @@ -1068,7 +1068,7 @@ onMounted(async () => { companyName.value = list[0].companyName } loadData(); - + setInterval(() => { var list = heatsource.value if(list.length>0){ @@ -1085,7 +1085,7 @@ onMounted(async () => { } loadData(); }, 60 * 1000); - + window.addEventListener("resize", resizeChart); }); @@ -1097,7 +1097,7 @@ onBeforeUnmount(() => { if (chartFour) { chartFour.dispose(); chartFour = null; } if (chartFive) { chartFive.dispose(); chartFive = null; } if (chartSix) { chartSix.dispose(); chartSix = null; } - + }); @@ -1157,7 +1157,7 @@ onBeforeUnmount(() => { justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ height: 20vh; /* 需要设置容器高度 */ - + background: url(../../../assets/dp/icon1.png) no-repeat; background-position: center center; background-size: 95% 80%; @@ -1170,7 +1170,7 @@ onBeforeUnmount(() => { justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ height: 20vh; /* 需要设置容器高度 */ - + background: url(../../../assets/dp/icon2.png) no-repeat; background-position: center center; background-size: 95% 80%; diff --git a/src/views/staticList/XzGlfghsList.vue b/src/views/staticList/XzGlfghsList.vue index 2c61c49..bf01155 100644 --- a/src/views/staticList/XzGlfghsList.vue +++ b/src/views/staticList/XzGlfghsList.vue @@ -74,8 +74,8 @@ function prepareOptions(records: any[]) { const { city } = splitByRegion(records); const cityX = buildXAxis(city, 'datatime'); - const citySW = city.map((r: any) => safeNum(r.view005)); - const cityHW = city.map((r: any) => safeNum(r.view006)); + const citySW = city.map((r: any) => safeNum(r.view035)); + const cityHW = city.map((r: any) => safeNum(r.view036)); cityOption = { title: { text: '供/回水温度监测', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, diff --git a/src/views/staticList/XzGlfghsListHistory.vue b/src/views/staticList/XzGlfghsListHistory.vue index 199b790..0f46af7 100644 --- a/src/views/staticList/XzGlfghsListHistory.vue +++ b/src/views/staticList/XzGlfghsListHistory.vue @@ -34,7 +34,7 @@ const { userInfo } = useUserStore(); const disabledDate = (current) => { const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); // 最小允许日期 const currentMonth = dayjs().startOf('month'); // 当前月份（如 2025-09-01） - + // 如果日期早于 2025-08 或晚于当前月份，则禁用 return ( current.isBefore(minDate, 'month') || // 早于 2025-08 @@ -85,8 +85,8 @@ function prepareOptions(records: any[]) { const { city } = splitByRegion(records); const cityX = buildXAxis(city, 'datatime'); - const citySW = city.map((r: any) => safeNum(r.view005)); - const cityHW = city.map((r: any) => safeNum(r.view006)); + const citySW = city.map((r: any) => safeNum(r.view035)); + const cityHW = city.map((r: any) => safeNum(r.view036)); cityOption = { title: { text: '历史供/回水温度监测', left: 'center', top: 10 }, tooltip: { trigger: 'axis' },