diff --git a/urbanLifelineWeb/packages/workcase/src/assets/css/common.scss b/urbanLifelineWeb/packages/workcase/src/assets/css/common.scss index 4d0034e4..6c2752e0 100644 --- a/urbanLifelineWeb/packages/workcase/src/assets/css/common.scss +++ b/urbanLifelineWeb/packages/workcase/src/assets/css/common.scss @@ -1,5 +1,10 @@ // 全局EL分页组件样式 +// ==================== 品牌色变量 ==================== +$brand-color: #0055AA; +$brand-color-light: #EBF5FF; +$brand-color-hover: #004488; + .content-header { display: flex; align-items: center; @@ -190,11 +195,32 @@ align-items: center; gap: 10px; } - +// 分页样式 .table-pagination { - margin-top: 12px; + padding: 16px 20px; display: flex; justify-content: flex-end; + border-top: 1px solid #f1f5f9; + background: #fff; +} + +// 全局分页样式(不需要 :deep,因为这是全局样式) +.el-pagination { + .el-pager { + li { + border-radius: 6px; + + &.is-active { + background: $brand-color; + color: #fff; + } + } + } + + .btn-prev, + .btn-next { + border-radius: 6px; + } } .file-name-cell { diff --git a/urbanLifelineWeb/packages/workcase/src/views/admin/log/workcaseLog/WorkcaseLogView.vue b/urbanLifelineWeb/packages/workcase/src/views/admin/log/workcaseLog/WorkcaseLogView.vue index 3b3977e2..61b6a6f2 100644 --- a/urbanLifelineWeb/packages/workcase/src/views/admin/log/workcaseLog/WorkcaseLogView.vue +++ b/urbanLifelineWeb/packages/workcase/src/views/admin/log/workcaseLog/WorkcaseLogView.vue @@ -1,5 +1,5 @@ - + @@ -11,46 +11,48 @@ - + - - - - - - + + - - - - - - + + 搜索 - - + + - {{ row.logId }} + {{ row.processId }} - - + + - - {{ row.operationName }} + + {{ getActionLabel(row.action) }} - - - - + + + + {{ row.processor || '-' }} + + + + + {{ row.files.length }}个 + - + + + + 详情 @@ -59,99 +61,154 @@ - + - - - - {{ selectedLog.logId }} - - - {{ selectedLog.ticketNo }} - - - {{ selectedLog.operationName }} - - - {{ selectedLog.operator }} - - - {{ selectedLog.content }} - - - {{ selectedLog.operationTime }} - - - {{ selectedLog.ipAddress }} - - + + + {{ selectedLog.processId }} + {{ selectedLog.workcaseId }} + + {{ getActionLabel(selectedLog.action) }} + + {{ selectedLog.message || '-' }} + {{ selectedLog.processor || '-' }} + {{ selectedLog.creator }} + {{ selectedLog.createTime }} + + + + {{ file }} + + + + \ No newline at end of file + +.file-list { + display: flex; + flex-wrap: wrap; +} + diff --git a/urbanLifelineWeb/packages/workcase/src/views/admin/workcase/WorkcaseView.scss b/urbanLifelineWeb/packages/workcase/src/views/admin/workcase/WorkcaseView.scss index 7ab2a540..15880fcc 100644 --- a/urbanLifelineWeb/packages/workcase/src/views/admin/workcase/WorkcaseView.scss +++ b/urbanLifelineWeb/packages/workcase/src/views/admin/workcase/WorkcaseView.scss @@ -247,32 +247,6 @@ $brand-color-hover: #004488; } } -// 分页样式 -.table-pagination { - padding: 16px 20px; - display: flex; - justify-content: flex-end; - border-top: 1px solid #f1f5f9; - background: #fff; -} - -:deep(.el-pagination) { - .el-pager { - li { - border-radius: 6px; - - &.is-active { - background: $brand-color; - color: #fff; - } - } - } - - .btn-prev, - .btn-next { - border-radius: 6px; - } -} // 弹窗样式 :deep(.el-dialog) { diff --git a/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue b/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue index df920823..fa2be217 100644 --- a/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue +++ b/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue @@ -157,6 +157,7 @@ const roomId = ref('') const workcaseId = ref('') const roomName = ref('聊天室') const guestId = ref('') // 聊天室访客ID +const deviceCode = ref('') // 聊天室设备代码 const commentLevel = ref(0) // 已有评分 const inputText = ref('') const scrollTop = ref(0) @@ -312,6 +313,7 @@ async function refreshChatRoomInfo() { roomName.value = roomRes.data.roomName || '聊天室' workcaseId.value = roomRes.data.workcaseId || '' guestId.value = roomRes.data.guestId || '' + deviceCode.value = roomRes.data.deviceCode || '' commentLevel.value = roomRes.data.commentLevel || 0 messageTotal.value = roomRes.data.messageCount || 0 } @@ -345,6 +347,7 @@ async function loadChatRoom() { roomName.value = roomRes.data.roomName || '聊天室' workcaseId.value = roomRes.data.workcaseId || '' guestId.value = roomRes.data.guestId || '' + deviceCode.value = roomRes.data.deviceCode || '' messageTotal.value = roomRes.data.messageCount || 0 commentLevel.value = roomRes.data.commentLevel! } @@ -587,8 +590,8 @@ function handleWorkcaseAction() { } }) } else { - // 跳转到创建工单页面 - const url = `/pages/workcase/workcaseDetail/workcaseDetail?mode=create&roomId=${roomId.value}` + // 跳转到创建工单页面,携带 deviceCode + const url = `/pages/workcase/workcaseDetail/workcaseDetail?mode=create&roomId=${roomId.value}&deviceCode=${encodeURIComponent(deviceCode.value || '')}` console.log('[handleWorkcaseAction] 创建工单,跳转URL:', url) uni.navigateTo({ url: url, diff --git a/urbanLifelineWeb/packages/workcase_wechat/pages/workcase/workcaseDetail/workcaseDetail.uvue b/urbanLifelineWeb/packages/workcase_wechat/pages/workcase/workcaseDetail/workcaseDetail.uvue index 4d1ff83a..f606d3d2 100644 --- a/urbanLifelineWeb/packages/workcase_wechat/pages/workcase/workcaseDetail/workcaseDetail.uvue +++ b/urbanLifelineWeb/packages/workcase_wechat/pages/workcase/workcaseDetail/workcaseDetail.uvue @@ -95,14 +95,14 @@ - 设备铭牌 + 设备铭牌* {{ workcase.deviceNamePlate || '-' }} - 铭牌照片* + 铭牌照片 @@ -457,6 +457,7 @@ onLoad((options: any) => { mode.value = 'create' // create 模式必须从上一页带入 roomId(前端先建 room 的策略) const roomId = options.roomId || '' + const deviceCodeParam = decodeURIComponent(options.deviceCode || '') if (!roomId) { uni.showToast({ title: '缺少roomId,无法创建工单', icon: 'none' }) // 直接退出,避免后续提交失败 @@ -485,6 +486,8 @@ onLoad((options: any) => { phone, userId, roomId, + deviceCode: deviceCodeParam, + deviceNamePlate: deviceCodeParam, device: '', type: '', address: '', @@ -1102,8 +1105,8 @@ async function submitWorkcase() { uni.showToast({ title: '请输入故障描述', icon: 'none' }) return } - if (!workcase.deviceNamePlateImg) { - uni.showToast({ title: '请上传设备铭牌照片', icon: 'none' }) + if (!workcase.deviceNamePlate) { + uni.showToast({ title: '请输入设备铭牌', icon: 'none' }) return } if (!workcase.imgs || workcase.imgs.length === 0) {