This commit is contained in:
@@ -27,8 +27,8 @@ const config = {
|
|||||||
// config.baseUrl = 'http://tc.cqsznc.com:7080/api';
|
// 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;
|
export default config;
|
||||||
|
@@ -32,25 +32,26 @@
|
|||||||
{{ item.pointStartTime.substring(0,16) }} - {{ item.pointEndTime.substring(0,16) }}
|
{{ item.pointStartTime.substring(0,16) }} - {{ item.pointEndTime.substring(0,16) }}
|
||||||
</view>
|
</view>
|
||||||
<!-- 添加3个子项 -->
|
<!-- 添加3个子项 -->
|
||||||
<view v-if="item.inspectionState != 0">
|
<view v-if="item.inspectionResults != 1" class="order-container">
|
||||||
<view class="status" @click="goDetail(item)">
|
<view class="status2" @click="goDetail(item)">
|
||||||
<view>完成巡检</view>
|
<view>完成巡检</view>
|
||||||
<view class="badge" :class="item.inspectionResults ==1 ? 'badge-success' : 'badge-warn'">
|
<view class="badge" :class="'badge-warn'">
|
||||||
{{ item.inspectionResults == 1 ? '正常' : '异常' }}
|
{{'异常' }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="sub-item">
|
<view v-if="getOptTime(item.mserviceWorkOrdersVo.recordVoList,0)" class="sub-item">
|
||||||
<view class="sub-dot"></view>
|
<view class="sub-dot"></view>
|
||||||
<view class="sub-text">提报时间 {{ item.inspectorName || '未知' }}</view>
|
<view class="sub-text">提报时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,0) }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="sub-item">
|
<view v-if="getOptTime(item.mserviceWorkOrdersVo.recordVoList,1)" class="sub-item">
|
||||||
<view class="sub-dot"></view>
|
<view class="sub-dot"></view>
|
||||||
<view class="sub-text">处理时间:{{ item.actualInspectionTime || '未知' }}</view>
|
<view class="sub-text">处理时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,1) }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="sub-item">
|
<view v-if="getOptTime(item.mserviceWorkOrdersVo.recordVoList,4)" class="sub-item">
|
||||||
<view class="sub-dot"></view>
|
<view class="sub-dot"></view>
|
||||||
<view class="sub-text">完成时间:{{ item.remarks || '无' }}</view>
|
<view class="sub-text">完成时间:{{ getOptTime(item.mserviceWorkOrdersVo.recordVoList,4) }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="order-id">工单号{{item.mserviceWorkOrdersVo.orderNo}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -59,7 +60,7 @@
|
|||||||
<view class="btn-outline" @click="startTask(item)">立即巡检</view>
|
<view class="btn-outline" @click="startTask(item)">立即巡检</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="status" v-else @click="goDetail(item)">
|
<view class="status" v-else v-if="item.inspectionResults == 1" @click="goDetail(item)">
|
||||||
<view>完成巡检</view>
|
<view>完成巡检</view>
|
||||||
<view class="badge" :class="item.inspectionResults ==1 ? 'badge-success' : 'badge-warn'">
|
<view class="badge" :class="item.inspectionResults ==1 ? 'badge-success' : 'badge-warn'">
|
||||||
{{ item.inspectionResults == 1 ? '正常' : '异常' }}
|
{{ item.inspectionResults == 1 ? '正常' : '异常' }}
|
||||||
@@ -138,7 +139,15 @@
|
|||||||
// uni.navigateTo({
|
// uni.navigateTo({
|
||||||
// url: `/pages/sys/workbench/inspection/inspectionDetail?item=${detailItemStr}`
|
// 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;
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -302,6 +311,21 @@
|
|||||||
margin-bottom: 40rpx;
|
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 {
|
.btn-outline {
|
||||||
border: 2rpx solid #2f6aff;
|
border: 2rpx solid #2f6aff;
|
||||||
color: #2f6aff;
|
color: #2f6aff;
|
||||||
@@ -341,4 +365,18 @@
|
|||||||
margin-top: 80rpx;
|
margin-top: 80rpx;
|
||||||
letter-spacing: 2rpx
|
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;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
Reference in New Issue
Block a user