isoftstone/lc_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: isoftstone:87953743e2d561b982743bcf8987dde644c4a60f
Branches Tags
isoftstone:main isoftstone:dev isoftstone:dev-dataScreen
..
compare: isoftstone:dev
Branches Tags
isoftstone:dev isoftstone:dev-dataScreen isoftstone:main

9 Commits
87953743e2 ... dev

Author SHA1 Message Date
yang chen
b106385d57 fix(config): 调整接口请求超时时间 
- 将请求超时时间从300000毫秒调整为24小时
- 确保长时间运行的请求不会因超时被中断
 2025-12-16 16:36:20 +08:00
chenlin
3159553a66 hidden_danger_process_progress 2025-12-16 16:09:37 +08:00
chenlin
3a04af1e27 tootip被遮挡 2025-12-16 15:31:13 +08:00
chenlin
76de449c24 饼图优化 2025-12-16 15:28:55 +08:00
chenlin
4301d64450 地区饼图处理 2025-12-16 15:08:05 +08:00
chenlin
5f5fbe8891 Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev 2025-12-16 15:03:04 +08:00
chenlin
ec7ef87340 饼图bug修复 2025-12-16 15:03:01 +08:00
juncaiq
f9163eba6a Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev 
# Conflicts:
#	src/views/screen/report/index.ts
 2025-12-16 14:19:36 +08:00
yang chen
3b265a5a5a refactor(axios): 优化 Axios 配置与响应处理逻辑 
- 统一导入语句格式，去除多余空格
- 优化对象解构赋值写法
- 修复授权头设置中的语法问题
- 完善 QS 参数序列化配置
- 增加对 504 状态码的处理
- 优化错误消息提示逻辑与界面展示
- 调整更多错误详情查看按钮样式
- 更新网络错误与超时提示文本
- 修复登出处理中的国际化调用
- 清理缓存并重置路由逻辑调整
- 调整错误弹窗最大宽度样式
- 导出 service 实例供外部使用
 2025-12-16 12:46:23 +08:00
7 changed files with 384 additions and 217 deletions
Expand all files Collapse all files

2
src/config/axios/config.ts
View File

