p95fco63j
/
Water_Machine_Management_System
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日期筛选

Browse Source
pull/101/head
ZHW 5 months ago
parent 55c85cfe3c
commit d516a9bcdb
7 changed files with 281 additions and 148 deletions
Show Stats Download Patch File Download Diff File

127
src/main/resources/web/src/views/Dashboard.vue
Unescape View File

@ -74,8 +74,10 @@
<!-- 告警列表 -->
<div v-else class="alert-list">
<div v-for="alert in recentAlerts" :key="alert.alertId" class="alert-item">
<!-- 只显示前10条告警 -->
<div v-for="(alert, index) in recentAlerts.slice(0, 10)" :key="alert.alertId" class="alert-item">
<div class="alert-text">{{ alert.deviceId }}：{{ alert.alertMessage }}</div>
<div class="alert-time">{{ formatDateTime(alert.timestamp) }}</div>
<div class="alert-meta">
<div :class="['alert-level', alert.alertLevel?.toLowerCase()]">
{{ formatAlertLevel(alert.alertLevel) }}
@ -85,23 +87,6 @@
</div>
</div>
</div>
<!-- 工单状态统计 -->
<div class="content-card">
<h3 class="card-title">工单状态统计</h3>
<div class="chart-placeholder">
<div class="placeholder-text">
<div style="font-size: 16px; margin-bottom: 8px;">待处理工单数: {{ stats.pendingWorkOrders }}</div>
<div style="font-size: 24px; margin-bottom: 12px;">柱状图</div>
<div style="color: #666; font-size: 12px;">
通过Group内data和config中继器可更改数据及配置
</div>
<div style="color: #666; font-size: 12px;">
详情访问：https://axhub.im/charts
</div>
</div>
</div>
</div>
</div>
</div>
</template>
@ -166,6 +151,12 @@ const formatAlertLevel = (level: string): string => {
return levelMap[level?.toLowerCase()] || level
}
// 格式化时间
const formatDateTime = (dateTime: string): string => {
if (!dateTime) return ''
return new Date(dateTime).toLocaleString('zh-CN')
}
// 获取统计数据
const fetchStatsData = async () => {
try {
@ -178,18 +169,51 @@ const fetchStatsData = async () => {
return
}
// 获取设备状态统计
const statusCountResult = await request<ResultVO<Record<string, number>>>(
'/api/web/device-status/status-count',
{ method: 'GET' }
)
if (statusCountResult.code === 200 && statusCountResult.data) {
const data = statusCountResult.data
stats.value.onlineDevices = data.online || 0
stats.value.offlineDevices = data.offline || 0
stats.value.alertDevices = data.fault || 0
stats.value.totalDevices = (data.online || 0) + (data.offline || 0) + (data.fault || 0)
// 尝试使用备用统计方法
try {
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = userInfo.areaId || ''
// 构建区域参数
const areaParam = areaId ? `?areaId=${areaId}` : ''
// 分别获取各状态设备数量
const [onlineResult, offlineResult, faultResult] = await Promise.allSettled([
request<ResultVO<any[]>>(`/api/web/device-status/by-status?status=online${areaParam}`, { method: 'GET' }),
request<ResultVO<any[]>>(`/api/web/device-status/by-status?status=offline${areaParam}`, { method: 'GET' }),
request<ResultVO<any[]>>(`/api/web/device-status/by-status?status=fault${areaParam}`, { method: 'GET' })
])
// 处理在线设备
if (onlineResult.status === 'fulfilled' && onlineResult.value.code === 200) {
stats.value.onlineDevices = onlineResult.value.data?.length || 0
} else {
stats.value.onlineDevices = 0
}
// 处理离线设备
if (offlineResult.status === 'fulfilled' && offlineResult.value.code === 200) {
stats.value.offlineDevices = offlineResult.value.data?.length || 0
} else {
stats.value.offlineDevices = 0
}
// 处理故障设备
if (faultResult.status === 'fulfilled' && faultResult.value.code === 200) {
stats.value.alertDevices = faultResult.value.data?.length || 0
} else {
stats.value.alertDevices = 0
}
// 计算设备总数
stats.value.totalDevices = stats.value.onlineDevices + stats.value.offlineDevices + stats.value.alertDevices
} catch (statusError) {
console.error('获取设备状态统计失败，使用默认值:', statusError)
// 设置默认值
stats.value.onlineDevices = 0
stats.value.offlineDevices = 0
stats.value.alertDevices = 0
stats.value.totalDevices = 0
}
// 获取待处理工单数
@ -200,6 +224,8 @@ const fetchStatsData = async () => {
if (workOrderResult.code === 200 && workOrderResult.data) {
stats.value.pendingWorkOrders = workOrderResult.data.length
} else {
stats.value.pendingWorkOrders = 0
}
} catch (error: any) {
@ -245,25 +271,24 @@ const fetchAlertData = async () => {
// 确保数据是数组
const alerts = Array.isArray(alertResult.data) ? alertResult.data : []
// 只取前5条
recentAlerts.value = alerts.slice(0, 5)
// 只取前10条
recentAlerts.value = alerts.slice(0, 10)
// 如果有告警，设置最新告警
if (recentAlerts.value.length > 0) {
const sortedAlerts = [...recentAlerts.value].sort((a, b) => {
const priorityMap: Record<string, number> = {
'critical': 4,
'error': 3,
'warning': 2,
'info': 1
};
return (priorityMap[b.alertLevel?.toLowerCase()] || 0) - (priorityMap[a.alertLevel?.toLowerCase()] || 0);
});
latestAlert.value = sortedAlerts[0] ?? null; // 明确处理 undefined 情况
} else {
latestAlert.value = null;
}
const sortedAlerts = [...recentAlerts.value].sort((a, b) => {
const priorityMap: Record<string, number> = {
'critical': 4,
'error': 3,
'warning': 2,
'info': 1
};
return (priorityMap[b.alertLevel?.toLowerCase()] || 0) - (priorityMap[a.alertLevel?.toLowerCase()] || 0);
});
latestAlert.value = sortedAlerts[0] ?? null;
} else {
latestAlert.value = null;
}
}
} catch (error: any) {
console.error('获取告警数据失败:', error)
@ -517,10 +542,16 @@ onMounted(() => {
.alert-text {
font-size: 14px;
color: #333;
margin-bottom: 8px;
margin-bottom: 4px;
line-height: 1.4;
}
.alert-time {
font-size: 12px;
color: #666;
margin: 4px 0;
}
.alert-meta {
display: flex;
justify-content: space-between;
@ -589,4 +620,4 @@ onMounted(() => {
gap: 8px;
}
}
</style>
</style>

4
src/main/resources/web/src/views/equipment/WaterMaker.vue
Unescape View File

@ -30,8 +30,8 @@
@change="handleSearch"
>
<option value="">全部片区</option>
<option value="市区">市区</option>
<option value="校区">校区</option>
<option value="A">A</option>
<option value="B">B</option>
</select>
<!-- 状态筛选 -->

53
src/main/resources/web/src/views/workorder/Completed.vue
Unescape View File

@ -167,18 +167,43 @@ const loadCompletedOrders = async () => {
console.log('当前 Token:', token.substring(0, 20) + '...')
// 构建查询参数
let url = '/api/work-orders/by-status?status=completed'
// 判断是否启用时间筛选
let url = ''
const params = new URLSearchParams()
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
if (filterForm.value.createDate) {
// 使用 by-time-range 接口进行时间筛选
url = '/api/work-orders/by-time-range'
// 设置起止时间为一天的开始和结束
const startDate = new Date(filterForm.value.createDate)
const endDate = new Date(startDate)
endDate.setDate(endDate.getDate() + 1)
params.append('startTime', startDate.toISOString())
params.append('endTime', endDate.toISOString())
params.append('status', 'completed') // 添加状态筛选
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
} else {
// 默认使用 by-status 接口
url = '/api/work-orders/by-status'
params.append('status', 'completed')
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
}
// 只有当有参数时才添加问号
const queryString = params.toString()
if (queryString) {
url += `&${queryString}`
url += `?${queryString}`
}
// 使用项目封装的 request 工具
@ -243,7 +268,7 @@ const formatStatus = (status: OrderStatus): string => {
return statusMap[status] || status
}
// 筛选后的工单列表
// 筛选后的工单列表 - 移除前端日期筛选逻辑
const filteredOrders = computed(() => {
return orders.value.filter(order => {
// 工单号/设备ID搜索匹配
@ -254,11 +279,12 @@ const filteredOrders = computed(() => {
// 片区筛选
const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
// 日期筛选（匹配日期部分，忽略时间）
const dateMatch = filterForm.value.createDate === '' ||
order.createTime.split(' ')[0] === filterForm.value.createDate
// 移除日期筛选逻辑，因为已在后端处理
// const dateMatch = filterForm.value.createDate === '' ||
// order.createTime.split(' ')[0] === filterForm.value.createDate
return keywordMatch && areaMatch && dateMatch
// 返回时不包含 dateMatch
return keywordMatch && areaMatch
})
})
@ -308,6 +334,7 @@ onMounted(() => {
})
</script>
<style scoped>
/* 样式与前几个页面完全一致，仅修改页面容器类名 */
.order-completed-page {

86
src/main/resources/web/src/views/workorder/Pending.vue
Unescape View File

@ -230,45 +230,58 @@ const formatStatus = (status: OrderStatus): string => {
const loadAvailableOrders = async () => {
loading.value = true
try {
// 从 Pinia 获取 Token（与 Admin.vue 一致）
const token = authStore.token
// 检查 Token 是否存在，不存在则跳转登录
if (!token) {
console.warn('未获取到 Token，跳转到登录页')
router.push('/login')
return
}
console.log('当前 Token:', token.substring(0, 20) + '...') // 只显示部分，避免安全风险
// 构建查询参数
let url = '/api/work-orders/available'
let url = ''
const params = new URLSearchParams()
// 获取用户信息中的 areaId
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
// 判断是否启用时间筛选
if (filterForm.value.createDate) {
// 使用 by-time-range 接口进行更精确的时间筛选
url = '/api/work-orders/by-time-range'
// 设置起止时间为一天的开始和结束
const startDate = new Date(filterForm.value.createDate)
const endDate = new Date(startDate)
endDate.setDate(endDate.getDate() + 1)
params.append('startTime', startDate.toISOString())
params.append('endTime', endDate.toISOString())
if (areaId) {
params.append('areaId', areaId)
}
} else {
// 默认使用 available 接口
url = '/api/work-orders/available'
if (areaId) {
params.append('areaId', areaId)
}
}
// 只有当有参数时才添加问号
const queryString = params.toString()
if (queryString) {
url += `?${queryString}`
}
// 使用项目封装的 request 工具（而非直接使用 axios）
// 在 loadAvailableOrders 函数中，显式传递认证头部
const response = await request<{
code: number
msg: string
data: any[]
}>(url,{
method: 'GET',
})
code: number
msg: string
data: any[]
}>(url, {
method: 'GET',
})
// 处理响应（完善错误处理）
if (response.code === 200) {
orders.value = (response.data || []).map((order: any) => ({
id: order.orderId || '',
@ -291,29 +304,18 @@ const loadAvailableOrders = async () => {
}
} catch (error: any) {
console.error('请求异常:', error)
console.error('错误详情:', {
message: error.message,
status: error.status,
response: error.response
})
const errorMsg = error.message.includes('401') || error.message.includes('403')
? '权限不足或登录已过期，请重新登录'
: error.message.includes('Network')
? '网络连接失败，请检查网络'
: error.message || '获取数据失败，请稍后重试'
alert(`获取待抢单工单失败：${errorMsg}`)
/*if (error.message.includes('401') || error.message.includes('403')) {
authStore.logout()
router.push('/login')
}*/
}
finally {
const errorMsg = error.message.includes('401') || error.message.includes('403')
? '权限不足或登录已过期，请重新登录'
: error.message.includes('Network')
? '网络连接失败，请检查网络'
: error.message || '获取数据失败，请稍后重试'
alert(`获取待抢单工单失败：${errorMsg}`)
} finally {
loading.value = false
}
}
// 筛选后的工单列表
const filteredOrders = computed(() => {
return orders.value.filter(order => {
@ -326,10 +328,10 @@ const filteredOrders = computed(() => {
const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
// 日期筛选（匹配日期部分，忽略时间）
const dateMatch = filterForm.value.createDate === '' ||
order.createTime.split(' ')[0] === filterForm.value.createDate
// const dateMatch = filterForm.value.createDate === '' ||
// order.createTime.split(' ')[0] === filterForm.value.createDate
return keywordMatch && areaMatch && dateMatch
return keywordMatch && areaMatch
})
})

46
src/main/resources/web/src/views/workorder/Processing.vue
Unescape View File

@ -228,6 +228,7 @@ const formatStatus = (status: OrderStatus): string => {
}
// 加载处理中工单列表
// 修改 loadProcessingOrders 方法中的时间筛选逻辑
const loadProcessingOrders = async () => {
loading.value = true
try {
@ -238,22 +239,40 @@ const loadProcessingOrders = async () => {
return
}
// 构建查询参数
// 判断是否启用时间筛选
let url = ''
const params = new URLSearchParams()
params.append('status', 'processing')
if (filterForm.value.area) {
params.append('areaId', filterForm.value.area)
}
if (filterForm.value.createDate) {
params.append('startDate', filterForm.value.createDate)
// 使用 by-time-range 接口进行时间筛选
url = '/api/work-orders/by-time-range'
// 设置起止时间为一天的开始和结束
const startDate = new Date(filterForm.value.createDate)
const endDate = new Date(startDate)
endDate.setDate(endDate.getDate() + 1)
params.append('startTime', startDate.toISOString())
params.append('endTime', endDate.toISOString())
params.append('status', 'processing') // 添加状态筛选
if (filterForm.value.area) {
params.append('areaId', filterForm.value.area)
}
} else {
// 默认使用 by-status 接口
url = '/api/work-orders/by-status'
params.append('status', 'processing')
if (filterForm.value.area) {
params.append('areaId', filterForm.value.area)
}
}
const queryString = params.toString()
// 修改后
const url = `/api/work-orders/by-status?status=processing${queryString ? `&${queryString}` : ''}`
if (queryString) {
url += `?${queryString}`
}
// 调用后端接口获取处理中工单
const response = await request<{
@ -292,6 +311,7 @@ const loadProcessingOrders = async () => {
}
}
// 筛选后的工单列表
const filteredOrders = computed(() => {
return orders.value.filter(order => {
@ -304,10 +324,10 @@ const filteredOrders = computed(() => {
const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
// 日期筛选（匹配日期部分，忽略时间）
const dateMatch = filterForm.value.createDate === '' ||
order.createTime.split(' ')[0] === filterForm.value.createDate
//const dateMatch = filterForm.value.createDate === '' ||
// order.createTime.split(' ')[0] === filterForm.value.createDate
return keywordMatch && areaMatch && dateMatch
return keywordMatch && areaMatch
})
})

57
src/main/resources/web/src/views/workorder/Review.vue
Unescape View File

@ -154,6 +154,7 @@ const filterForm = ref({
})
// 加载待审核工单数据
// 加载待审核工单数据 - 修改此函数以支持时间筛选
const loadReviewOrders = async () => {
loading.value = true
try {
@ -167,18 +168,43 @@ const loadReviewOrders = async () => {
console.log('当前 Token:', token.substring(0, 20) + '...')
// 构建查询参数
let url = '/api/work-orders/by-status?status=reviewing'
// 判断是否启用时间筛选
let url = ''
const params = new URLSearchParams()
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
if (filterForm.value.createDate) {
// 使用 by-time-range 接口进行时间筛选
url = '/api/work-orders/by-time-range'
// 设置起止时间为一天的开始和结束
const startDate = new Date(filterForm.value.createDate)
const endDate = new Date(startDate)
endDate.setDate(endDate.getDate() + 1)
params.append('startTime', startDate.toISOString())
params.append('endTime', endDate.toISOString())
params.append('status', 'reviewing') // 添加状态筛选
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
} else {
// 默认使用 by-status 接口
url = '/api/work-orders/by-status'
params.append('status', 'reviewing')
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
}
// 只有当有参数时才添加问号
const queryString = params.toString()
if (queryString) {
url += `&${queryString}`
url += `?${queryString}`
}
// 使用项目封装的 request 工具
@ -243,22 +269,23 @@ const formatStatus = (status: OrderStatus): string => {
return statusMap[status] || status
}
// 筛选后的工单列表
// 筛选后的工单列表 - 移除前端日期筛选逻辑
const filteredOrders = computed(() => {
return orders.value.filter(order => {
// 工单号/设备ID搜索匹配
const keywordMatch = searchKeyword.value.trim() === '' ||
order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
// 片区筛选
const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
// 日期筛选（匹配日期部分，忽略时间）
const dateMatch = filterForm.value.createDate === '' ||
order.createTime.split(' ')[0] === filterForm.value.createDate
// 移除日期筛选逻辑，因为已在后端处理
// const dateMatch = filterForm.value.createDate === '' ||
// order.createTime.split(' ')[0] === filterForm.value.createDate
return keywordMatch && areaMatch && dateMatch
// 返回时不包含 dateMatch
return keywordMatch && areaMatch
})
})

56
src/main/resources/web/src/views/workorder/Timeout.vue
Unescape View File

@ -253,7 +253,7 @@ const selectedStaffId = ref('')
const assignRemark = ref('')
const allStaff = ref<MaintenanceStaff[]>([])
// 加载超时工单数据
// 加载超时工单数据 - 修改此函数以支持时间筛选
const loadTimeoutOrders = async () => {
loading.value = true
try {
@ -267,18 +267,43 @@ const loadTimeoutOrders = async () => {
console.log('当前 Token:', token.substring(0, 20) + '...')
// 构建查询参数
let url = '/api/work-orders/by-status?status=timeout'
// 判断是否启用时间筛选
let url = ''
const params = new URLSearchParams()
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
if (filterForm.value.createDate) {
// 使用 by-time-range 接口进行时间筛选
url = '/api/work-orders/by-time-range'
// 设置起止时间为一天的开始和结束
const startDate = new Date(filterForm.value.createDate)
const endDate = new Date(startDate)
endDate.setDate(endDate.getDate() + 1)
params.append('startTime', startDate.toISOString())
params.append('endTime', endDate.toISOString())
params.append('status', 'timeout') // 添加状态筛选
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
} else {
// 默认使用 by-status 接口
url = '/api/work-orders/by-status'
params.append('status', 'timeout')
const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
const areaId = filterForm.value.area || userInfo.areaId || ''
if (areaId) {
params.append('areaId', areaId)
}
}
// 只有当有参数时才添加问号
const queryString = params.toString()
if (queryString) {
url += `&${queryString}`
url += `?${queryString}`
}
// 使用项目封装的 request 工具
@ -387,17 +412,18 @@ const filteredOrders = computed(() => {
return orders.value.filter(order => {
// 工单号/设备ID搜索匹配
const keywordMatch = searchKeyword.value.trim() === '' ||
order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
order.orderNo.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
order.deviceId.toLowerCase().includes(searchKeyword.value.toLowerCase())
// 片区筛选
const areaMatch = filterForm.value.area === '' || order.area === filterForm.value.area
// 日期筛选（匹配日期部分，忽略时间）
const dateMatch = filterForm.value.createDate === '' ||
order.createTime.split(' ')[0] === filterForm.value.createDate
// 移除日期筛选逻辑，因为已在后端处理
// const dateMatch = filterForm.value.createDate === '' ||
// order.createTime.split(' ')[0] === filterForm.value.createDate
return keywordMatch && areaMatch && dateMatch
// 返回时不包含 dateMatch
return keywordMatch && areaMatch
})
})

Write Preview
Loading…
Cancel
Save