完成待测试

pages.json

@@ -451,6 +451,34 @@
             }
             
         }
+        ,{
+            "path" : "pages/processDetailEle/processDetailEle",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "电力监测(已处理未处理)",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/processDetailVideo/processDetailVideo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "视频告警（已处理未处理）",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+      
+        ,{
+            "path" : "pages/processDetailEle1/processDetailEle1",
+            "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(() => {
@@ -217,7 +217,7 @@
 
 			
 			async init() {
-				window.location.href =  this.$BASE_URL+"Home/Com/getPageAuthorization1"
+				window.location.href =  this.$BASE_URL+"Com/getPageAuthorization1"
 			},
 			// end
 

pages/processDetailEle/processDetailEle.vue

@@ -0,0 +1,363 @@
+<template>
+	<view class="dealDetail">
+		<view class="timeBox flex justify-between align-top padding-sm " style="height:auto;">
+			<view >
+				<view>发生时间：{{detailMessage.time}}</view>
+				<view  v-if="handling_status!=0">告警历时：{{detailMessage.duration}}</view>
+				<view  v-if="handling_status!=0">关联告警：{{detailMessage.handlerTime}}</view>
+				<view  v-if="handling_status!=0" style="color:#4074E7">
+					【{{detailMessage.route_name}}】设备低压-{{detailMessage.digitalValue=='1'?'动作':'复归'}}</view>
+			</view>
+			<button v-if="handling_status==0" class="cu-btn radius bg-red sm margin-top-sm">未处理</button>
+			<button v-if="handling_status==1" class="cu-btn radius bg-green sm margin-top-sm">已处理</button>
+			<button v-if="handling_status==2" class="cu-btn radius bg-orange sm margin-top-sm">待确认</button>
+			<button v-if="handling_status==3" class="cu-btn radius bg-blue sm margin-top-sm">自动恢复</button>
+			<button v-if="handling_status==4" class="cu-btn radius bg-gray sm margin-top-sm">过期失效</button>
+			
+			
+			
+		</view>
+
+
+		<view>
+			<!-- 基本信息start -->
+			<view class="basic-info dealDetail">
+				<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>{{detailMessage.siteName}}</text>
+					</view>
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>{{detailMessage.platform_area_name}}</text>
+					</view>
+					<view>
+						<text>线路名称：</text>
+						<text>{{detailMessage.deviceName}}</text>
+					</view>
+					<view>
+						<text>警告信息：</text>
+						<text>{{detailMessage.measValue}}</text>
+					</view>
+					<view>
+						<text>警告状态：</text>
+						<text>{{detailMessage.digitalValue=='1'?'动作':'复归'}}</text>
+					</view>
+					<view>
+						<text>采集终端：</text>
+						<text>{{detailMessage.deviceCode}}</text>
+					</view>
+					<view>
+						<text>站点地址：</text>
+						<text>{{detailMessage.address}}<i class="icon iconfont map"
+								@click="mapLocation()">&#xe612;</i></text>
+					</view>
+					<view>
+						<text>联系人：</text>
+						<text>{{detailMessage.userName}}</text>
+					</view>
+					<view>
+						<text>联系方式：</text>
+						<text>{{detailMessage.phone}}<i class="phone icon iconfont"
+								@click="submit()">&#xe61d;</i></text>
+					</view>
+					<view>
+						<text>运行数据：</text>
+						<text class="checkMore" @tap="goOpeDataDetail(detailMessage)">点击查看</text>
+					</view>
+					<view>
+						<text>视频：</text>
+						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
+					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
+					</view>
+				</view>
+			</view>
+			<!-- 基本信息end -->
+			
+			
+			<!-- 处理信息start -->
+			<view class="processStatus" v-if="handling_status!=0">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理信息
+				</view>
+				<view class="info-content">
+
+					<view>
+						<text>处理人：</text>
+						<text>{{detailMessage.handler}}</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>{{detailMessage.handlerTime}}</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>{{detailMessage.handlerContent}}</text>
+					</view>
+
+				</view>
+
+
+			</view>
+			<!-- 处理状态end -->
+
+			<!-- 处理状态start -->
+			<view class="processStatus" v-if="this.handling_status==2||this.handling_status==0">
+				<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" v-model="msg" placeholder="备注信息,最多可输入50个字..." :maxlength="50"
+								:data-maxnum="reason.length+'/50'" auto-height></textarea>
+						</view>
+
+						<view class="btn-area">
+							<button class="bg-blue round  missReport margin-top" @click="powerSubmit()">告警确认 </button>
+						</view>
+					</form>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+	</view>
+
+
+	</view>
+</template>
+
+<script>
+	//引入js sdk的封装
+	import * as jwx from '../../util/jssdk.js'
+
+	export default {
+		data() {
+			return {
+				msg: '',
+				reason: '',
+				radio: 'A',
+				radio: 'B',
+				modalName: null,
+				type: '0',
+				detailMessage: {},
+				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.getUnProcessDetail({
+				"companyCode": option.companyCode,
+				"processingStatus": option.handling_status,
+				"alarmId": option.id
+			})
+
+
+		},
+		methods: {
+
+			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);
+
+
+			},
+
+			async getUnProcessDetail(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/getPowerAlarmDetails',
+					data: ming
+				})
+				console.log(res.data.data[0]);
+				this.detailMessage = res.data.data[0]
+			},
+			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]
+			},
+
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: this.detailMessage.phone
+				});
+			},
+
+			mapLocation() {
+				console.log(this.detailMessage)
+				// 微信公众号导航
+				jwx.configWeiXin(jweixin => {
+					let shareInfo = {
+						latitude: parseFloat(this.detailMessage.latitude), // 纬度，浮点数，范围为90 ~ -90
+						longitude: parseFloat(this.detailMessage.longitude), // 经度，浮点数，范围为180 ~ -180。
+						name: this.detailMessage.siteName, // 位置名
+						address: this.detailMessage.address, // 地址详情说明
+						scale: 15, // 地图缩放级别,整型值,范围从1~28。默认为最大
+					};
+					jweixin.openLocation(shareInfo);
+				});
+			},
+
+			// 页面跳转
+			goOpeDataDetail(detailMessage) {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail?companyCode=' + this.companyCode +
+						'&deviceCode=' + detailMessage.deviceCode + '&deviceType=' + this.type + '',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goVideoDetail() {
+				uni.navigateTo({
+					url: '/pages/videoList/videoList?deviceType=2&companyCode=' + this.detailMessage.siteId + '',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId=' + this.detailMessage.siteId,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			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/processDetailEle1/processDetailEle1.vue

@@ -0,0 +1,366 @@
+<template>
+	<view class="dealDetail">
+		<view class="timeBox flex justify-between align-top padding-sm " style="height:auto;">
+			<view >
+				<view>发生时间：{{detailMessage.time}}</view>
+				<view  v-if="handling_status!=0">告警历时：{{detailMessage.duration}}</view>
+				<view  v-if="handling_status!=0">关联告警：{{detailMessage.handlerTime}}</view>
+				<view  v-if="handling_status!=0" style="color:#4074E7">
+					【{{detailMessage.route_name}}】设备低压-{{detailMessage.digitalValue=='1'?'动作':'复归'}}</view>
+			</view>
+			<button v-if="handling_status==0" class="cu-btn radius bg-red sm margin-top-sm">未处理</button>
+			<button v-if="handling_status==1" class="cu-btn radius bg-green sm margin-top-sm">已处理</button>
+			<button v-if="handling_status==2" class="cu-btn radius bg-orange sm margin-top-sm">待确认</button>
+			<button v-if="handling_status==3" class="cu-btn radius bg-blue sm margin-top-sm">自动恢复</button>
+			<button v-if="handling_status==4" class="cu-btn radius bg-gray sm margin-top-sm">过期失效</button>
+			
+			
+			
+		</view>
+
+
+		<view>
+			<!-- 基本信息start -->
+			<view class="basic-info dealDetail">
+				<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>{{detailMessage.siteName}}</text>
+					</view>
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>{{detailMessage.platform_area_name}}</text>
+					</view>
+					<view>
+						<text>线路名称：</text>
+						<text>{{detailMessage.deviceName}}</text>
+					</view>
+					<view>
+						<text>警告信息：</text>
+						<text>{{detailMessage.measValue}}</text>
+					</view>
+					<view>
+						<text>警告状态：</text>
+						<text>{{detailMessage.digitalValue=='1'?'动作':'复归'}}</text>
+					</view>
+					<view>
+						<text>采集终端：</text>
+						<text>{{detailMessage.deviceCode}}</text>
+					</view>
+					<view>
+						<text>站点地址：</text>
+						<text>{{detailMessage.address}}<i class="icon iconfont map"
+								@click="mapLocation()">&#xe612;</i></text>
+					</view>
+					<view>
+						<text>联系人：</text>
+						<text>{{detailMessage.userName}}</text>
+					</view>
+					<view>
+						<text>联系方式：</text>
+						<text>{{detailMessage.phone}}<i class="phone icon iconfont"
+								@click="submit()">&#xe61d;</i></text>
+					</view>
+					<view>
+						<text>运行数据：</text>
+						<text class="checkMore" @tap="goOpeDataDetail(detailMessage)">点击查看</text>
+					</view>
+					<view>
+						<text>视频：</text>
+						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
+					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
+					</view>
+				</view>
+			</view>
+			<!-- 基本信息end -->
+			
+			
+			<!-- 处理信息start -->
+			<view class="processStatus" v-if="handling_status!=0">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理信息
+				</view>
+				<view class="info-content">
+
+					<view>
+						<text>处理人：</text>
+						<text>{{detailMessage.handler}}</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>{{detailMessage.handlerTime}}</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>{{detailMessage.handlerContent}}</text>
+					</view>
+
+				</view>
+
+
+			</view>
+			<!-- 处理状态end -->
+
+			<!-- 处理状态start -->
+			<view class="processStatus" v-if="this.handling_status==2||this.handling_status==0">
+				<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" v-model="msg" placeholder="备注信息,最多可输入50个字..." :maxlength="50"
+								:data-maxnum="reason.length+'/50'" auto-height></textarea>
+						</view>
+
+						<view class="btn-area">
+							<button class="bg-blue round  missReport margin-top" @click="powerSubmit()">告警确认 </button>
+						</view>
+					</form>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+	</view>
+
+
+	</view>
+</template>
+
+<script>
+	//引入js sdk的封装
+	import * as jwx from '../../util/jssdk.js'
+
+	export default {
+		data() {
+			return {
+				msg: '',
+				reason: '',
+				radio: 'A',
+				radio: 'B',
+				modalName: null,
+				type: '0',
+				detailMessage: {},
+				handling_status: 0
+			}
+		},
+		mounted(){
+			document.querySelector('.uni-page-head-hd').style.display = 'none'
+		},
+		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.getUnProcessDetail({
+				"companyCode": option.companyCode,
+				"processingStatus": option.handling_status,
+				"alarmId": option.id
+			})
+
+
+		},
+		methods: {
+
+			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);
+
+
+			},
+
+			async getUnProcessDetail(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/getPowerAlarmDetails',
+					data: ming
+				})
+				console.log(res.data.data[0]);
+				this.detailMessage = res.data.data[0]
+			},
+			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]
+			},
+
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: this.detailMessage.phone
+				});
+			},
+
+			mapLocation() {
+				console.log(this.detailMessage)
+				// 微信公众号导航
+				jwx.configWeiXin(jweixin => {
+					let shareInfo = {
+						latitude: parseFloat(this.detailMessage.latitude), // 纬度，浮点数，范围为90 ~ -90
+						longitude: parseFloat(this.detailMessage.longitude), // 经度，浮点数，范围为180 ~ -180。
+						name: this.detailMessage.siteName, // 位置名
+						address: this.detailMessage.address, // 地址详情说明
+						scale: 15, // 地图缩放级别,整型值,范围从1~28。默认为最大
+					};
+					jweixin.openLocation(shareInfo);
+				});
+			},
+
+			// 页面跳转
+			goOpeDataDetail(detailMessage) {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail?companyCode=' + this.companyCode +
+						'&deviceCode=' + detailMessage.deviceCode + '&deviceType=' + this.type + '',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goVideoDetail() {
+				uni.navigateTo({
+					url: '/pages/videoList/videoList?deviceType=2&companyCode=' + this.detailMessage.siteId + '',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId=' + this.detailMessage.siteId,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			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/processDetailVideo/processDetailVideo.vue

@@ -0,0 +1,300 @@
+<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.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})
+			
+		},
+		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]
+			},
+			
+			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

