Web/admin-sjzx
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改辽宁反馈问题

Browse Source
This commit is contained in:
guanj
2026-06-23 21:27:15 +08:00
parent ed60e2b7f3
commit 070e404bbb
20 changed files with 2369 additions and 2260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/utils/echartMethod.ts
View File

@@ -53,82 +53,23 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
export const yMethod = (arr: any) => {
let num = 0.2
let numList = dataProcessing(arr)
let maxValue = 0
let minValue = 0
let max = 0
if (numList.length === 0) {
return [0, 0]
}
const maxValue = Math.max(...numList)
const minValue = Math.min(...numList)
let min = 0
maxValue = Math.max(...numList)
minValue = Math.min(...numList)
const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
min = calculateValue(o, minValue, num, true)
let max = 0
max = calculateValue(o, maxValue, num, false)
// if (-100 >= minValue) {
// min = Math.floor((minValue + num * minValue) / 100) * 100
// } else if (-10 >= minValue && minValue > -100) {
// min = Math.floor((minValue + num * minValue) / 10) * 10
// } else if (-1 >= minValue && minValue > -10) {
// min = Math.floor(minValue + num * minValue)
// } else if (0 > minValue && minValue > -1) {
// min = parseFloat((minValue + num * minValue).toFixed(1))
// } else if (minValue == 0) {
// min = 0
// } else if (0 < minValue && minValue < 1) {
// min = parseFloat((minValue - num * minValue).toFixed(1))
// } else if (1 <= minValue && minValue < 10) {
// min = Math.floor(minValue - num * minValue)
// } else if (10 <= minValue && minValue < 100) {
// min = Math.floor((minValue - num * minValue) / 10) * 10
// } else if (100 <= minValue) {
// min = Math.floor((minValue - num * minValue) / 100) * 100
// }
// if (-100 >= maxValue) {
// max = Math.ceil((maxValue - num * maxValue) / 100) * 100
// } else if (-10 >= maxValue && maxValue > -100) {
// max = Math.ceil((maxValue - num * maxValue) / 10) * 10
// } else if (-1 >= maxValue && maxValue > -10) {
// max = Math.ceil(maxValue - num * maxValue)
// } else if (0 > maxValue && maxValue > -1) {
// max = parseFloat((maxValue - num * maxValue).toFixed(1))
// } else if (maxValue == 0) {
// max = 0
// } else if (0 < maxValue && maxValue < 1) {
// max = parseFloat((maxValue + num * maxValue).toFixed(1))
// } else if (1 <= maxValue && maxValue < 10) {
// max = Math.ceil(maxValue + num * maxValue)
// } else if (10 <= maxValue && maxValue < 100) {
// max = Math.ceil((maxValue + num * maxValue) / 10) * 10
// } else if (100 <= maxValue) {
// max = Math.ceil((maxValue + num * maxValue) / 100) * 100
// }
// if (maxValue > 1000 || minValue < -1000) {
// max = Math.ceil(maxValue / 100) * 100
// if (minValue == 0) {
// min = 0
// } else {
// min = Math.floor(minValue / 100) * 100
// }
// } else if (maxValue < 60 && minValue > 40) {
// max = 60
// min = 40
// } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
// max = Math.ceil(maxValue / 10) * 10
// min = Math.floor(minValue / 10) * 10
// } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
// max = Math.ceil(maxValue / 10 + 1) * 10
// min = Math.floor(minValue / 10 - 1) * 10
// } else {
// max = Math.ceil(maxValue / 10) * 10
// min = Math.floor(minValue / 10) * 10
// }
// if (maxValue > 0 && maxValue < 1) {
// max = 1
// } else if (max == 0 && minValue > -1 && minValue < 0) {
// min = -1
// }
// 一正一负时各自按绝对值范围计算，不用 max - min 作为跨度
if (maxValue > 0 && minValue < 0) {
min = calculateValue(Math.abs(minValue), minValue, num, true)
max = calculateValue(Math.abs(maxValue), maxValue, num, false)
} else {
const o = maxValue - minValue === 0 ? maxValue : maxValue - minValue
min = calculateValue(o, minValue, num, true)
max = calculateValue(o, maxValue, num, false)
}
return [min, max]
}

34
src/utils/request.ts
View File

@@ -111,7 +111,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
if (
config.url == '/user-boot/user/generateSm2Key' ||
config.url == '/pqs-auth/oauth/token' ||
config.url == '/pqs-auth/oauth/lnLogin'||
config.url == '/pqs-auth/oauth/lnLogin' ||
config.url == '/pqs-auth/oauth/lnRefreshToken'
) {
config.headers.Authorization = 'Basic bmpjbjpuamNucHFz'
@@ -148,23 +148,26 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
if (!window.tokenRefreshing) {
window.tokenRefreshing = true
if(IS_LN_VERSION){
if (IS_LN_VERSION) {
//辽宁版本
return lnRefreshTokenTo().then(res => {
adminInfo.setToken(res.data.access_token, 'auth')
adminInfo.setToken(res.data.refresh_token, 'refresh')
window.requests.forEach(cb => cb(res.data.access_token))
window.requests = []
return lnRefreshTokenTo()
.then(res => {
adminInfo.setToken(res.data.access_token, 'auth')
adminInfo.setToken(res.data.refresh_token, 'refresh')
window.requests.forEach(cb => cb(res.data.access_token))
window.requests = []
return Axios(response.config)
}).catch(err => {
// refresh_token + CAS 都过期 → 重新走CAS登录
window.location.href = '/api/pqs-auth/oauth/lnCheck'
return Promise.reject(err)
}).finally(() => {
return Axios(response.config)
})
.catch(err => {
// refresh_token + CAS 都过期 → 重新走CAS登录
window.location.href = '/api/pqs-auth/oauth/lnCheck'
return Promise.reject(err)
})
.finally(() => {
window.tokenRefreshing = false
})
}else {
} else {
//通用版本
return refreshToken()
.then(res => {
@@ -185,7 +188,6 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
window.tokenRefreshing = false
})
}
} else {
return new Promise(resolve => {
// 用函数形式将 resolve 存入，等待刷新后再执行
@@ -211,7 +213,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
loginExpireTimer = null // 执行后清空定时器
}, 100) // 可根据实际情况调整延迟时间
return Promise.reject(response.data)
} else if (response.data.code == 'A0121') {
} else if (response.data.code == 'A0121') {
//统一认证过期
const casLogoutUrl =
'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn'

3
src/utils/webSocketClient.ts
View File

@@ -110,7 +110,8 @@ export default class SocketService {
}
} else {
this.callBackMapping['message']!({ Flag: false })
// ElMessage.error(event.data)
if(event.data == 'connect')return
ElMessage.error(event.data)
}
}