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

Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev

Browse Source
This commit is contained in:
chenlin
2025-12-16 15:03:04 +08:00
parent ec7ef87340 f9163eba6a
commit 5f5fbe8891
6 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,

4
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>({

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')
} }
// 自动滚动功能 // 自动滚动功能

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

@@ -198,7 +198,7 @@ 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) => {

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

@@ -597,11 +597,11 @@ const handleRiskTabChange = async (tab: TabType) => {
// 同时获取维保任务和巡检任务的数据 // 同时获取维保任务和巡检任务的数据
const [maintenanceResponse, inspectionResponse] = await Promise.all([ const [maintenanceResponse, inspectionResponse] = await Promise.all([
getWorkOrderStatistics({workOrderType, taskType: '维保任务'}).catch(error => { getWorkOrderStatistics({workOrderType, taskType: '维保任务',campus_id: query.campus_id}).catch(error => {
console.error('获取维保任务数据失败:', error) console.error('获取维保任务数据失败:', error)
return { records: [] } return { records: [] }
}), }),
getWorkOrderStatistics({workOrderType, taskType: '巡检任务'}).catch(error => { getWorkOrderStatistics({workOrderType, taskType: '巡检任务',campus_id: query.campus_id}).catch(error => {
console.error('获取巡检任务数据失败:', error) console.error('获取巡检任务数据失败:', error)
return { records: [] } return { records: [] }
}) })

2
src/views/screen/report/index.ts
View File

@@ -136,7 +136,7 @@ export const batchGetTableList = (reportCodes: string, data?) => {
// 统计周期 cycle: day，month，year 对应月日年 // 统计周期 cycle: day，month，year 对应月日年
export const getWorkOrderStatistics = (data: {workOrderType: string, taskType: string, campus_id?: string}) => { export const getWorkOrderStatistics = (data: {workOrderType: string, taskType: string, campus_id?: string}) => {
return request.post({ url: '/jeelowcode/report-data/list/report_work_order_statistics', data: {...data, page: 1, paseSize: 1} }) return request.post({ url: '/jeelowcode/report-data/list/report_work_order_statistics', data: {...data, pageNo: 1, pageSize: 10} })
} }