@@ -31,23 +31,20 @@
 							<view class="pro-date ">{{item.soeTime}}</view>
 						</view>
 						<view class="action" style="z-index:99;width:170rpx;text-align:right">
-							<view class="unProcess" @tap="goUnprocessDetail(item.id)">未处理<text
+							<view class="unProcess" @tap="type==1?goUnprocessDetail(item):goVideoUnprocessDetail(item)">未处理<text
 									class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text></view>
 						</view>
 					</view>
 					<view class=" text-center margin-top" v-if="alarmUntreatedCount === 0">暂无数据...</view>
 				</view>
-
-
-
-
-
-
 			</view>
 		</block>
+		
+		<!-- 已处理start -->
 		<block v-if="TabCur==1">
 			<view class="processList">
-				<!-- 筛选 start -->
+				
+				<!-- 电力监测筛选 start -->
 				<view  v-if="this.type==1 " class=" padding-bottom-xs" style="border-bottom:1rpx solid  rgba(221,221,221,.3)">
 					<view class="cu-bar search filter-section">
 						<view class="search-form border-gray round bg-white">
@@ -73,16 +70,12 @@
 						</view>
 					</view>
 				</view>
-				<!-- 筛选end -->
-
+				<!-- 电力监测筛选end -->
 
 				<checkbox-group @change="changeCheckbox">
 					<view class="cu-list menu-avatar " :class="this.handleStatus==2?'handle2scroll':''">