@@ -16,7 +16,7 @@ const config: {
/** /**
* 接口请求超时时间 * 接口请求超时时间
*/ */
request_timeout: 300000, request_timeout: 24 * 60 * 60 * 1000,
/** /**
* 默认接口请求类型 * 默认接口请求类型

2
src/config/axios/service.ts
View File

@@ -159,6 +159,8 @@ service.interceptors.response.use(
} else if (code === 500) { } else if (code === 500) {
ElMessage.error(t('sys.api.errMsg500')) ElMessage.error(t('sys.api.errMsg500'))
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code === 504) {
return Promise.reject(new Error(msg))
} else if (code === 901) { } else if (code === 901) {
ElMessage.error({ ElMessage.error({
offset: 300, offset: 300,

155
src/views/screen/companyScreen.vue
View File

@@ -291,10 +291,10 @@ const inProgressCount = ref<number>(0)
const finishedCount = ref<number>(0) const finishedCount = ref<number>(0)
const handleSeverityCountClick = () => { const handleSeverityCountClick = () => {
window.open('http://10.0.64.20/configcenter/console/device-manage', '_blank') window.open('http://10.0.64.20/pms/workorder-list', '_blank')
} }
const handleGeneralCountClick = () => { const handleGeneralCountClick = () => {
window.open('http://10.0.64.20/configcenter/console/device-manage', '_blank') window.open('http://10.0.64.20/pms/workorder-list', '_blank')
} }
const riskStatistics = ref<any>({ const riskStatistics = ref<any>({
@@ -980,12 +980,17 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理数据 // 获取隐患排查治理数据
getTableList('risk_status_count', query).then(res => { getTableList('risk_status_count', query).then(res => {
if (res.records && res.records.length > 0) { if (res.records && res.records.length > 0) {
_data.overdue = _data.overdue + Number(res.records[0].overdueCnt) // 接口返回的已经是百分比，直接使用
_data.processed = _data.processed + Number(res.records[0].processedCnt) const record = res.records[0]
_data.processing = _data.processing + Number(res.records[0].processingCnt) _data.overdue = Number(record.overdueCnt) || 0
_data.pending = _data.pending _data.processed = Number(record.processedCnt) || 0
_data.processing = Number(record.processingCnt) || 0
_data.pending = 0 // 接口没有返回pending，设为0
_data.flag = true _data.flag = true
console.log('risk_status_count 接口返回数据:', record)
console.log('处理后的 _data:', _data)
if (_data2.flag) { if (_data2.flag) {
// 合并数据 // 合并数据
console.log("请求系统和第三方成功，合并数据", _data, _data2); console.log("请求系统和第三方成功，合并数据", _data, _data2);
@@ -994,18 +999,31 @@ const handleHiddenDangerPannelData = (query) => {
mockData.hiddenDangerData.generalCount = generalCnt mockData.hiddenDangerData.generalCount = generalCnt
mockData.hiddenDangerData.severityCount = majorCnt mockData.hiddenDangerData.severityCount = majorCnt
// 如果第三方数据也是百分比，需要合并；否则使用系统数据
// 这里假设系统数据是百分比，第三方数据可能是数量或百分比
let overdueCnt, processedCnt, processingCnt, pendingCnt
if (_data2.overdue > 1 || _data2.processed > 1 || _data2.processing > 1) {
// 第三方数据可能是百分比，直接使用系统数据（因为系统数据更准确）
overdueCnt = _data.overdue.toFixed(2)
processedCnt = _data.processed.toFixed(2)
processingCnt = _data.processing.toFixed(2)
pendingCnt = _data.pending.toFixed(2)
} else {
// 第三方数据可能是数量，需要计算百分比
let totalCnt = generalCnt + majorCnt let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) overdueCnt = totalCnt > 0 ? ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) : '0.00'
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) processedCnt = totalCnt > 0 ? ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) : '0.00'
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00'
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00'
}
progressOption.series[0].data = [ progressOption.series[0].data = [
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } }, { value: Number(overdueCnt) || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } }, { value: Number(processedCnt) || 0, name: '已处理', itemStyle: { color: '#10b981' } },
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } }, { value: Number(pendingCnt) || 0, name: '待排查', itemStyle: { color: '#eab308' } },
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } } { value: Number(processingCnt) || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
] ]
console.log('合并后的图表数据:', progressOption.series[0].data)
if (progressChart.value != null) { if (progressChart.value != null) {
progressChart.value.setOption(progressOption) progressChart.value.setOption(progressOption)
} }
@@ -1014,17 +1032,14 @@ const handleHiddenDangerPannelData = (query) => {
mockData.hiddenDangerData.generalCount = _data.general mockData.hiddenDangerData.generalCount = _data.general
mockData.hiddenDangerData.severityCount = _data.major mockData.hiddenDangerData.severityCount = _data.major
let totalCnt = _data.general + _data.major // 接口返回的已经是百分比，直接使用
let overdueCnt = (_data.overdue / totalCnt * 100).toFixed(2)
let processedCnt = (_data.processed / totalCnt * 100).toFixed(2)
let processingCnt = (_data.processing / totalCnt * 100).toFixed(2)
let pendingCnt = (_data.pending / totalCnt * 100).toFixed(2)
progressOption.series[0].data = [ progressOption.series[0].data = [
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } }, { value: _data.overdue || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } }, { value: _data.processed || 0, name: '已处理', itemStyle: { color: '#10b981' } },
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } }, { value: _data.pending || 0, name: '待排查', itemStyle: { color: '#eab308' } },
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } } { value: _data.processing || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
] ]
console.log('系统数据图表数据:', progressOption.series[0].data)
if (progressChart.value != null) { if (progressChart.value != null) {
progressChart.value.setOption(progressOption) progressChart.value.setOption(progressOption)
} }
@@ -1044,56 +1059,56 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理处理进度数据 // 获取隐患排查治理处理进度数据
getTableList('hidden_danger_process_progress', query).then(res => { getTableList('hidden_danger_process_progress', query).then(res => {
if (res.records && res.records.length > 0) { // if (res.records && res.records.length > 0) {
_data2.flag = true // _data2.flag = true
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major) // _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major) // _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major) // _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major) // _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
if (_data.flag) { // if (_data.flag) {
console.log("请求第三方和系统成功，合并数据", _data, _data2); // console.log("请求第三方和系统成功，合并数据", _data, _data2);
// 合并数据 // // 合并数据
let generalCnt = _data.general + _data2.general // let generalCnt = _data.general + _data2.general
let majorCnt = _data.major + _data2.major // let majorCnt = _data.major + _data2.major
mockData.hiddenDangerData.generalCount = generalCnt // mockData.hiddenDangerData.generalCount = generalCnt
mockData.hiddenDangerData.severityCount = majorCnt // mockData.hiddenDangerData.severityCount = majorCnt
let totalCnt = generalCnt + majorCnt // let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) // let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2)
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) // let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2)
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) // let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2)
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) // let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2)
progressOption.series[0].data = [ // progressOption.series[0].data = [
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } }, // { value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } }, // { value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } }, // { value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } } // { value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
] // ]
if (progressChart.value != null) { // if (progressChart.value != null) {
progressChart.value.setOption(progressOption) // progressChart.value.setOption(progressOption)
} // }
} else { // } else {
//显示三方数据 // //显示三方数据
console.log("请求第三方成功，展示数据", _data, _data2); // console.log("请求第三方成功，展示数据", _data, _data2);
mockData.hiddenDangerData.generalCount = _data2.general // mockData.hiddenDangerData.generalCount = _data2.general
mockData.hiddenDangerData.severityCount = _data2.major // mockData.hiddenDangerData.severityCount = _data2.major
let overdueCnt = res.records[0].overdue // let overdueCnt = res.records[0].overdue
let processedCnt = res.records[0].processed // let processedCnt = res.records[0].processed
let processingCnt = res.records[0].processing // let processingCnt = res.records[0].processing
let pendingCnt = res.records[0].pending // let pendingCnt = res.records[0].pending
progressOption.series[0].data = [ // progressOption.series[0].data = [
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } }, // { value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } }, // { value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } }, // { value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } } // { value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
] // ]
if (progressChart.value != null) { // if (progressChart.value != null) {
progressChart.value.setOption(progressOption) // progressChart.value.setOption(progressOption)
} // }
} // }
} // }
}).catch(error => { }).catch(error => {
console.error('获取隐患排查治理处理进度数据失败:', error) console.error('获取隐患排查治理处理进度数据失败:', error)
}) })

2
src/views/screen/components/AlertList.vue
View File

@@ -73,7 +73,7 @@ let scrollTimer: NodeJS.Timeout | null = null
let isScrolling = false let isScrolling = false
const handleItemClick = (item: AlertItem) => { const handleItemClick = (item: AlertItem) => {
window.open(`http://10.0.64.20/configcenter/console/device-manage`, '_blank') window.open(`http://10.0.64.20/pms/workorder-list`, '_blank')
} }
// 自动滚动功能 // 自动滚动功能

116
src/views/screen/components/HiddenDangerPanel.vue
View File

@@ -96,6 +96,12 @@ const props = defineProps<Props>()
// 图表引用 // 图表引用
const progressChartOption = ref<any>({ const progressChartOption = ref<any>({
backgroundColor: 'transparent',
tooltip: {
show: true,
trigger: 'item',
formatter: '{a} <br/>{b}: {c}% ({d}%)'
},
series: [ series: [
{ {
type: 'pie' as const, type: 'pie' as const,
@@ -106,6 +112,7 @@ const progressChartOption = ref<any>({
bottom: 0, bottom: 0,
data: [], data: [],
label: { label: {
show: true,
alignTo: 'edge' as const, alignTo: 'edge' as const,
formatter: '{time|{c} %}\n', formatter: '{time|{c} %}\n',
minMargin: 5, minMargin: 5,
@@ -119,6 +126,7 @@ const progressChartOption = ref<any>({
} }
}, },
labelLine: { labelLine: {
show: true,
length: 5, length: 5,
length2: 0, length2: 0,
maxSurfaceAngle: 10 maxSurfaceAngle: 10
@@ -190,12 +198,19 @@ const top3TypesChartOption = ref<any>({
}) })
const handleMajorClick = () => { const handleMajorClick = () => {
window.open('http://10.0.64.20/configcenter/console/device-manage', '_blank') window.open('http://10.0.64.20/pms/workorder-list', '_blank')
} }
watch(() => props.hiddenDangerData?.progress, (newVal) => { watch(() => props.hiddenDangerData?.progress, (newVal, oldVal) => {
console.log('HiddenDangerPanel watch 触发，progress 数据:', newVal, '旧数据:', oldVal)
// 确保每次数据变化都更新图表
if (newVal) {
refreshProcessCharts(newVal) refreshProcessCharts(newVal)
}, { deep: true }) } else {
// 即使数据为空，也要显示空图表
refreshProcessCharts(null)
}
}, { deep: true, immediate: true })
// 辅助函数：安全地将值转换为数字，处理 NaN 和字符串 "NaN" 的情况 // 辅助函数：安全地将值转换为数字，处理 NaN 和字符串 "NaN" 的情况
const safeNumber = (val: any): number => { const safeNumber = (val: any): number => {
@@ -208,19 +223,90 @@ const safeNumber = (val: any): number => {
// 更新图表数据 // 更新图表数据
const refreshProcessCharts = (process): void => { const refreshProcessCharts = (process): void => {
if (!props.hiddenDangerData?.progress) { if (!process) {
console.warn('process is undefined or null') console.warn('process is undefined or null')
return // 即使没有数据，也要显示空图表，确保图表容器始终存在
}
const option = { ...progressChartOption.value } const option = { ...progressChartOption.value }
// 确保所有 value 都是有效的数字，将字符串 "NaN" 或真正的 NaN 转换为 0
option.series[0].data = [ option.series[0].data = [
{ value: safeNumber(process.overdue), name: '已逾期', itemStyle: { color: '#ef4444' } }, { value: 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: safeNumber(process.processed), name: '已处理', itemStyle: { color: '#10b981' } }, { value: 0, name: '已处理', itemStyle: { color: '#10b981' } },
// { value: safeNumber(process.pending), name: '待排查', itemStyle: { color: '#eab308' } }, { value: 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
{ value: safeNumber(process.processing), name: '处理中', itemStyle: { color: '#3b82f6' } }
] ]
progressChartOption.value = option progressChartOption.value = option
return
}
const overdue = safeNumber(process.overdue)
const processed = safeNumber(process.processed)
const processing = safeNumber(process.processing)
console.log('refreshProcessCharts 数据:', { overdue, processed, processing })
// 创建新的配置对象，确保 Vue 能检测到变化
const option = {
backgroundColor: 'transparent',
tooltip: {
show: true,
trigger: 'item',
formatter: '{a} <br/>{b}: {c}% ({d}%)'
},
series: [
{
type: 'pie' as const,
radius: '55%',
center: ['50%', '50%'],
left: 0,
top: 0,
bottom: 0,
data: [
{ value: overdue, name: '已逾期', itemStyle: { color: '#ef4444' } },
{ value: processed, name: '已处理', itemStyle: { color: '#10b981' } },
{ value: processing, name: '处理中', itemStyle: { color: '#3b82f6' } }
],
label: {
show: true,
alignTo: 'edge' as const,
formatter: '{time|{c} %}\n',
minMargin: 5,
edgeDistance: 10,
lineHeight: 15,
rich: {
time: {
fontSize: 10,
color: '#fff'
}
}
},
labelLine: {
show: true,
length: 5,
length2: 0,
maxSurfaceAngle: 10
},
labelLayout: function (params: any) {
const isLeft = params.labelRect.x < (params.labelRect.width ? params.labelRect.width : 200) / 2;
const points = params.labelLinePoints;
// 添加安全检查
if (points && points.length >= 3 && points[2]) {
points[2][0] = isLeft
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
}
return {
labelLinePoints: points
};
},
}
]
}
console.log('更新后的图表数据:', option.series[0].data)
// 更新图表配置
progressChartOption.value = option
// 更新 key 以强制重新渲染（可选，通常不需要）
// chartKey.value = Date.now()
} }
@@ -250,7 +336,11 @@ const refreshTop3TypesCharts = (top3Types): void => {
} }
onMounted(() => { onMounted(() => {
// 组件挂载时，如果已有数据，立即更新图表
if (props.hiddenDangerData?.progress) {
console.log('onMounted: 初始化图表数据', props.hiddenDangerData.progress)
refreshProcessCharts(props.hiddenDangerData.progress)
}
}) })
</script> </script>
@@ -417,7 +507,7 @@ p:before{content:'?'; color:yellow; font-weight: bold;}
display: flex; display: flex;
width: 77%; width: 77%;
height: 77%; height: 77%;
overflow: hidden; // overflow: hidden;
border-radius: 50%; border-radius: 50%;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;

121
src/views/screen/mainScreen.vue
View File

@@ -431,12 +431,17 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理数据 // 获取隐患排查治理数据
getTableList('risk_status_count', query).then(res => { getTableList('risk_status_count', query).then(res => {
if (res.records && res.records.length > 0) { if (res.records && res.records.length > 0) {
_data.overdue = _data.overdue + Number(res.records[0].overdueCnt) // 接口返回的已经是百分比，直接使用
_data.processed = _data.processed + Number(res.records[0].processedCnt) const record = res.records[0]
_data.processing = _data.processing + Number(res.records[0].processingCnt) _data.overdue = Number(record.overdueCnt) || 0
_data.pending = _data.pending _data.processed = Number(record.processedCnt) || 0
_data.processing = Number(record.processingCnt) || 0
_data.pending = 0 // 接口没有返回pending，设为0
_data.flag = true _data.flag = true
console.log('risk_status_count 接口返回数据:', record)
console.log('处理后的 _data:', _data)
if (_data2.flag) { if (_data2.flag) {
// 合并数据 // 合并数据
console.log("请求系统和第三方成功，合并数据", _data, _data2); console.log("请求系统和第三方成功，合并数据", _data, _data2);
@@ -445,30 +450,44 @@ const handleHiddenDangerPannelData = (query) => {
dashboardData.value.hiddenDangerData.general = generalCnt dashboardData.value.hiddenDangerData.general = generalCnt
dashboardData.value.hiddenDangerData.major = majorCnt dashboardData.value.hiddenDangerData.major = majorCnt
// 如果第三方数据也是百分比，需要合并；否则使用系统数据
// 这里假设系统数据是百分比，第三方数据可能是数量或百分比
let overdueCnt, processedCnt, processingCnt, pendingCnt
if (_data2.overdue > 1 || _data2.processed > 1 || _data2.processing > 1) {
// 第三方数据可能是百分比，直接使用系统数据（因为系统数据更准确）
overdueCnt = _data.overdue.toFixed(2)
processedCnt = _data.processed.toFixed(2)
processingCnt = _data.processing.toFixed(2)
pendingCnt = _data.pending.toFixed(2)
} else {
// 第三方数据可能是数量，需要计算百分比
let totalCnt = generalCnt + majorCnt let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) overdueCnt = totalCnt > 0 ? ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) : '0.00'
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) processedCnt = totalCnt > 0 ? ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) : '0.00'
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00'
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00'
}
dashboardData.value.hiddenDangerData.progress = { dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt, overdue: overdueCnt,
processed: processedCnt, processed: processedCnt,
processing: processingCnt, processing: processingCnt,
pending: pendingCnt, pending: pendingCnt,
} }
console.log('合并后的 progress:', dashboardData.value.hiddenDangerData.progress)
} else { } else {
console.log("请求系统成功，展示数据", _data, _data2); console.log("请求系统成功，展示数据", _data, _data2);
dashboardData.value.hiddenDangerData.general = _data.general dashboardData.value.hiddenDangerData.general = _data.general
dashboardData.value.hiddenDangerData.major = _data.major dashboardData.value.hiddenDangerData.major = _data.major
let totalCnt = _data.general + _data.major // 接口返回的已经是百分比，直接使用
// 显示系统数据
dashboardData.value.hiddenDangerData.progress = { dashboardData.value.hiddenDangerData.progress = {
overdue: (_data.overdue / totalCnt * 100).toFixed(2), overdue: _data.overdue.toFixed(2),
processed: (_data.processed / totalCnt * 100).toFixed(2), processed: _data.processed.toFixed(2),
processing: (_data.processing / totalCnt * 100).toFixed(2), processing: _data.processing.toFixed(2),
pending: (_data.pending / totalCnt * 100).toFixed(2), pending: _data.pending.toFixed(2),
} }
console.log('系统数据 progress:', dashboardData.value.hiddenDangerData.progress)
} }
} }
}) })
@@ -495,46 +514,46 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理处理进度数据 // 获取隐患排查治理处理进度数据
getTableList('hidden_danger_process_progress', query).then(res => { getTableList('hidden_danger_process_progress', query).then(res => {
if (res.records && res.records.length > 0) { // if (res.records && res.records.length > 0) {
_data2.flag = true // _data2.flag = true
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major) // _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major) // _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major) // _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major) // _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
if (_data.flag) { // if (_data.flag) {
console.log("请求第三方和系统成功，合并数据", _data, _data2); // console.log("请求第三方和系统成功，合并数据", _data, _data2);
// 合并数据 // // 合并数据
let generalCnt = _data.general + _data2.general // let generalCnt = _data.general + _data2.general
let majorCnt = _data.major + _data2.major // let majorCnt = _data.major + _data2.major
dashboardData.value.hiddenDangerData.general = generalCnt // dashboardData.value.hiddenDangerData.general = generalCnt
dashboardData.value.hiddenDangerData.major = majorCnt // dashboardData.value.hiddenDangerData.major = majorCnt
let totalCnt = generalCnt + majorCnt // let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) // let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2)
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) // let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2)
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) // let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2)
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) // let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2)
dashboardData.value.hiddenDangerData.progress = { // dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt, // overdue: overdueCnt,
processed: processedCnt, // processed: processedCnt,
processing: processingCnt, // processing: processingCnt,
pending: pendingCnt, // pending: pendingCnt,
} // }
} else { // } else {
//显示三方数据 // //显示三方数据
console.log("请求第三方成功，展示数据", _data, _data2); // console.log("请求第三方成功，展示数据", _data, _data2);
dashboardData.value.hiddenDangerData.general = _data2.general // dashboardData.value.hiddenDangerData.general = _data2.general
dashboardData.value.hiddenDangerData.major = _data2.major // dashboardData.value.hiddenDangerData.major = _data2.major
dashboardData.value.hiddenDangerData.progress = { // dashboardData.value.hiddenDangerData.progress = {
overdue: res.records[0].overdue, // overdue: res.records[0].overdue,
processed: res.records[0].processed, // processed: res.records[0].processed,
processing: res.records[0].processing, // processing: res.records[0].processing,
pending: res.records[0].pending, // pending: res.records[0].pending,
} // }
} // }
} // }
}).catch(error => { }).catch(error => {
console.error('获取隐患排查治理处理进度数据失败:', error) console.error('获取隐患排查治理处理进度数据失败:', error)
}) })

149
src/views/screen/regionScreen.vue
View File

@@ -95,7 +95,10 @@ const visitorCount = ref<number>(0)
// 总体概览-各园区统计 // 总体概览-各园区统计
const parkStatistics = ref<any>() const parkStatistics = ref<any>()
// 危险作业/安全考核/安全、保密培训 // 危险作业/安全考核/安全、保密培训
const riskStatistics = ref<any>() const riskStatistics = ref<Record<TabType, any[]>>({
安全类: [],
工程类: []
})
const dangerDetail = ref<any>() const dangerDetail = ref<any>()
// 动画相关的状态 // 动画相关的状态
const isAnimating = ref<boolean>(false) const isAnimating = ref<boolean>(false)
@@ -437,12 +440,17 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理数据 // 获取隐患排查治理数据
getTableList('risk_status_count', query).then(res => { getTableList('risk_status_count', query).then(res => {
if (res.records && res.records.length > 0) { if (res.records && res.records.length > 0) {
_data.overdue = _data.overdue + Number(res.records[0].overdueCnt) // 接口返回的已经是百分比，直接使用
_data.processed = _data.processed + Number(res.records[0].processedCnt) const record = res.records[0]
_data.processing = _data.processing + Number(res.records[0].processingCnt) _data.overdue = Number(record.overdueCnt) || 0
_data.pending = _data.pending _data.processed = Number(record.processedCnt) || 0
_data.processing = Number(record.processingCnt) || 0
_data.pending = 0 // 接口没有返回pending，设为0
_data.flag = true _data.flag = true
console.log('risk_status_count 接口返回数据:', record)
console.log('处理后的 _data:', _data)
if (_data2.flag) { if (_data2.flag) {
// 合并数据 // 合并数据
console.log("请求系统和第三方成功，合并数据", _data, _data2); console.log("请求系统和第三方成功，合并数据", _data, _data2);
@@ -451,30 +459,44 @@ const handleHiddenDangerPannelData = (query) => {
dashboardData.value.hiddenDangerData.general = generalCnt dashboardData.value.hiddenDangerData.general = generalCnt
dashboardData.value.hiddenDangerData.major = majorCnt dashboardData.value.hiddenDangerData.major = majorCnt
// 如果第三方数据也是百分比，需要合并；否则使用系统数据
// 这里假设系统数据是百分比，第三方数据可能是数量或百分比
let overdueCnt, processedCnt, processingCnt, pendingCnt
if (_data2.overdue > 1 || _data2.processed > 1 || _data2.processing > 1) {
// 第三方数据可能是百分比，直接使用系统数据（因为系统数据更准确）
overdueCnt = _data.overdue.toFixed(2)
processedCnt = _data.processed.toFixed(2)
processingCnt = _data.processing.toFixed(2)
pendingCnt = _data.pending.toFixed(2)
} else {
// 第三方数据可能是数量，需要计算百分比
let totalCnt = generalCnt + majorCnt let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) overdueCnt = totalCnt > 0 ? ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) : '0.00'
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) processedCnt = totalCnt > 0 ? ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) : '0.00'
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00'
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00'
}
dashboardData.value.hiddenDangerData.progress = { dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt, overdue: overdueCnt,
processed: processedCnt, processed: processedCnt,
processing: processingCnt, processing: processingCnt,
pending: pendingCnt, pending: pendingCnt,
} }
console.log('合并后的 progress:', dashboardData.value.hiddenDangerData.progress)
} else { } else {
console.log("请求系统成功，展示数据", _data, _data2); console.log("请求系统成功，展示数据", _data, _data2);
dashboardData.value.hiddenDangerData.general = _data.general dashboardData.value.hiddenDangerData.general = _data.general
dashboardData.value.hiddenDangerData.major = _data.major dashboardData.value.hiddenDangerData.major = _data.major
let totalCnt = _data.general + _data.major // 接口返回的已经是百分比，直接使用
// 显示系统数据
dashboardData.value.hiddenDangerData.progress = { dashboardData.value.hiddenDangerData.progress = {
overdue: (_data.overdue / totalCnt * 100).toFixed(2), overdue: _data.overdue.toFixed(2),
processed: (_data.processed / totalCnt * 100).toFixed(2), processed: _data.processed.toFixed(2),
processing: (_data.processing / totalCnt * 100).toFixed(2), processing: _data.processing.toFixed(2),
pending: (_data.pending / totalCnt * 100).toFixed(2), pending: _data.pending.toFixed(2),
} }
console.log('系统数据 progress:', dashboardData.value.hiddenDangerData.progress)
} }
} }
}) })
@@ -501,46 +523,46 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理处理进度数据 // 获取隐患排查治理处理进度数据
getTableList('hidden_danger_process_progress', query).then(res => { getTableList('hidden_danger_process_progress', query).then(res => {
if (res.records && res.records.length > 0) { // if (res.records && res.records.length > 0) {
_data2.flag = true // _data2.flag = true
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major) // _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major) // _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major) // _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major) // _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
if (_data.flag) { // if (_data.flag) {
console.log("请求第三方和系统成功，合并数据", _data, _data2); // console.log("请求第三方和系统成功，合并数据", _data, _data2);
// 合并数据 // // 合并数据
let generalCnt = _data.general + _data2.general // let generalCnt = _data.general + _data2.general
let majorCnt = _data.major + _data2.major // let majorCnt = _data.major + _data2.major
dashboardData.value.hiddenDangerData.general = generalCnt // dashboardData.value.hiddenDangerData.general = generalCnt
dashboardData.value.hiddenDangerData.major = majorCnt // dashboardData.value.hiddenDangerData.major = majorCnt
let totalCnt = generalCnt + majorCnt // let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) // let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2)
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) // let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2)
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) // let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2)
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) // let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2)
dashboardData.value.hiddenDangerData.progress = { // dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt, // overdue: overdueCnt,
processed: processedCnt, // processed: processedCnt,
processing: processingCnt, // processing: processingCnt,
pending: pendingCnt, // pending: pendingCnt,
} // }
} else { // } else {
//显示三方数据 // //显示三方数据
console.log("请求第三方成功，展示数据", _data, _data2); // console.log("请求第三方成功，展示数据", _data, _data2);
dashboardData.value.hiddenDangerData.general = _data2.general // dashboardData.value.hiddenDangerData.general = _data2.general
dashboardData.value.hiddenDangerData.major = _data2.major // dashboardData.value.hiddenDangerData.major = _data2.major
dashboardData.value.hiddenDangerData.progress = { // dashboardData.value.hiddenDangerData.progress = {
overdue: res.records[0].overdue, // overdue: res.records[0].overdue,
processed: res.records[0].processed, // processed: res.records[0].processed,
processing: res.records[0].processing, // processing: res.records[0].processing,
pending: res.records[0].pending, // pending: res.records[0].pending,
} // }
} // }
} // }
}).catch(error => { }).catch(error => {
console.error('获取隐患排查治理处理进度数据失败:', error) console.error('获取隐患排查治理处理进度数据失败:', error)
}) })
@@ -595,6 +617,24 @@ const handleRiskTabChange = async (tab: TabType) => {
}) })
]) ])
// 处理接口返回的数据结构：可能是数组或对象
const getRecords = (response: any): any[] => {
if (Array.isArray(response)) {
return response
} else if (response && Array.isArray(response.records)) {
return response.records
} else if (response && response.data && Array.isArray(response.data)) {
return response.data
}
return []
}
const maintenanceRecords = getRecords(maintenanceResponse)
const inspectionRecords = getRecords(inspectionResponse)
console.log('维保任务数据:', maintenanceResponse, '提取的records:', maintenanceRecords)
console.log('巡检任务数据:', inspectionResponse, '提取的records:', inspectionRecords)
// 周期映射 // 周期映射
const cycleMap: Record<string, string> = { const cycleMap: Record<string, string> = {
'day': '每日', 'day': '每日',
@@ -637,8 +677,8 @@ const handleRiskTabChange = async (tab: TabType) => {
} }
// 转换维保和巡检数据 // 转换维保和巡检数据
const maintenanceCharts = convertToChartData(maintenanceResponse.records || [], '维保类') const maintenanceCharts = convertToChartData(maintenanceRecords, '维保类')
const inspectionCharts = convertToChartData(inspectionResponse.records || [], '巡检类') const inspectionCharts = convertToChartData(inspectionRecords, '巡检类')
// 合并为6个图表：先维保（3个），后巡检（3个） // 合并为6个图表：先维保（3个），后巡检（3个）
const allCharts = [...maintenanceCharts, ...inspectionCharts] const allCharts = [...maintenanceCharts, ...inspectionCharts]
@@ -647,6 +687,7 @@ const handleRiskTabChange = async (tab: TabType) => {
riskStatistics.value[tab] = allCharts riskStatistics.value[tab] = allCharts
console.log('更新后的riskStatistics:', riskStatistics.value) console.log('更新后的riskStatistics:', riskStatistics.value)
console.log('当前tab的图表数据:', allCharts)
} catch (error) { } catch (error) {
console.error('获取风险统计数据失败:', error) console.error('获取风险统计数据失败:', error)
} }