diff --git a/src/api/index.ts b/src/api/index.ts index 0fbefe4..7cd8175 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -122,20 +122,20 @@ export const getTrainingManagementDataPark = (data) => { // 动环监控-总设备数 /jeelowcode/power_env_device_totol_num export const getPowerEnvDeviceTotalNum = (data) => { - return request.post({ url: '/jeelowcode/power_env_device_totol_num', data }) + return request.post({ url: '/jeelowcode/report-data/list/power_env_device_totol_num', data }) } // 动环监控-告警设备类型分布 /jeelowcode/power_env_device_alarm_distribution export const getPowerEnvDeviceAlarmDistribution = (data) => { - return request.post({ url: '/jeelowcode/power_env_device_alarm_distribution', data }) + return request.post({ url: '/jeelowcode/report-data/list/power_env_device_alarm_distribution', data }) } // 动环监控-当月告警趋势 /jeelowcode/power_env_alarm_trend export const getPowerEnvAlarmTrend = (data) => { - return request.post({ url: '/jeelowcode/power_env_alarm_trend', data }) + return request.post({ url: '/jeelowcode/report-data/list/power_env_alarm_trend', data }) } // 动环监控-园区信息列表 /jeelowcode/power_env_device_group_type_campus export const getPowerEnvDeviceGroupTypeCampus = (data) => { - return request.post({ url: '/jeelowcode/power_env_device_group_type_campus', data }) + return request.post({ url: '/jeelowcode/report-data/list/power_env_device_group_type_campus', data }) } \ No newline at end of file diff --git a/src/permission.ts b/src/permission.ts index aa9f520..b461e2e 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -102,10 +102,17 @@ router.beforeEach(async (to, from, next) => { } else { if(import.meta.env.VITE_DEFAULT_SSO =='true'){ authUtil.setTenantId("1") + // 正确构造包含查询参数的重定向URL + let redirectUrl = to.fullPath; + if (Object.keys(to.query).length > 0) { + const queryParams = new URLSearchParams(to.query as Record).toString(); + redirectUrl = `${to.path}?${queryParams}`; + } + const redirectUri = location.origin + '/social-login?' + - `type=100&redirect=${to.fullPath}` + `type=100&redirect=${encodeURIComponent(redirectUrl)}` // 进行跳转 const res = await LoginApi.socialAuthRedirect(100, encodeURIComponent(redirectUri)) diff --git a/src/views/screen/components/AlertPanel.vue b/src/views/screen/components/AlertPanel.vue index 9e3eea3..501c2a1 100644 --- a/src/views/screen/components/AlertPanel.vue +++ b/src/views/screen/components/AlertPanel.vue @@ -52,7 +52,7 @@ class="alert-text" :class="[{ error: item.error }, { warn: item.warn }]" > - {{ (index + 1) }} {{ item.text }} + {{ (index + 1) }} {{ item.text }} diff --git a/src/views/screen/components/HiddenDangerPanel.vue b/src/views/screen/components/HiddenDangerPanel.vue index 8696b51..db47016 100644 --- a/src/views/screen/components/HiddenDangerPanel.vue +++ b/src/views/screen/components/HiddenDangerPanel.vue @@ -61,7 +61,7 @@
- 安全指数: + 安全指数:

 {{ hiddenDangerData?.safetyIndex || 0 }}
@@ -392,7 +392,8 @@ onMounted(() => { } } } - +p{width:17px; height:17px; background-color:rgb(125, 125, 152); border-radius:50%; text-align:center; } +p:before{content:'?'; color:yellow; font-weight: bold;} .center-container { position: fixed; top: 55%; diff --git a/src/views/screen/components/OverviewPanel.vue b/src/views/screen/components/OverviewPanel.vue index 81e01aa..a29c5d6 100644 --- a/src/views/screen/components/OverviewPanel.vue +++ b/src/views/screen/components/OverviewPanel.vue @@ -263,7 +263,7 @@ onMounted(() => { line-height: 25px; color: #fff; text-align: center; - background-color: #1afb8f; + background-color: #158e56; border-radius: 2px; transition: all 0.3s ease; } diff --git a/src/views/screen/components/ScreenFrame.vue b/src/views/screen/components/ScreenFrame.vue index 9647898..d93a046 100644 --- a/src/views/screen/components/ScreenFrame.vue +++ b/src/views/screen/components/ScreenFrame.vue @@ -11,12 +11,12 @@ {{ currentTime }} - +
diff --git a/src/views/screen/components/WeatherWarning.vue b/src/views/screen/components/WeatherWarning.vue index 9dda221..beea09e 100644 --- a/src/views/screen/components/WeatherWarning.vue +++ b/src/views/screen/components/WeatherWarning.vue @@ -1,15 +1,15 @@ diff --git a/src/views/screen/mainScreen.vue b/src/views/screen/mainScreen.vue index 8252dac..6f2dfb9 100644 --- a/src/views/screen/mainScreen.vue +++ b/src/views/screen/mainScreen.vue @@ -1355,7 +1355,7 @@ const timeOut1 = (): void => { @keyframes typeFlashEffect { 0% { - background-color: #1afb8f; + background-color: #158e56; } 50% { @@ -1363,7 +1363,7 @@ const timeOut1 = (): void => { } 100% { - background-color: #1afb8f; + background-color: #158e56; } } @@ -1381,14 +1381,14 @@ const timeOut1 = (): void => { line-height: 25px; color: #fff; text-align: center; - background-color: #1afb8f; + background-color: #158e56; border-radius: 2px; animation: typeNumberPulse 1.5s ease-in-out infinite; transition: all 0.3s ease; } .type-number:hover { - background-color: #16d47a; + background-color: #158e56; transform: scale(1.2); } diff --git a/src/views/screen/powerMonitoring.vue b/src/views/screen/powerMonitoring.vue index 7137285..9a65822 100644 --- a/src/views/screen/powerMonitoring.vue +++ b/src/views/screen/powerMonitoring.vue @@ -27,7 +27,7 @@
在线设备数
{{ onlineDevices.toLocaleString() }}
- 在线率 {{ onlineRate }}% +
@@ -109,6 +109,8 @@ 异常 正常 @@ -440,8 +442,10 @@ const fetchTotalDevices = async () => { pageSize: 10 }; const response = await getPowerEnvDeviceTotalNum(params); - if (response.code === 0 && response.data?.records?.length > 0) { - const total = parseInt(response.data.records[0].total || '0', 10); + debugger + if (response.records?.length > 0) { + debugger + const total = parseInt(response.records[0].total || '0', 10); totalDevices.value = total; onlineDevices.value = total; // 在线设备数也用total } @@ -522,11 +526,12 @@ const fetchParkList = async () => { pageSize: parkListPage.value.pageSize }; const response = await getPowerEnvDeviceGroupTypeCampus(params); - if (response.code === 0 && response.data) { - parkListPage.value.total = response.data.total || 0; + debugger + if (response.records?.length>0) { + parkListPage.value.total = response.records?.length || 0; - if (response.data.records && response.data.records.length > 0) { - parkList.value = response.data.records.map((item: any) => { + if (response.records && response.records.length > 0) { + parkList.value = response.records.map((item: any) => { const upsCount = parseInt(item.ups || '0', 10); const jmktCount = parseInt(item.jmkt || '0', 10); const wsdCount = parseInt(item.wsd || '0', 10);