-
 						<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
-
 							<view class="cu-form-group checkPos">
-
 								<checkbox :value="String(item.id)" class='round blue '
 									:class="{'checked':checkedArr.includes(String(item.id))}"
 									:checked="checkedArr.includes(String(item.id))">
@@ -102,9 +95,10 @@
 								</view>
 								<view class="pro-date ">{{item.soeTime}}</view>
 							</view>
+							
 							<view class="action" style="z-index:99;width:180rpx;text-align:right">
 								<view class="processed" v-if="item.handling_status==1"
-									@tap="goProcessedDetail(item)">
+									@tap="type==1?goProcessedDetail(item):goVideoProcessedDetail(item)">
 									已处理
 									<text class="icon iconfont margin-left-xs  margin-right-xs">&#xe629;</text>
 								</view>
@@ -135,7 +129,7 @@
 			</view>
 
 		</block>
-
+		<!-- 已处理end -->
 	</view>
 </template>
 
@@ -160,7 +154,6 @@
 				handleStatus: 0,
 				checkedArr: [],
 
-				// unporcessList: json.unprocessList,
 				unporcessList: [],
 				porcessedList: [],
 				type: '0',
@@ -174,9 +167,6 @@
 				alarmUntreatedCount: '',
 				alarmUntreatedCount1: '',
 				processingStatus: '',
