modify

common/common.scss

@@ -350,4 +350,53 @@ radio,checkbox {
 		width:90%;
 		padding-left:24rpx;
 		color:#999
+	}
+	
+	// 未处理textarea样式
+	/* // 处理内容 */
+	.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;
+		}
+	}
+	
+	
+	// 导出
+	
+	
+	.cu-dialog{
+		width:70%
+	}
+	.cu-modal .cu-dialog>.cu-bar:first-child .action{
+		min-height:50rpx;
+		min-width:auto;
+	}
+	.cu-dialog{
+		border-radius:20rpx
 	}

components/calendar/calendar.vue

@@ -0,0 +1,108 @@
+<template>
+	<view class="leave_cont">
+		<view class="ul">
+			<view class="li">
+				<view class="flex1">
+					<picker mode="date" :value="start_date" :start="start_date" :end="other" @change="bindDateChange">
+						<view class="date">{{start_date}}</view>
+					</picker>
+				</view>
+			</view>
+			~
+			<view class="li">
+				<view class="flex1">
+					<picker mode="date" :value="start_date" :start="start_date" @change="bindDateChange2">
+						<view class="date">{{end_date}}</view>
+					</picker>
+				</view>
+			</view>
+			<image class="canlendar-icon" src="../../static/calendar.png" ></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				start_date: '请选择开始日期',
+				end_date: '请选择结束日期',
+				other: '请输入'
+			}
+		},
+		computed: {
+
+		},
+		methods: {
+			// 选择日期
+			bindDateChange: function(e) {
+				this.start_date = e.target.value
+
+			},
+			bindDateChange2: function(e) {
+				this.end_date = e.target.value;
+				this.other = this.end_date;
+			},
+			// 获取当前时间
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+		}
+	}
+</script>
+
+<style>
+	.leave_cont .ul {
+		border: 1px solid red;
+		margin: 24rpx 24rpx;
+		border: 1px solid #E8F1FF;
+		border-radius: 36rpx;
+		line-height: 70rpx;
+		position:relative;
+	}
+
+	.leave_cont .ul .li {
+		display: inline-block;
+		text-align: center;
+		width: 35%
+	}
+
+	.leave_cont .ul .li text {
+		padding: 40rpx 0;
+		font-size: 30rpx;
+		color: #666666;
+		text-align:center;
+	}
+
+	.leave_cont .ul .li .flex1 {
+		flex: 1;
+		color: #999999;
+		font-size: 32rpx;
+	}
+
+	.date {
+		height: 42rpx;
+	}
+	.canlendar-icon{
+		width:36rpx;
+		height:36rpx;
+		position:absolute;
+		right:30rpx;
+		top:16rpx;
+	}
+</style>

data/json.js

