详情页面

pages/index/index.vue

@@ -170,32 +170,28 @@
 					<view class="body">
 						<view class="line1">
 							<view class="title">
-								<span  v-if="item.type" :class="'typeN typeN'+item.type">
-									{{item.typeN}}
-								</span>
+								
 								{{item.errorCodeText}}
 
 							</view>
-							<view class="status " :class="'status'+item.status">
-								{{item.statusN}}
-
-							</view>
+							<span  v-if="item.type" :class="'typeN typeN'+item.type">
+								{{item.typeN}}
+							</span>
+							
 						</view>
 						
 						<view class="line2">
 							<view class="value">
-								{{item.createTime}}<span style="color: red;" v-if="isToday(item.createTime)">(今日)</span>
-
+								{{item.stationName}} 
+							
 							</view>
 							<view class="value">
-								{{item.parkingName}} 
+								{{item.createTime}}<span style="color: red;" v-if="isToday(item.createTime)">(今日)</span>
 
 							</view>
-						</view>
-						<view class="errorDesc" v-if="item.errorDesc">
-							描述：{{item.errorDesc}}
 							
 						</view>
+					
 
 					</view>
 					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>

pages/task/maintenanceTaks.vue

@@ -89,17 +89,14 @@
 
 
 		</view>
-		<view class="list">
+		<view class="list" v-if="errorRecord.status==0" >
 			<view class="item item-plus">
 				<view class="name">
 					<span style="color: red;">*</span> 处理人员
 
 				</view>
-				<view class="value" v-if="errorRecord.status!=0">
-					{{errorRecord.updateTime}}
-
-				</view>
-				<view class="value  " v-else>
+				
+				<view class="value  " >
 
 					<u-checkbox-group>
 						<u-checkbox v-model="item.checked" @change="memberListchange"
@@ -116,11 +113,8 @@
 					<span style="color: red;">*</span>处理时间
 
 				</view>
-				<view class="value" v-if="errorRecord.status!=0">
-					{{errorRecord.updateTime}}
-
-				</view>
-				<view class="value  " @click="completionTimeShow=true" v-else>
+				 
+				<view class="value  " @click="completionTimeShow=true" >
 					<view class="valueclock">
 						<u-icon name="clock" size="32" color="#BBBBBB"></u-icon>
 
@@ -137,11 +131,8 @@
 					<span style="color: red;">*</span>维修方式
 
 				</view>
-				<view class="value" v-if="errorRecord.status!=0">
-					{{errorRecord.updateTime}}
-
-				</view>
-				<view class="value  " v-else>
+			
+				<view class="value  " >
 
 					<u-radio-group v-model="valueradio" @change="radioGroupChange">
 						<u-radio v-for="(item, index) in listradio" :key="index" :name="item.name">
@@ -158,14 +149,11 @@
 				<view class="name">
 					<span style="color: red;">*</span>处理结果
 				</view>
-				<view class="value" v-if="errorRecord.status==0">
+				<view class="value" >
 					<textarea placeholder="请记录处理步骤及结果" placeholder-class="textareaclass" style="    height: 100px;"
 						v-model="taskInfo.desc" class="textarea"></textarea>
 				</view>
-				<view class="value" v-else>
-					<textarea style="    height: 100px;" placeholder="" placeholder-class="textareaclass"
-						v-model="errorRecord.repairDesc" class="textarea"></textarea>
-				</view>
+				
 			</view>
 			<view class="item item-plus">
 				<view class="name">
@@ -173,21 +161,57 @@
 
 
 				</view>
-				<view class="value" v-if="errorRecord.status==0">
+				<view class="value">
 					<u-upload name="photoFile" ref="uUpload" :form-data="formData" :header="header" :action="action"
 						:file-list="listPic"></u-upload>
 				</view>
-				<view class="value" v-else>
-
-					<img class="viewImg" v-for="(item,i) in repairImageList" @click="previewImage(i,'repairImageList')"
-						:key="i" :src="item" mode=""></img>
-
-				</view>
+				
 			</view>
 
 		</view>
-
-
+		<view class="listtimeline" v-else >
+			<view class="title">
+				处理结果
+			</view>
+			<u-time-line>
+					<u-time-line-item nodeTop="2">
+					
+						<template v-slot:content>
+							<view>
+								<view class="u-order-title">
+									<span class="errorReportNames">{{errorRecord.repairNames}}</span>
+									完成故障处理
+
+								</view>
+								<view class="u-order-title">
+									处理结果：{{errorRecord.repairDesc}}
+								
+								</view>
+								<view class="u-order-desc">
+									<img  class="viewImg" v-for="(item,i) in repairImageList"
+									  @click="previewImage(i,'repairImageList')"
+									 :key="i"
+									 :src="item" mode=""></img>
+								</view>
+								<view class="u-order-time" >{{errorRecord.repairTime}}</view>
+							</view>
+						</template>
+					</u-time-line-item>
+					<u-time-line-item nodeTop="2">
+					
+						<template v-slot:content>
+							<view>
+								<view class="u-order-title">设备故障</view>
+								<view class="u-order-title">故障类型：{{errorRecord.typeN}}</view>
+								
+								<view class="u-order-time">{{errorRecord.errorReportTime}}</view>
+							</view>
+						</template>
+					</u-time-line-item>
+				
+					
+				</u-time-line>	
+		</view>
 		<view class="floating-button" v-if="errorRecord.status==0">
 			<view class="button" @click="submit">
 
@@ -512,7 +536,7 @@
 	.jpmain {
 		padding-bottom: 120rpx;
 	}
-
+	
 	.list {
 		background-color: rgba(255, 255, 255, 1);
 		border-radius: 16rpx;
@@ -658,5 +682,32 @@
 	.viewImg {
 		width: 160rpx;
 		height: 160rpx;
-	}
+	}
+	
+	.listtimeline {
+		background-color: rgba(255, 255, 255, 1);
+		border-radius: 16rpx;
+	
+		margin: 20rpx;
+		padding: 32rpx 24rpx;
+		.title{
+			color: rgba(51,51,51,1);
+			font-size: 32rpx;
+			margin-bottom: 24rpx;
+		}
+		
+	}
+	::v-deep .u-dot{
+		background:#1677FF ;
+	}
+	.errorReportNames{
+		color: #1677FF ;
+	}
+	.u-order-title{
+		margin-bottom: 20rpx;
+	}
+	.u-order-time{
+		margin-bottom: 40rpx;
+	}
+	
 </style>

uni_modules/uview-ui/components/u-time-line-item/u-time-line-item.vue

@@ -26,7 +26,7 @@
 			// 节点的背景颜色
 			bgColor: {
 				type: String,
-				default: "#ffffff"
+				default: ""
 			},
 			// 节点左边图标绝对定位的top值
 			nodeTop: {
@@ -79,7 +79,7 @@
 	.u-time-axis-item:last-child::before {
 		content: "" !important;
 	
-		border-left: 0px solid #ddd;
+	//	border-left: 0px solid #ddd;
 		
 	}
 	.u-time-axis-item::before {

uni_modules/uview-ui/components/u-time-line/u-time-line.vue

@@ -25,7 +25,7 @@
 	@import "../../libs/css/style.components.scss";
 	
 	.u-time-axis {
-		padding-left: 40rpx;
+		padding-left: 20rpx;
 		position: relative;
 	}
 
@@ -36,7 +36,7 @@
 		top: 12rpx;
 		width: 1px;
 		bottom: 0;
-		border-left: 1px solid #ddd;
+		//border-left: 1px solid #ddd;
 		transform-origin: 0 0;
 		transform: scaleX(0.5);
 	}