-
-
-
 			};
 		},
 		watch: {
@@ -194,7 +184,6 @@
 			}
 		},
 		computed: {
-
 		},
 
 		onLoad: function(option) {
@@ -224,8 +213,6 @@
 		methods: {
 			
 			quickConfirm(){
-				
-				// alert( this.formMess.start_time)
 				if (!this.checkedArr.length) {
 					uni.showToast({
 						title: "请至少选择一条需要确认的数据",
@@ -263,8 +250,6 @@
 				}
 				setTimeout(() => {
 					uni.navigateTo({
-						
-					
 						url: '/pages/processList/processList?companyCode=' + this.companyCode +
 							'&type=1'
 					});
@@ -289,7 +274,6 @@
 					this.checkedArr = [];
 				}
 			},
-
 			changeCheckbox(e) {
 				this.checkedArr = e.detail.value;
 				// 如果选择的数组中有值，并且长度等于列表的长度，就是全选
@@ -299,26 +283,21 @@
 					this.allChecked = false;
 				}
 			},
-
 			async getProcessData(ming = {}, whichTab) {
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/getElectricAlarmUntreated',
 					data: ming,
 					showLoading: true
-
 				})
 
 				if (whichTab == 0) {
 					this.unporcessList = res.data.data;
 					this.alarmUntreatedCount = parseInt(res.data.alarmUntreatedCount)
 				} else {
-
 					this.porcessedList = res.data.data;
 					this.alarmUntreatedCount1 = parseInt(res.data.alarmUntreatedCount)
 
 				}
-
-
 				console.log(this.porcessedList)
 			},
 
@@ -332,54 +311,39 @@
 					"type": this.type,
 					"processingStatus": !e.currentTarget.dataset.id ? e.currentTarget.dataset.id : '1,2,3,4'
 				}, this.TabCur);