@@ -1,4 +1,4 @@
-// 本地模拟json数据
+// 本地模拟json数据
 // 首页九宫格
 let cuIconList = [{
 		imgUrl: '../../static/square1.png',
@@ -73,7 +73,7 @@ let alarmingSquareList = [{
 		imgUrl: '../../static/alarming-zj.png',
 		badge: 100,
 		name: '报警主机',
-		
+
 	}, {
 		imgUrl: '../../static/alarming-water.png',
 		badge: 0,
@@ -119,40 +119,25 @@ let alarmingSquareList = [{
 		badge: 0,
 		name: '消防栓监测',
 	}
-];
-
-let deviceOffLineData = [{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'测试用传装置',
-					subTitle:'三楼茶水间',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				}]
+];
+
+// 离线设备
+let deviceOffLineData = [{
+	title: '测试用传装置',
+	subTitle: '三楼茶水间',
+	status: '未处理',
+	time: '2020-01-08 15:15:12'
+}, {
+	title: '测试用传装置',
+	subTitle: '三楼茶水间',
+	status: '未处理',
+	time: '2020-01-08 15:15:12'
+}, {
+	title: '测试用传装置',
+	subTitle: '三楼茶水间',
+	status: '未处理',
+	time: '2020-01-08 15:15:12'
+}]
 
 
 
@@ -210,124 +195,44 @@ let siteListData = [{
 ];
 
 let unprocessList = [{
-		title: '母线停电',
-		subTitle: '动作',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电2',
-		subTitle: '复归',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电3',
-		subTitle: '动作',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电4',
-		subTitle: '复归',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电5',
-		subTitle: '复归',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电6',
-		subTitle: '复归',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	},
-	{
-		title: '母线停电',
-		subTitle: '复归',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
-	},
-	{
-		title: '母线停电',
-		subTitle: '事件未处理测试',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
+		"id": "561",
+		"title": "烟雾拆卸报警",
+		"des": "三楼赛特威尔测试烟感二",
+		"time": "2021-01-20 15:23:43"
 	},
 	{
-		title: '母线停电',
-		subTitle: '事件未处理测试',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
+		"id": "561",
+		"title": "烟雾拆卸报警",
+		"des": "三楼赛特威尔测试烟感二",
+		"time": "2021-01-20 15:23:43"
 	},
 	{
-		title: '母线停电',
-		subTitle: '事件未处理测试',
-		status: '未处理',
-		time: '2020-01-08 15:15:12'
+		"id": "561",
+		"title": "烟雾拆卸报警",
+		"des": "三楼赛特威尔测试烟感二",
+		"time": "2021-01-20 15:23:43"
 	}
 ];
 let processedList = [{
-		title: '母线停电',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电2',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电3',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电4',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电5',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	}, {
-		title: '母线停电6',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	},
-	{
-		title: '母线停电',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	},
-	{
-		title: '母线停电',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
+		"id": "561",
+		"title": "烟雾拆卸报警",
+		"des": "三楼赛特威尔测试烟感二",
+		"time": "2021-01-20 15:23:43"
 	},
 	{
-		title: '母线停电',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
-	},
-	{
-		title: '母线停电',
-		subTitle: '事件已处理测试',
-		status: '已处理',
-		time: '2020-01-08 15:15:12'
+		"id": "561",
+		"title": "烟雾拆卸报警",
+		"des": "三楼赛特威尔测试烟感二",
+		"time": "2021-01-20 15:23:43"
 	}
-]
+];
 
 // 定义数据出口
 module.exports = {
 	siteListData: siteListData,
 	cuIconList: cuIconList,
 	unprocessList: unprocessList,
-	processedList: processedList,
-	alarmingSquareList:alarmingSquareList,
-	deviceOffLineData:deviceOffLineData
+	processedList: processedList,
+	alarmingSquareList: alarmingSquareList,
+	deviceOffLineData: deviceOffLineData
 }

pages.json

@@ -1,34 +1,31 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-{
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "虹泾总部园",
 				"app-plus": {
-
 					"titleNView": {
-						"buttons": [
-							{
+						"buttons": [{
 								"text": "\ue607",
 								"fontSize": "18px",
-								 // "redDot": true,
-								 "float":"right",
+								// "redDot": true,
+								"float": "right",
 								"fontSrc": "/static/iconfont/iconfont.ttf",
-								 "width": "auto"
+								"width": "auto"
 
 							},
 							{
 
 								"text": "\ue63d",
 								"fontSize": "18px",
-								"float":"left",
+								"float": "left",
 								"fontSrc": "/static/iconfont/iconfont.ttf",
-								 "width": "auto"
+								"width": "auto"
 							}
 						]
 					}
-
 				}
 
 			}
@@ -38,45 +35,88 @@
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		},{
-		    "path" : "pages/deviceOffLine/deviceOffLine",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "离线设备",
-		        "enablePullDownRefresh": false
-		    } 
-		},
-		
-		
-		
-
-		
-		{
-			"path": "pages/siteList/siteList",
+		}, {
+			"path": "pages/deviceOffLine/deviceOffLine",
 			"style": {
-				"navigationBarTitleText": "运行监测",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "离线设备",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "\ue613",
+							"fontSize": "20px",
+							// "redDot": true,
+							"float": "right",
+							"fontSrc": "/static/iconfont/iconfont.ttf",
+							"width": "auto"
+						}]
+					}
+				}
 			}
 		},
