detail1

pages.json

@@ -455,7 +455,7 @@
             "path" : "pages/processDetailEle/processDetailEle",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "电力监测(已处理未处理)",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -464,7 +464,7 @@
             "path" : "pages/processDetailVideo/processDetailVideo",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "视频告警（已处理未处理）",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -479,6 +479,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/processDetailVideo1/processDetailVideo1",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/index/index.vue

@@ -194,18 +194,18 @@
 		onLoad: function(option) {
 		
 			
-			// if (option.op) {
-			// 	// alert('op')
-			// 	// alert(option.op)
-			// 	// 首页数据渲染
-			// 	this.getData();
+			if (option.op) {
+				// alert('op')
+				// alert(option.op)
+				// 首页数据渲染
+				this.getData();
 			
-			// } else {
-			// 	this.init()
-			// }
+			} else {
+				this.init()
+			}
 			
 			
-			this.getData();
+			// this.getData();
 
 			this.hackReset = false;
 			this.$nextTick(() => {

pages/processDetailVideo/processDetailVideo.vue

@@ -6,7 +6,7 @@
 			<button class="cu-btn radius bg-green sm" v-if="handling_status==0">未处理</button>
 		</view>
 
-		<view >
+		<view>
 			<!-- 基本信息start -->
 			<view class="basic-info">
 				<view class="info-tit margin-left-xs">
@@ -18,9 +18,9 @@
 						<text>设备名称：</text>
 						<text>{{detailMessage2.deviceName}}</text>
 					</view>
-					
+
 					<view>
-						<text>设备地址：</text> 
+						<text>设备地址：</text>
 						<text>{{detailMessage2.deviceAddress}}</text>
 					</view>
 					<view>
@@ -67,8 +67,8 @@
 				</view>
 			</view>
 			<!-- 处理状态end -->
-			
-			
+
+
 			<!-- 处理状态start -->
 			<view class="processStatus" v-else>
 				<view class="info-tit margin-left-xs">
@@ -78,11 +78,12 @@
 				<view class="padding-lr padding-bottom-lg">
 					<form action="">
 						<view class="cu-form-group">
-							<textarea class="JTxtArea lg" placeholder="备注信息,最多可输入50个字..." :maxlength="50" :data-maxnum="reason.length+'/50'"
-							 auto-height v-model="msg2"></textarea>
+							<textarea class="JTxtArea lg" placeholder="备注信息,最多可输入50个字..." :maxlength="50"
+								:data-maxnum="reason.length+'/50'" auto-height v-model="msg2"></textarea>
 						</view>
 						<view class="btn-area">
-							<button class="bg-orange round missReport margin-top" @click="videoMissSubmit()">误 报 </button>
+							<button class="bg-orange round missReport margin-top" @click="videoMissSubmit()">误 报
+							</button>
 							<button class="bg-blue round  missReport margin-top " @click="videoSubmit()">告警确认 </button>
 						</view>
 					</form>
@@ -90,7 +91,7 @@
 			</view>
 			<!-- 处理状态end -->
 		</view>
-		
+
 	</view>
 </template>
 
@@ -104,47 +105,51 @@
 				radio: 'B',
 				modalName: null,
 				type: '0',
-				detailMessage2:{},
-				
-				handling_status:0
+				detailMessage2: {},
+
+				handling_status: 0
 			}
 		},
 		onLoad: function(option) {
-			this.handling_status=option.handling_status;
+			
 			this.type = option.type;
 			this.companyCode = option.companyCode;
-			this.processingStatus=option.handling_status;
 			this.alarmId = option.id;
-		if (option.handling_status!=0) {
-			uni.setNavigationBarTitle({
-				title: '已处理'
-			});
-		} else {
-			uni.setNavigationBarTitle({
-				title: '未处理'
-			});
-		}
-			this.getVideoDetail({"companyCode":option.companyCode,"processingStatus":option.processingStatus,"alarmId":option.id})
 			
+			this.getVideoDetail({
+				"companyCode": option.companyCode,
+				"alarmId": option.id
+			})
+
 		},
 		methods: {
-			
-			async getVideoDetail(ming={}) {
-				const res= await this.$myRequest({
-					url:'IntegratedAlarm/getVideoAlarmDetails',
-					data:ming
+
+			async getVideoDetail(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/getVideoAlarmDetails',
+					data: ming
 				})
-				  console.log(res.data.data[0]);
-				  this.detailMessage2=res.data.data[0]
+				console.log(res.data.data[0]);
+				this.detailMessage2 = res.data.data[0];
+				this.handling_status = this.detailMessage2.handling_status;
+				if (this.handling_status != 0) {
+					uni.setNavigationBarTitle({
+						title: '已处理'
+					});
+				} else {
+					uni.setNavigationBarTitle({
+						title: '未处理'
+					});
+				}
 			},
-			
+
 			videoSubmit() {
-				if(!this.msg2){
+				if (!this.msg2) {
 					uni.showToast({
 						title: "请输入处理内容",
-						icon:"none"
+						icon: "none"
 					});
-				}else{
+				} else {
 					this.powerSubmitRes({
 						"alarmStatus": 0,
 						"type": 2,
@@ -153,18 +158,18 @@
 						"id": this.detailMessage2.id,
 						"handlerContent": this.msg2
 					})
-					
+
 				}
-			
-				
+
+
 			},
 			videoMissSubmit() {
-				if(!this.msg2){
+				if (!this.msg2) {
 					uni.showToast({
 						title: "请输入处理内容",
-						icon:"none"
+						icon: "none"
 					});
-				}else{
+				} else {
 					this.powerSubmitRes({
 						"alarmStatus": 1,
 						"type": 2,
@@ -174,18 +179,18 @@
 						"handlerContent": this.msg2
 					})
 				}
-				
-				
+
+
 			},
-			
-			
+
+
 			powerSubmit() {
-				if(!this.msg){
+				if (!this.msg) {
 					uni.showToast({
 						title: "请输入处理内容",
-						icon:"none"
+						icon: "none"
 					});
-				}else{
+				} else {
 					this.powerSubmitRes({
 						"type": 1,
 						"deviceCode": this.detailMessage.deviceCode,
@@ -195,34 +200,35 @@
 					})
 				}
 			},
-			
+
 			async powerSubmitRes(params = {}) {
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/setAlarmHandle',
 					data: params
 				})
-				
-			   if(res.data.flag){
-				  uni.showToast({
-				  	title: "提交成功",
-				  });
-			   }
-			   
-			   setTimeout(() => {
-			   	uni.navigateTo({
-			   		url: '/pages/processList/processList?companyCode=' + this.companyCode + '&type='+this.type+'',
-			   
-			   	});
-			   }, 1000);
+
+				if (res.data.flag) {
+					uni.showToast({
+						title: "提交成功",
+					});
+				}
+
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/processList/processList?companyCode=' + this.companyCode +
+							'&type=' + this.type + '',
+
+					});
+				}, 1000);
 			},