-
-
-
 			},
 
 			// 页面跳转
-			goUnprocessDetail(id) {
+			goUnprocessDetail(item) {
 				uni.navigateTo({
-					url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode +
-						'&processingStatus=0&id=' + id +
+					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
+						'&handling_status='+item.handling_status+'&id=' + item.id +
 						'&type=1',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
 				});
 			},
-			goVideoUnprocessDetail(id) {
+			goProcessedDetail(item) {
 				uni.navigateTo({
-					url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode +
-						'&processingStatus=0&id=' + id +
-						'&type=2',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
+						'&handling_status='+item.handling_status+'&id=' + item.id + '&type=1',
 				});
 			},
-			goProcessedDetail(item) {
+			
+						goVideoUnprocessDetail(item) {
 				uni.navigateTo({
-					url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode +
-						'&handling_status=' + item.handling_status +
-						'&id=' + item.id + '&type=1',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+					url: '/pages/processDetailVideo/processDetailVideo?companyCode=' + this.companyCode +
+						'&handling_status=0&id=' + item.id +
+						'&type=2',
 				});
 			},
+			
 
-			goVideoProcessedDetail(id) {
+			goVideoProcessedDetail(item) {
 				uni.navigateTo({
-					url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode +
-						'&processingStatus=' + this.processingStatus +
-						'&id=' + id + '&type=2',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+					url: '/pages/processDetailVideo/processDetailVideo?companyCode=' + this.companyCode +
+						'&handling_status=1&id=' + item.id +
+						'&type=2',
 				});
 			},
-
 			InputFocus(e) {
 				this.InputBottom = e.detail.height
 			},
@@ -393,8 +357,7 @@
 <style lang="scss">
 	.handle2scroll {
 		height: calc(100vh - 400rpx);
-		overflow: scroll;
-
+		overflow-y: scroll;
 	}
 
 	//已处理未处理消息个数样式
@@ -418,8 +381,5 @@
 		.lines-blue {
 			color: #4274E7
 		}
-
-
-
 	}
 </style>

pages/processedDetail1/processedDetail1.vue

@@ -1,31 +1,25 @@
 <template>
 	<view class="dealDetail">
-		
-		<view v-if="type==2" class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">{{detailMessage2.time}}</view>
-			<button class="cu-btn radius bg-green sm">已处理</button>
-		</view>
-		
-		<view v-else class="timeBox flex justify-between align-top padding-sm " style="height:auto;">
+		<view class="timeBox flex justify-between align-top padding-sm " style="height:auto;">
 			<view >
 				<view>发生时间：{{detailMessage.time}}</view>
-				<view>告警历时：{{detailMessage.duration}}</view>
-				<view>关联告警：{{detailMessage.handlerTime}}</view>
-				<view style="color:#4074E7">【{{detailMessage.route_name}}】设备低压-{{detailMessage.digitalValue=='1'?'动作':'复归'}}</view>
-				<!-- <view class="time">{{detailMessage.time}}</view> -->
-				<!-- <view>dfd</view> -->
+				<view  v-if="handling_status!=0">告警历时：{{detailMessage.duration}}</view>
+				<view  v-if="handling_status!=0">关联告警：{{detailMessage.handlerTime}}</view>
+				<view  v-if="handling_status!=0" style="color:#4074E7">
+					【{{detailMessage.route_name}}】设备低压-{{detailMessage.digitalValue=='1'?'动作':'复归'}}</view>
 			</view>
+			<button v-if="handling_status==0" class="cu-btn radius bg-red sm margin-top-sm">未处理</button>
+			<button v-if="handling_status==1" class="cu-btn radius bg-green sm margin-top-sm">已处理</button>
+			<button v-if="handling_status==2" class="cu-btn radius bg-orange sm margin-top-sm">待确认</button>
+			<button v-if="handling_status==3" class="cu-btn radius bg-blue sm margin-top-sm">自动恢复</button>
+			<button v-if="handling_status==4" class="cu-btn radius bg-gray sm margin-top-sm">过期失效</button>
+			
 			
-			<button  v-if="handling_status==1" class="cu-btn radius bg-green sm margin-top-sm">已处理</button>
-			<button  v-if="handling_status==2" class="cu-btn radius bg-orange sm margin-top-sm">待确认</button>
-			<button  v-if="handling_status==3" class="cu-btn radius bg-blue sm margin-top-sm">自动恢复</button>
-			<button  v-if="handling_status==4" class="cu-btn radius bg-gray sm margin-top-sm">过期失效</button>
 			
-		
 		</view>
-		
-		
-		<view v-if="type==1">
+
+
+		<view>
 			<!-- 基本信息start -->
 			<view class="basic-info dealDetail">
 				<view class="info-tit margin-left-xs">
@@ -57,9 +51,10 @@
 						<text>采集终端：</text>
 						<text>{{detailMessage.deviceCode}}</text>
 					</view>
-					<view >
+					<view>
 						<text>站点地址：</text>
-						<text>{{detailMessage.address}}<i class="icon iconfont map" @click="mapLocation()">&#xe612;</i></text>
+						<text>{{detailMessage.address}}<i class="icon iconfont map"
+								@click="mapLocation()">&#xe612;</i></text>
 					</view>
 					<view>
 						<text>联系人：</text>
@@ -67,11 +62,12 @@
 					</view>
 					<view>
 						<text>联系方式：</text>
-						<text>{{detailMessage.phone}}<i class="phone icon iconfont" @click="submit()">&#xe61d;</i></text>
+						<text>{{detailMessage.phone}}<i class="phone icon iconfont"
+								@click="submit()">&#xe61d;</i></text>
 					</view>
 					<view>
 						<text>运行数据：</text>
-						<text class="checkMore"  @tap="goOpeDataDetail(detailMessage)">点击查看</text>
+						<text class="checkMore" @tap="goOpeDataDetail(detailMessage)">点击查看</text>
 					</view>
 					<view>
 						<text>视频：</text>
@@ -84,14 +80,16 @@
 				</view>
 			</view>
 			<!-- 基本信息end -->
+			
+			
 			<!-- 处理信息start -->
-			<view class="processStatus"  v-if="this.handling_status!=2">
+			<view class="processStatus" v-if="handling_status!=0">
 				<view class="info-tit margin-left-xs">
 					<text class="cuIcon-titles margin-right-xs"></text>
 					处理信息
 				</view>
 				<view class="info-content">
-				
+
 					<view>
 						<text>处理人：</text>
 						<text>{{detailMessage.handler}}</text>
@@ -101,18 +99,18 @@
 						<text>{{detailMessage.handlerTime}}</text>
 					</view>
 					<view>
-						<text>处理内容：</text>   
+						<text>处理内容：</text>
 						<text>{{detailMessage.handlerContent}}</text>
 					</view>
-			
+
 				</view>
-			
-			
+
+
 			</view>
 			<!-- 处理状态end -->
-			
+
 			<!-- 处理状态start -->
-			<view class="processStatus" v-if="this.handling_status==2">
+			<view class="processStatus" v-if="this.handling_status==2||this.handling_status==0">
 				<view class="info-tit margin-left-xs">
 					<text class="cuIcon-titles margin-right-xs"></text>
 					处理内容
@@ -120,13 +118,11 @@
 				<view class="padding-lr padding-bottom-lg">
 					<form action="">
 						<view class="cu-form-group">
-							<!-- <textarea maxlength="-1" :disabled="modalName!=null" @input="textareaAInput" placeholder="备注信息,最多可输入50个字..."></textarea>-->
-							<textarea class="JTxtArea lg" v-model="msg" placeholder="备注信息,最多可输入50个字..." :maxlength="50" :data-maxnum="reason.length+'/50'"
-							 auto-height></textarea>
+							<textarea class="JTxtArea lg" v-model="msg" placeholder="备注信息,最多可输入50个字..." :maxlength="50"
+								:data-maxnum="reason.length+'/50'" auto-height></textarea>
 						</view>
-			
+
 						<view class="btn-area">
-							<!-- <button class="bg-orange round missReport margin-top">误 报 </button> -->
 							<button class="bg-blue round  missReport margin-top" @click="powerSubmit()">告警确认 </button>
 						</view>
 					</form>
@@ -134,70 +130,8 @@
 			</view>
 			<!-- 处理状态end -->
 		</view>
-		
-		<view v-else>
-			<!-- 基本信息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">
-				<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 -->
-		</view>
-		
+	</view>
+
 
 	</view>
 </template>
@@ -205,48 +139,57 @@
 <script>
 	//引入js sdk的封装
 	import * as jwx from '../../util/jssdk.js'
-	
+
 	export default {
 		data() {
 			return {
-				msg:'',
+				msg: '',
 				reason: '',
 				radio: 'A',
 				radio: 'B',
 				modalName: null,
 				type: '0',
-				detailMessage:{},	
-				detailMessage2:{},
-				
-				handling_status:0
+				detailMessage: {},
+				handling_status: 0
 			}
 		},
 		mounted(){
-					document.querySelector('.uni-page-head-hd').style.display = 'none'
-				},
+			document.querySelector('.uni-page-head-hd').style.display = 'none'
+		},
 		onLoad: function(option) {
-			this.handling_status=option.handling_status;
+			this.handling_status = option.handling_status;
 			this.type = option.type;
 			this.companyCode = option.companyCode;
-			this.processingStatus=option.handling_status;
+			this.processingStatus = option.handling_status;
 			this.alarmId = option.id;
-			if(this.type==1){
-				this.getUnProcessDetail({"companyCode":option.companyCode,"processingStatus":option.handling_status,"alarmId":option.id})
-			}else{
-				this.getVideoDetail({"companyCode":option.companyCode,"processingStatus":option.processingStatus,"alarmId":option.id})
-			}
-			
 			
+			if (option.handling_status!=0) {
+				uni.setNavigationBarTitle({
+					title: '已处理'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '未处理'
+				});
+			}
+
+			this.getUnProcessDetail({
+				"companyCode": option.companyCode,
+				"processingStatus": option.handling_status,
+				"alarmId": option.id
+			})
+
+
 		},
 		methods: {
-			
+
 			powerSubmit() {
-				if(!this.msg){
+				if (!this.msg) {
 					uni.showToast({
 						title: "请输入处理内容",
-						icon:"none"
+						icon: "none"
 					});
-				}else{
+				} else {
 					this.powerSubmitRes({
 						"type": 1,
 						"deviceCode": this.detailMessage.deviceCode,
@@ -255,71 +198,56 @@
 						"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);
-			 
-				
+
+				if (res.data.flag) {
+					uni.showToast({
+						title: "提交成功",
+					});
+				}
+
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/processList/processList?companyCode=' + this.companyCode +
+							'&type=' + this.type + '',
+
+					});
+				}, 1000);
+
+
 			},
-			
-			
-			
-			async getUnProcessDetail(ming={}) {
-				const res= await this.$myRequest({
-					url:'IntegratedAlarm/getPowerAlarmDetails',
-					data:ming
+
+			async getUnProcessDetail(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'IntegratedAlarm/getPowerAlarmDetails',
+					data: ming
 				})
-				  console.log(res.data.data[0]);
-				  this.detailMessage=res.data.data[0]
+				console.log(res.data.data[0]);
+				this.detailMessage = res.data.data[0]
 			},
-			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]
 			},
-			
+
 			submit() {
 				uni.makePhoneCall({
-					phoneNumber: this.detailMessage.phone 
+					phoneNumber: this.detailMessage.phone
 				});
 			},
-			mapLocation(){
+
+			mapLocation() {
 				console.log(this.detailMessage)
-				
-				
-				// window.location.href =  'http://apis.map.qq.com/uri/v1/marker?marker=coord:'+parseFloat(this.detailMessage.latitude)+','+parseFloat(this.detailMessage.longitude)+''
-			
-				// uni.openLocation({
-				// 	latitude: parseInt(this.detailMessage.latitude),
-				// 	longitude: parseInt(this.detailMessage.longitude),
-				// 	success: function() {
-				// 		console.log('success');
-				// 	}
-				// });
-				
-				
 				// 微信公众号导航
 				jwx.configWeiXin(jweixin => {
 					let shareInfo = {
@@ -332,11 +260,12 @@
 					jweixin.openLocation(shareInfo);
 				});
 			},
-	
+
 			// 页面跳转
 			goOpeDataDetail(detailMessage) {
 				uni.navigateTo({
-					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail?companyCode='+this.companyCode+'&deviceCode='+detailMessage.deviceCode+'&deviceType='+this.type+'',
+					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail?companyCode=' + this.companyCode +
+						'&deviceCode=' + detailMessage.deviceCode + '&deviceType=' + this.type + '',
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
@@ -352,7 +281,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId='+this.detailMessage.siteId,
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId=' + this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
@@ -368,7 +297,6 @@
 			inputReason(e) {
 				this.reason = e.detail.value;
 			}
-
 		}
 	}
 </script>
@@ -378,10 +306,12 @@
 		height: 88rpx;
 		background: #EFF4FF;
 		line-height: 88rpx;
+
 		.time {
 			color: #333
 		}
 	}
+
 	.info-tit {
 		color: #4074E7;
 		line-height: 90rpx;
@@ -400,32 +330,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/unprocessDetail/unprocessDetail.vue

@@ -139,7 +139,6 @@
 				<view class="padding-lr padding-bottom-lg">
 					<form action="">
 						<view class="cu-form-group">
-							<!-- <textarea maxlength="-1" :disabled="modalName!=null" @input="textareaAInput" placeholder="备注信息,最多可输入50个字..."></textarea>-->
 							<textarea class="JTxtArea lg" placeholder="备注信息,最多可输入50个字..." :maxlength="50" :data-maxnum="reason.length+'/50'"
 							 auto-height v-model="msg2"></textarea>
 						</view>
@@ -148,9 +147,6 @@
 							<button class="bg-blue round  missReport margin-top " @click="videoSubmit()">告警确认 </button>
 						</view>
 					</form>
-
-
-
 				</view>
 			</view>
 			<!-- 处理状态end -->