+
 		{
 			"path": "pages/processList/processList",
 			"style": {
-				"navigationBarTitleText": "处理列表"
+				"navigationBarTitleText": "火警",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "\ue613",
+							"fontSize": "20px",
+							// "redDot": true,
+							"float": "right",
+							"fontSrc": "/static/iconfont/iconfont.ttf",
+							"width": "auto"
+						}]
+					}
+				}
 			}
 		},
 		{
 			"path": "pages/unprocessDetail/unprocessDetail",
 			"style": {
-				"navigationBarTitleText": "未处理"
+				"navigationBarTitleText": "报警详情（未处理）"
 			}
 		},
 		{
 			"path": "pages/processedDetail/processedDetail",
 			"style": {
-				"navigationBarTitleText": "处理"
+				"navigationBarTitleText": "报警详情（已处理）"
 			}
+		},
+		{
+		    "path" : "pages/export/export",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "导出",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		{
+			"path": "pages/siteList/siteList",
+			"style": {
+				"navigationBarTitleText": "运行监测",
+				"enablePullDownRefresh": true
+			}
+		},
+
+
 		{
 			"path": "pages/deviceType/deviceType",
 			"style": {
@@ -332,7 +372,9 @@
 			}
 
 		}
+
 	    
+        
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/alarmingList/alarmingList.vue

@@ -4,7 +4,7 @@
 		<!-- <square :cuIconList="cuIconList"></square> -->
 		<view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
 			<view class="cu-list grid col-3 no-border">
-				<view class="cu-item justify-center align-center"  v-for="(item,index) in alarmingSquareList"
+				<view class="cu-item justify-center align-center"  v-for="(item,index) in alarmingSquareList" @tap="goProcessList()"
 				 :key="index">
 					<image :src="item.imgUrl" style="width:100rpx;height:100rpx"></image>
 					<view class="cu-tag badge" v-if="item.badge!=0">
@@ -60,27 +60,14 @@
 
 			// 页面跳转
 			goProcessList() {
-				if (this.powerMonitoringCount) {
 					uni.navigateTo({
-						url: '/pages/processList/processList?type=1&companyCode=' + this.companyCode + '',
+						url: '/pages/processList/processList',
 						success: res => {},
 						fail: () => {},
 						complete: () => {}
 					});
-				}
-
-			},
-			goProcessList2() {
-				if (this.videoMonitoringCount) {
-					uni.navigateTo({
-						url: '/pages/processList/processList?type=2&companyCode=' + this.companyCode + '',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-
 			},
+			
 
 		}
 	}

pages/deviceAdd/deviceAdd.vue

@@ -92,7 +92,7 @@
 					<option value="-3">楼层B3</option>
 					<option value="-2">楼层B2</option>
 					<option value="-1">楼层B1</option>
-					<option :value=index+1 v-for="(item,index) in 60" ::key="index">楼层{{item}}</option>
+					<option :value=index+1 v-for="(item,index) in 60" :key="index">楼层{{item}}</option>
 				</select>
 			</view>
 			<view class="form-item">

pages/deviceOffLine/deviceOffLine.vue

@@ -34,7 +34,7 @@
 		<block class="">
 			<view class="processList" style="margin-top:206rpx">
 				<view class="cu-list menu-avatar ">
-					<view class="cu-item" v-for="(item,index) in deviceOffLineData" :key="index"  @tap="goUnprocessDetail">
+					<view class="cu-item" v-for="(item,index) in deviceOffLineData" :key="index"  >
 						<view class="cu-avatar lg" style="background-image:url(../../static/device-icon.png);"></view>
 						<view class="content">
 							<view class="pro-title">
@@ -65,7 +65,6 @@
 	export default {
 		data() {
 			return {
-				
 				deviceOffLineData:json.deviceOffLineData,
 				siteListRes: 0,
 				siteName: '',
@@ -148,60 +147,12 @@
 			},
 
 
-			goDeviceType(item) {
-				if (item.count) {
-					uni.navigateTo({
-						url: '/pages/deviceType/deviceType?companyCode=' + item.companyCode,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-
-			},
-			goSiteDetail(item) {
-				uni.navigateTo({
-					url: '/pages/siteDetail/siteDetail?id=' + item.id + '',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
+			
 		}
 
 	}
 </script>
 
 <style>
-	.showDetail {
-		position: absolute;
-		background: #fff;
-		box-shadow: 0 1px 6px 0 rgb(32 33 36 / 28%);
-		padding: 0rpx 32rpx;
-		border-radius: 10rpx;
-		top: 42rpx;
-		right: 45%;
-		z-index: 3000000;
-		font-size: 28rpx;
-
-	}
-
-	/* *:not(input) { */
-
-	* {
-		-webkit-touch-callout: none;
-		-webkit-user-select: none;
-		-khtml-user-select: none;
-		-moz-user-select: none;
-		-ms-user-select: none;
-		user-select: none;
-	}
-	input {
-		user-select: initial !important;
-	}
-
-
-	/* uni-page-head .uni-page-head-bd{
-		 user-select: none!important;
-	} */
+	
 </style>

pages/export/export.vue

@@ -0,0 +1,151 @@
+<template>
+	<view class="processWrapper ">
+		<view class="ding">
+			<calendar></calendar>
+			
+		</view>
+
+		<block v-if="TabCur==0">
+			<view class="processList" >
+					<view class="cu-list menu-avatar">
+						
+						<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
+							<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
+							<view class="content">
+								<view class="pro-title">
+									<view class="cut">{{item.title}}</view>
+								</view>
+								<view class="pro-des  ">
+									<view class="text-cut">
+										{{item.des}}
+									</view>
+								</view>
+								<view class="pro-date ">{{item.time}}</view>
+							</view>
+							<view class="action" style="z-index:99">
+								<view class="unProcess" v-if="type==1" >未处理</view>
+								<view class="unProcess" v-else>未处理</view>
+							</view>
+						</view>
+						<view class=" text-center margin-top" v-if="unporcessList.length === 0">暂无数据...</view>
+					</view>
+			</view>
+		</block>
+		<view class="padding-lr padding-bottom-lg" style="position:fixed;bottom:0;width:100%">
+			<view class="btn-area">
+				<button class="bg-blue  round missReport margin-top" @tap="showModal" data-target="DialogModal" >导 出 </button>
+			</view>
+		</view>
+		
+		
+		<!-- 弹框 -->
+		
+		<view class="cu-modal" :class="modalName=='DialogModal'?'show':''">
+			<view class="cu-dialog">
+				<view class="cu-bar bg-white justify-end">
+					<view class="action" @tap="hideModal">
+						<text class="cuIcon-close"></text>
+					</view>
+				</view>
+				<view class="padding-sm bg-white">
+					<image src="../../static/ok.png" style="width:100rpx;height:100rpx"></image>
+					<view style="margin:20rpx 0">已导出文件，是否打开？</view>
+				</view>
+				<view class="cu-bar bg-white" style="min-height: 100rpx;">
+					<view class="action margin-0 flex-sub  " @tap="hideModal">
+						另存为</view>
+					<view class="action margin-0 flex-sub  solid-left text-blue" @tap="hideModal">打开</view>
+				</view>
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import json from '../../data/json.js';
+	export default {
+		data() {
+			return {
+				 unporcessList: json.unprocessList,
+				 porcessedList: json.processedList,
+	
+				type: '0',
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+				TabCur: 0,
+				tabNav: ['未处理', '已处理'],
+				
+				
+				CustomBar: this.CustomBar,
+				modalName: null,
+			};
+		},
+		onLoad: function(option) {
+			
+
+			
+		},
+		
+		onNavigationBarButtonTap(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: '/pages/export/export',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			});
+		},
+		methods: {
+			
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+			
+			// exportData(){
+			// 	uni.showModal({
+			// 	    title: '提示',
+			// 	    content: '已导出文件是否打开？',
+			// 	    success: function (res) {
+			// 	        if (res.confirm) {
+			// 	            console.log('用户点击确定');
+			// 	        } else if (res.cancel) {
+			// 	            console.log('用户点击取消');
+			// 	        }
+			// 	    }
+			// 	});
+			// },
+			
+			InputFocus(e) {
+				this.InputBottom = e.detail.height
+			},
+			InputBlur(e) {
+				this.InputBottom = 0
+			},
+			
+			
+
+			tabSelect(e) {
+
+				console.log(e.currentTarget);
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
+
+
+
+			},
+
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	
+</style>

pages/processList/processList.vue

@@ -6,77 +6,64 @@
 				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav" :key="index" @tap="tabSelect"
 				 :data-id="index">
 					<view v-if="TabCur==index" class="cu-tag badge">
-						<block class="cu-tag badge">{{TabCur?alarmUntreatedCount1:alarmUntreatedCount}} </block>
+						<block class="cu-tag badge">{{TabCur? unporcessList.length:porcessedList.length}} </block>
 					</view>
 					{{item}}
 				</view>
 			</scroll-view>
-		</view>
+		</view>
+		
 
 		<block v-if="TabCur==0">
 			<view class="processList">
-				
 					<view class="cu-list menu-avatar">
 						
 						<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
 							<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
 							<view class="content">
 								<view class="pro-title">
-									<view class="cut">{{item.measName}}</view>
+									<view class="cut">{{item.title}}</view>
 								</view>
 								<view class="pro-des  ">
 									<view class="text-cut">
-										{{item.digitalValue!=0?"动作":"复归"}}
+										{{item.des}}
 									</view>
 								</view>
-								<view class="pro-date ">{{item.soeTime}}</view>
+								<view class="pro-date ">{{item.time}}</view>
 							</view>
 							<view class="action" style="z-index:99">
 								<view class="unProcess" v-if="type==1" @tap="goUnprocessDetail(item.id)">未处理</view>
 								<view class="unProcess" v-else @tap="goVideoUnprocessDetail(item.id)">未处理</view>
 							</view>
 						</view>
-						<view class=" text-center margin-top" v-if="alarmUntreatedCount === 0">暂无数据...</view>
+						<view class=" text-center margin-top" v-if="unporcessList.length === 0">暂无数据...</view>
 					</view>
-
-				
-				
-					
-				
-
 			</view>
-		</block>
+		</block>
+		
 		<block v-if="TabCur==1">
 			<view class="processList">
-		
-					<view class="cu-list menu-avatar "  >
-						
+					<view class="cu-list menu-avatar "  >
 						<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
 							<view class="cu-avatar lg" style="background-image:url(../../static/processed-icon.png);"></view>
 							<view class="content">
 								<view class="pro-title">
-									<view class="cut">{{item.measName}}</view>
+									<view class="cut">{{item.title}}</view>
 								</view>
 								<view class="pro-des  ">
 									<view class="text-cut">
-										{{item.digitalValue!=0?"动作":"复归"}}
+										{{item.des}}
 									</view>
 								</view>
-								<view class="pro-date ">{{item.soeTime}}</view>
+								<view class="pro-date ">{{item.time}}</view>
 							</view>
 							<view class="action" style="z-index:99">
 								<view class="processed" v-if="type==1" @tap="goProcessedDetail(item.id)">已处理</view>
 								<view class="processed" v-else @tap="goVideoProcessedDetail(item.id)">已处理</view>
 							</view>
 						</view>
-						<view class="text-center margin-top" v-if="alarmUntreatedCount1 === 0">暂无数据...</view>
+						<view class="text-center margin-top" v-if="porcessedList.length === 0">暂无数据...</view>
 					</view>
-
-				
-					
-			
-
-
 			</view>
 		</block>
 
@@ -88,9 +75,9 @@
 	export default {
 		data() {
 			return {
-				// unporcessList: json.unprocessList,
-				unporcessList: [],
-				porcessedList: [],
+				 unporcessList: json.unprocessList,
+				 porcessedList: json.processedList,
+				 
 				type: '0',
 				modalName: null,
 				listTouchStart: 0,
@@ -98,63 +85,27 @@
 				CustomBar: this.CustomBar,
 				TabCur: 0,
 				tabNav: ['未处理', '已处理'],
-				companyCode: '',
-				alarmUntreatedCount: '',
-				alarmUntreatedCount1: '',
-				processingStatus: '',
+				
 		
 			};
 		},
 		onLoad: function(option) {
 
-			console.log(option.type);
-			console.log(option.companyCode);
-			if (option.type == 1) {
-				uni.setNavigationBarTitle({
-					title: '电力检测'
-				});
-			} else {
-				uni.setNavigationBarTitle({
-					title: '视频告警'
-				});
-			}
-			this.getProcessData({
-				"companyCode": option.companyCode,
-				"type": option.type,
-				"processingStatus": "0"
-			}, 0);
-			console.log('onload里')
-
-			this.companyCode = option.companyCode;
-			this.processingStatus = 1
-			this.type = option.type;
+			
+		},
+		
+		onNavigationBarButtonTap(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: '/pages/export/export',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			});
 		},
 		methods: {
 
-
-
-
-
-			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(res.data)
-			},
+			
 
 			tabSelect(e) {
 
@@ -162,12 +113,6 @@
 				this.TabCur = e.currentTarget.dataset.id;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
 
-				this.getProcessData({
-					"companyCode": this.companyCode,
-					"type": this.type,
-					"processingStatus": e.currentTarget.dataset.id
-				}, this.TabCur);
-
 
 
 			},
@@ -216,21 +161,17 @@
 
 <style lang="scss">
 	//已处理未处理消息个数样式
-
 	.nav .cu-item.cur {
 		position: relative;
 		border-bottom: 8rpx solid;
 	}
-
 	.cu-tag.badge {
 		top: 14rpx;
 		right: 96rpx;
 	}
-
 	.nav .cu-item {
 		width: 50%;
 		margin: 0;
-
 		.text-blue,
 		.line-blue,
 		.lines-blue {

pages/processedDetail/processedDetail.vue

@@ -1,89 +1,11 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">{{type==1?detailMessage.time:detailMessage2.time}}</view>
+			<view class="time">2021-01-18 15:16:45</view>
 			<button class="cu-btn radius bg-green sm">已处理</button>
 		</view>
-		<view v-if="type==1">
-			<!-- 基本信息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>{{detailMessage.siteName}}</text>
-					</view>
-					<view>
-						<text>线路名称：</text>
-						<text>{{detailMessage.deviceName}}</text>
-					</view>
-					<view>
-						<text>警告信息：</text>
-						<text>{{detailMessage.measValue}}</text>
-					</view>
-					<view>
-						<text>警告状态：</text>
-						<text>{{detailMessage.measValue?'动作':'复归'}}</text>
-					</view>
-					<view>
-						<text>采集终端：</text>
-						<text>{{detailMessage.deviceCode}}</text>
-					</view>
-					<view>
-						<text>站点地址：</text>
-						<text>{{detailMessage.address}}<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
-					</view>
-					<view>
-						<text>联系人：</text>
-						<text>{{detailMessage.userName}}</text>
-					</view>
-					<view>
-						<text>联系方式：</text>
-						<text>{{detailMessage.phone}}<text class="phone icon iconfont" @click="submit()">&#xe61d;</text></text>
-					</view>
-					<view>
-						<text>运行数据：</text>
-						<text class="checkMore"  @tap="goOpeDataDetail(detailMessage)">点击查看</text>
-					</view>
-					<view>
-						<text>视频：</text>
-						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
-					</view>
-				</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>
-						<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 -->
-		</view>
-		
-		<view v-else>
+	
+		<view >
 			<!-- 基本信息start -->
 			<view class="basic-info">
 				<view class="info-tit margin-left-xs">
@@ -93,31 +15,21 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>设备名称：</text>
-						<text>{{detailMessage2.deviceName}}</text>
+						<text>三楼赛特威尔测试烟感二</text>
 					</view>
 					
 					<view>
 						<text>设备地址：</text> 
-						<text>{{detailMessage2.deviceAddress}}</text>
+						<text>上海市青浦区徐泾镇徐乐路208号</text>
 					</view>
 					<view>
 						<text>告警信息：</text>
-						<text>{{detailMessage2.alarmInformation}}</text>
+						<text>烟雾拆卸报警</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">
@@ -127,19 +39,19 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>是否误报：</text>
-						<text>{{detailMessage2.alarmStatus?'误报':'非误报'}}</text>
+						<text>非误报</text>
 					</view>
 					<view>
 						<text>处理人：</text>
-						<text>{{detailMessage2.handler}}</text>
+						<text>13895656565</text>
 					</view>
 					<view>
 						<text>处理时间：</text>
-						<text>{{detailMessage2.handlerTime}}</text>
+						<text>2021-01-18 18:00:00</text>
 					</view>
 					<view>
 						<text>处理内容：</text>
-						<text>{{detailMessage2.handlerContent}}</text>
+						<text>测试</text>
 					</view>
 				</view>
 			</view>
@@ -163,69 +75,18 @@
 			}
 		},
 		onLoad: function(option) {
-			this.type = option.type;
-			this.companyCode = option.companyCode;
-			this.processingStatus=option.processingStatus;
-			this.alarmId = option.id;
-			if(this.type==1){
-				this.getUnProcessDetail({"companyCode":option.companyCode,"processingStatus":option.processingStatus,"alarmId":option.id})
-			}else{
-				this.getVideoDetail({"companyCode":option.companyCode,"processingStatus":option.processingStatus,"alarmId":option.id})
-			}
+		
 			
 			
 		},
 		methods: {
-			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: '15122423833' //仅为示例
 				});
 			},
-			mapLocation(){
-				console.log(this.detailMessage)
-				uni.openLocation({
-					latitude: parseInt(this.detailMessage.latitude),
-					longitude: parseInt(this.detailMessage.longitude),
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-	
-			// 页面跳转
-			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/unprocessDetail/videoDetail/videoDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
+			
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},

pages/unprocessDetail/unprocessDetail.vue

@@ -1,94 +1,11 @@
 <template>
 	<view>
-		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view  v-if="type==1" class="time">{{detailMessage.time}}</view>
-			<view  v-else class="time">{{detailMessage2.time}}</view>
+		<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time">2021-01-18 15:16:45</view>
 			<button class="cu-btn radius bg-red sm">未处理</button>
 		</view>
-		<!-- 电力start -->
-		<view v-if="type==1">
-			<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>{{detailMessage.siteName}}</text>
-					</view>
-					<view>
-						<text>线路名称：</text>
-						<text>{{detailMessage.deviceName}}</text>
-					</view>
-					<view>
-						<text>警告信息：</text>
-						<text>{{detailMessage.measValue}}</text>
-					</view>
-					<view>
-						<text>警告状态：</text>
-						<text>{{detailMessage.measValue?'动作':'复归'}}</text>
-					</view>
-					<view>
-						<text>采集终端：</text>
-						<text>{{detailMessage.deviceCode}}</text>
-					</view>
-					<view>
-						<text>站点地址：</text>
-						<text>{{detailMessage.address}}<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
-					</view>
-					<view>
-						<text>联系人：</text>
-						<text>{{detailMessage.userName}}</text>
-					</view>
-					<view>
-						<text>联系方式：</text>
-						<text>
-							{{detailMessage.phone}}
-							<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
-						</text>
-					</view>
-					<view>
-						<text>运行数据：</text>
-						<text class="checkMore" @tap="goOpeDataDetail(detailMessage)">点击查看</text>
-					</view>
-					<view>
-						<text>视频：</text>
-						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
-					</view>
-				</view>
-			</view>
-			<!-- 处理状态start -->
-			<view class="processStatus">
-				<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 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>
-						</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>
-
-
-
-				</view>
-			</view>
-			<!-- 处理状态end -->
-		</view>
-		<!-- 电力end-->
-
-
-		<view v-else>
+		
+		<view>
 			<view class="basic-info">
 				<view class="info-tit margin-left-xs">
 					<text class="cuIcon-titles margin-right-xs"></text>
@@ -97,30 +14,20 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>设备名称：</text>
-						<text>{{detailMessage2.deviceName}}</text>
+						<text>三楼赛特威尔测试烟感二</text>
 					</view>
 
 					<view>
 						<text>设备地址：</text>
-						<text>{{detailMessage2.deviceAddress}}</text>
+						<text>上海市青浦区徐泾镇徐乐路208号</text>
 					</view>
 					<view>
 						<text>告警信息：</text>
-						<text>{{detailMessage2.alarmInformation}}</text>
+						<text>烟雾拆卸报警</text>
 					</view>
 				</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 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">
@@ -130,24 +37,20 @@
 				<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>
 						<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>
+							<button class="bg-blue round  missReport margin-top " @click="videoSubmit()">非 误 报 </button>
 						</view>
 					</form>
-
-
-
 				</view>
 			</view>
 			<!-- 处理状态end -->
 		</view>
-
-
+
+		
 	</view>
 </template>
 
@@ -170,46 +73,10 @@
 			}
 		},
 		onLoad: function(option) {
-			this.type = option.type;
-			this.companyCode = option.companyCode;
-			this.processingStatus = option.processingStatus;
-			this.alarmId = option.id;
-			if (this.type == 1) {
-				this.getUnProcessDetail({
-					"companyCode": option.companyCode,
-					"processingStatus": option.processingStatus,
-					"alarmId": option.id
-				})
-			} else {
-				this.getUnProcessDetail2({
-					"companyCode": option.companyCode,
-					"processingStatus": option.processingStatus,
-					"alarmId": option.id
-				})
-
-			}
+			
 
 		},
 		methods: {
-
-			async getUnProcessDetail(params = {}) { 
-				const res = await this.$myRequest({
-					url: 'IntegratedAlarm/getPowerAlarmDetails',
-					data: params
-				})
-				console.log(res.data.data[0]);
-				this.detailMessage = res.data.data[0]
-			},
-
-			async getUnProcessDetail2(params = {}) { 
-				const res = await this.$myRequest({
-					url: 'IntegratedAlarm/getVideoAlarmDetails',
-					data: params
-				})
-				console.log(res.data.data[0]);
-				this.detailMessage2 = res.data.data[0]
-			},
-
 			async powerSubmitRes(params = {}) {
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/setAlarmHandle',
@@ -225,32 +92,11 @@
 			   setTimeout(() => {
 			   	uni.navigateTo({
 			   		url: '/pages/processList/processList?companyCode=' + this.companyCode + '&type='+this.type+'',
-			   
 			   	});
 			   }, 1000);
 			 
 				
 			},
-
-			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
-					})
-				}
-				
-				
-			},
-			
 			videoSubmit() {
 				if(!this.msg2){
 					uni.showToast({
@@ -287,48 +133,14 @@
 						"handlerContent": this.msg2
 					})
 				}
-				
-				
 			},
 
-
 			submit() {
 				uni.makePhoneCall({
 					phoneNumber: '15122423833' //仅为示例
 				});
 			},
 
-			mapLocation() {
-				uni.openLocation({
-					latitude: parseInt(this.detailMessage.latitude),
-					longitude: parseInt(this.detailMessage.longitude),
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-
-			// 页面跳转
-			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/unprocessDetail/videoDetail/videoDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
-
-
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},
@@ -346,36 +158,5 @@
 </script>
 
 <style lang="scss">
-	/* // 处理内容 */
-	.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>

static/iconfont/iconfont.css

@@ -8,6 +8,11 @@
   url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.svg#iconfont') format('svg');
 }
 
+
+
+
+
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;