-			
-			
+
+
 			submit() {
 				uni.makePhoneCall({
-					phoneNumber: this.detailMessage.phone 
+					phoneNumber: this.detailMessage.phone
 				});
 			},
-			
+
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},
@@ -242,10 +248,12 @@
 		height: 88rpx;
 		background: #EFF4FF;
 		line-height: 88rpx;
+
 		.time {
 			color: #333
 		}
 	}
+
 	.info-tit {
 		color: #4074E7;
 		line-height: 90rpx;
@@ -264,32 +272,32 @@
 		width: 160rpx;
 		display: inline-block
 	}
-	
+
 	/* // 处理内容 */
 	.cu-form-group {
 		background: #f5f5f5;
-	
+
 	}
-	
+
 	.processStatus {
 		textarea {
 			background: #F5F5F5;
 			color: #999999;
 		}
 	}
-	
+
 	// textarea
 	.JTxtArea {
 		position: relative;
-	
+
 		&.sm {
 			min-height: 60rpx;
 		}
-	
+
 		&.lg {
 			min-height: 100rpx;
 		}
-	
+
 		&:after {
 			content: attr(data-maxnum);
 			position: absolute;

pages/processDetailVideo1/processDetailVideo1.vue

@@ -0,0 +1,312 @@
+<template>
+	<view class="dealDetail">
+		<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time">{{detailMessage2.time}}</view>
+			<button class="cu-btn radius bg-green sm" v-if="handling_status==1">已处理</button>
+			<button class="cu-btn radius bg-green sm" v-if="handling_status==0">未处理</button>
+		</view>
+
+		<view>
+			<!-- 基本信息start -->
+			<view class="basic-info">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					基本信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>设备名称：</text>
+						<text>{{detailMessage2.deviceName}}</text>
+					</view>
+
+					<view>
+						<text>设备地址：</text>
+						<text>{{detailMessage2.deviceAddress}}</text>
+					</view>
+					<view>
+						<text>告警信息：</text>
+						<text>{{detailMessage2.alarmInformation}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 基本信息end -->
+			<!-- 报警当前情况截图start -->
+			<view class="basic-info">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					报警当前情况截图
+				</view>
+				<view class="info-content padding-lr-lg">
+					<image :src="detailMessage2.alarmPicture" style="width:100%"></image>
+				</view>
+			</view>
+			<!-- 报警当前情况截图end -->
+			<!-- 处理信息start -->
+			<view class="processStatus" v-if="handling_status==1">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>是否误报：</text>
+						<text>{{detailMessage2.alarmStatus?'误报':'非误报'}}</text>
+					</view>
+					<view>
+						<text>处理人：</text>
+						<text>{{detailMessage2.handler}}</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>{{detailMessage2.handlerTime}}</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>{{detailMessage2.handlerContent}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+
+
+			<!-- 处理状态start -->
+			<view class="processStatus" v-else>
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理内容
+				</view>
+				<view class="padding-lr padding-bottom-lg">
+					<form action="">
+						<view class="cu-form-group">
+							<textarea class="JTxtArea lg" placeholder="备注信息,最多可输入50个字..." :maxlength="50"
+								:data-maxnum="reason.length+'/50'" auto-height v-model="msg2"></textarea>
+						</view>
+						<view class="btn-area">
+							<button class="bg-orange round missReport margin-top" @click="videoMissSubmit()">误 报
+							</button>
+							<button class="bg-blue round  missReport margin-top " @click="videoSubmit()">告警确认 </button>
+						</view>
+					</form>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				msg2: '',
+				reason: '',
+				radio: 'A',
+				radio: 'B',
+				modalName: null,
+				type: '0',
+				detailMessage2: {},
+
+				handling_status: 0
+			}
+		},
+		onLoad: function(option) {
+			
+			this.type = option.type;
+			this.companyCode = option.companyCode;
+			this.alarmId = option.id;
+			
+			this.getVideoDetail({
+				"companyCode": option.companyCode,
+				"alarmId": option.id
+			})
+
+		},
+		mounted(){
+					document.querySelector('.uni-page-head-hd').style.display = 'none'
+				},
+
+		methods: {
+
+			async getVideoDetail(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/getVideoAlarmDetails',
+					data: ming
+				})
+				console.log(res.data.data[0]);
+				this.detailMessage2 = res.data.data[0];
+				this.handling_status = this.detailMessage2.handling_status;
+				if (this.handling_status != 0) {
+					uni.setNavigationBarTitle({
+						title: '已处理'
+					});
+				} else {
+					uni.setNavigationBarTitle({
+						title: '未处理'
+					});
+				}
+			},
+
+			videoSubmit() {
+				if (!this.msg2) {
+					uni.showToast({
+						title: "请输入处理内容",
+						icon: "none"
+					});
+				} else {
+					this.powerSubmitRes({
+						"alarmStatus": 0,
+						"type": 2,
+						"deviceCode": this.detailMessage2.deviceCode,
+						"companyCode": this.companyCode,
+						"id": this.detailMessage2.id,
+						"handlerContent": this.msg2
+					})
+
+				}
+
+
+			},
+			videoMissSubmit() {
+				if (!this.msg2) {
+					uni.showToast({
+						title: "请输入处理内容",
+						icon: "none"
+					});
+				} else {
+					this.powerSubmitRes({
+						"alarmStatus": 1,
+						"type": 2,
+						"deviceCode": this.detailMessage2.deviceCode,
+						"companyCode": this.companyCode,
+						"id": this.detailMessage2.id,
+						"handlerContent": this.msg2
+					})
+				}
+
+
+			},
+
+
+			powerSubmit() {
+				if (!this.msg) {
+					uni.showToast({
+						title: "请输入处理内容",
+						icon: "none"
+					});
+				} else {
+					this.powerSubmitRes({
+						"type": 1,
+						"deviceCode": this.detailMessage.deviceCode,
+						"companyCode": this.companyCode,
+						"id": this.detailMessage.id,
+						"handlerContent": this.msg
+					})
+				}
+			},
+
+			async powerSubmitRes(params = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/setAlarmHandle',
+					data: params
+				})
+
+				if (res.data.flag) {
+					uni.showToast({
+						title: "提交成功",
+					});
+				}
+
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/processList/processList?companyCode=' + this.companyCode +
+							'&type=' + this.type + '',
+
+					});
+				}, 1000);
+			},
+
+
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: this.detailMessage.phone
+				});
+			},
+
+			RadioChange(e) {
+				this.radio = e.detail.value
+			},
+			textareaAInput(e) {
+				this.textareaAValue = e.detail.value
+			},
+			// textarea
+			inputReason(e) {
+				this.reason = e.detail.value;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.timeBox {
+		height: 88rpx;
+		background: #EFF4FF;
+		line-height: 88rpx;
+
+		.time {
+			color: #333
+		}
+	}
+
+	.info-tit {
+		color: #4074E7;
+		line-height: 90rpx;
+		height: 90rpx;
+	}
+
+	// 基本信息
+	.info-content>view {
+		margin-left: 24rpx;
+		border-bottom: 1px solid #EDEDED;
+		line-height: 92rpx;
+		color: #666;
+	}
+
+	.info-content view text:first-child {
+		width: 160rpx;
+		display: inline-block
+	}
+
+	/* // 处理内容 */
+	.cu-form-group {
+		background: #f5f5f5;
+
+	}
+
+	.processStatus {
+		textarea {
+			background: #F5F5F5;
+			color: #999999;
+		}
+	}
+
+	// textarea
+	.JTxtArea {
+		position: relative;
+
+		&.sm {
+			min-height: 60rpx;
+		}
+
+		&.lg {
+			min-height: 100rpx;
+		}
+
+		&:after {
+			content: attr(data-maxnum);
+			position: absolute;
+			right: 10rpx;
+			bottom: 0px;
+		}
+	}
+</style>

pages/processList/processList.vue

@@ -331,7 +331,7 @@
 						goVideoUnprocessDetail(item) {
 				uni.navigateTo({
 					url: '/pages/processDetailVideo/processDetailVideo?companyCode=' + this.companyCode +
-						'&handling_status=0&id=' + item.id +
+						'&id=' + item.id +
 						'&type=2',
 				});
 			},
@@ -340,7 +340,7 @@
 			goVideoProcessedDetail(item) {
 				uni.navigateTo({
 					url: '/pages/processDetailVideo/processDetailVideo?companyCode=' + this.companyCode +
-						'&handling_status=1&id=' + item.id +
+						'&id=' + item.id +
 						'&type=2',
 				});
 			},