diff --git a/common/config.js b/common/config.js index 89619a4..6137589 100644 --- a/common/config.js +++ b/common/config.js @@ -27,8 +27,8 @@ const config = { // config.baseUrl = 'http://tc.cqsznc.com:7080/api'; //正式 -config.baseUrl = 'http://183.230.235.66:11010/api'; +// config.baseUrl = 'http://183.230.235.66:11010/api'; -// config.baseUrl = 'http://799004da.r28.cpolar.top'; +config.baseUrl = 'http://70b1d4b3.r28.cpolar.top'; export default config; diff --git a/pages/sys/workbench/inspection/inspectionProcess.vue b/pages/sys/workbench/inspection/inspectionProcess.vue index 8488c2d..41ba786 100644 --- a/pages/sys/workbench/inspection/inspectionProcess.vue +++ b/pages/sys/workbench/inspection/inspectionProcess.vue @@ -30,27 +30,28 @@ {{ item.pointName }} {{ item.pointStartTime.substring(0,16) }} - {{ item.pointEndTime.substring(0,16) }} - - - - - 完成巡检 - - {{ item.inspectionResults == 1 ? '正常' : '异常' }} - - - - - 提报时间 {{ item.inspectorName || '未知' }} - - - - 处理时间:{{ item.actualInspectionTime || '未知' }} - - - - 完成时间:{{ item.remarks || '无' }} - + + + + + 完成巡检 + + {{'异常' }} + + + + + 提报时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,0) }} + + + + 处理时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,1) }} + + + + 完成时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,4) }} + + 工单号{{item.mserviceWorkOrdersVo.orderNo}} @@ -59,7 +60,7 @@ 立即巡检 - + 完成巡检 {{ item.inspectionResults == 1 ? '正常' : '异常' }} @@ -138,7 +139,15 @@ // uni.navigateTo({ // url: `/pages/sys/workbench/inspection/inspectionDetail?item=${detailItemStr}` // }); - } + }, + getOptTime(process, status) { + if (!process || !Array.isArray(process) || process.length === 0) { + return null; + } + + const record = process.find(item => item.status == status); + return record ? record.createTime : null; + }, } } @@ -300,6 +309,21 @@ border-radius: 12rpx; font-size: 26rpx; margin-bottom: 40rpx; + } + + + .status2 { + width: 280rpx; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid #BFBFBF; + margin-top: 30rpx; + color: #BFBFBF; + padding: 12rpx 24rpx; + border-radius: 12rpx; + font-size: 26rpx; + margin-bottom: 20rpx; } .btn-outline { @@ -341,4 +365,18 @@ margin-top: 80rpx; letter-spacing: 2rpx } + + /* 工单信息容器 */ + .order-container { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + } + + .order-id{ + color: #296AEF; + font-size: 24rpx; + margin-bottom: 20rpx; + } \ No newline at end of file