消息，设置，视频列表 画面检测等页面开发， 其他开发

common/common.css

@@ -1,6 +1,6 @@
-/* common */
-body{
-	font-size:32rpx;
+/* common */
+body {
+	font-size: 32rpx;
 }
 
 /* 九宫格样式 */
@@ -16,13 +16,26 @@ body{
 .cu-list.menu-avatar>.cu-item .action {
 	width: 132rpx
 }
-
+
+.iconfont.phone {
+		color:#08BE04;
+		font-size:45rpx;
+		position:relative;
+		top:6rpx;
+		left:10rpx;
+	}
+	.iconfont.map{
+		color:#4074E7;
+		font-size:38rpx;
+	}
+	
 /* 列列表公共样式 */
 .processWrapper .cu-avatar {
 	background-repeat: no-repeat;
 	background-size: cover;
 	background-color: #fff
 }
+
 .cu-avatar.lg {
 	width: 90rpx;
 	height: 90rpx
@@ -32,119 +45,127 @@ body{
 	margin-left: 24rpx;
 	padding: 30rpx 0;
 }
+
 .cu-list.menu-avatar>.cu-item>.cu-avatar {
 	left: 0
 }
+
 .cu-list.menu-avatar>.cu-item .content {
 	left: 120rpx;
 	width: 460rpx;
-}	
+}
 
-.unProcess{
-	color: #FF4E00	
-}
-.processed{
-	color:#08BE04
-	
-}
-
-/* 页面样式 */
-
-/* 站点列表页 */
+.unProcess {
+	color: #FF4E00
+}
+
+.processed {
+	color: #08BE04
+}
+
+/* 页面样式 */
+
+/* 站点列表页 */
 /* 筛选框 */
-	.filter-section {
-		position: fixed;
-		/* top: 88rpx; */
-		width: 100%;
-		z-index: 9
-	}
-	.cu-bar .search-form {
-		background: #fff
-	}
-	.cu-btn {
-		padding: 0 46rpx;
-	}
-	/* 站点列表 */
-	.site-items {
-		position: fixed;
-		top: 100rpx;
-		width: 100%;
-		height: calc(100% - 100rpx);;
-		overflow: scroll
-	}
-	.site-items .site-tit {
-		font-size: 32rpx;
-		color: #333;
-	}
-	.site-items .cu-list.menu-avatar>.cu-item {
-		padding-right: 25rpx;
+.filter-section {
+	position: fixed;
+	/* top: 88rpx; */
+	width: 100%;
+	z-index: 9
+}
+
+.cu-bar .search-form {
+	background: #fff
+}
+
+.cu-btn {
+	padding: 0 46rpx;
+}
+
+/* 站点列表 */
+.site-items {
+	position: fixed;
+	/* top: 100rpx; */
+	width: 100%;
+	height: calc(100% - 100rpx);
+	;
+	overflow: scroll
+}
+
+.site-items .site-tit {
+	font-size: 32rpx;
+	color: #333;
+}
+
+.site-items .cu-avatar {}
+
+/* 新增按钮 */
+.site-wrapper .plus {
+	position: fixed;
+	bottom: 20rpx;
+	right: 20rpx
+}
 
-	}
-	.site-items .cu-avatar {
-		
-	}
-	
-	/* 新增按钮 */
-	.site-wrapper .plus {
-		position: fixed;
-		bottom: 20rpx;
-		right: 20rpx
-	}
-
 
 /* 已处理未处理列表 */
 .processList .cu-list.menu-avatar .cu-item {
 	height: 178rpx;
 }
+
 .pro-title {
 	color: #333;
 }
+
 .pro-des,
 .pro-date {
 	font-size: 28rpx;
 	color: #666;
 }
-.pro-res {
-	
-}
-.processList{
-	position: fixed;
-	    top: 100rpx;
-		width:100%;
-	height: calc(100% - 100rpx);
-	    overflow-y: scroll;
+
+.pro-res {}
+
+.processList {
+	position: fixed;
+	top: 100rpx;
+	width: 100%;
+	height: calc(100% - 100rpx);
+	overflow-y: scroll;
 }
 
-
-/* 已处理未处理详情页样式 */
+
+
+
+/* 已处理未处理详情页样式 */
 .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;
-		
-	}
-	.checkMore{
-		color:#4074E7
+	height: 88rpx;
+	background: #EFF4FF;
+	line-height: 88rpx;
+
+	.time {
+		color: #333
 	}
-	.info-content view text:first-child {
-		width: 160rpx;
-		display: inline-block
-	}
-	
-	
+}
+
+.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;
+
+}
+
+.checkMore {
+	color: #4074E7
+}
+
+.info-content view text:first-child {
+	width: 160rpx;
+	display: inline-block
+}

components/square/square.vue

@@ -2,7 +2,7 @@
 	<view>
 		<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" @tap="goSiteList"  v-for="(item,index) in cuIconList" :key="index">
+				<view class="cu-item justify-center align-center" @tap="goSiteList(item.redirectUrl)"  v-for="(item,index) in cuIconList" :key="index">
 					<image :src="`${item.imgUrl}`" style="width:100rpx;height:100rpx"></image>
 					<view class="cu-tag badge" v-if="item.badge!=0">
 						<block class="cu-tag badge" v-if="item.badge!=1">{{item.badge>99?'99+':item.badge}}</block>
@@ -24,9 +24,10 @@
 			}
 		},
 		methods: {
-			goSiteList() {
+			goSiteList(url) {
+				 // console.log(url);
 				uni.navigateTo({
-					url: '/pages/siteList/siteList',
+					url: url,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages.json

@@ -29,7 +29,7 @@
 		{
 			"path": "pages/processList/processList",
 			"style": {
-				"navigationBarTitleText": "处理列表"
+
 			}
 		},
 		{
@@ -152,7 +152,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        }
+		,{
+		    "path" : "pages/unprocessDetail/unprocessDetail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "未处理",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
         ,{
             "path" : "pages/processedDetail/processedDetail",
             "style" :                                                                                    
@@ -180,6 +189,69 @@
             }
             
         }
+        ,{
+            "path" : "pages/unprocessDetail/opeDataDetail/opeDataDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运行数据",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+		{
+		    "path" : "pages/unprocessDetail/videoDetail/videoDetail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "视频监测",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+        ,{
+            "path" : "pages/deviceManage/deviceDetail/deviceDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "监控画面",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/siteManage/siteManage",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "站点管理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/videoList/videoList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "视频检测",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/videoDetail/videoDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "实时监控",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/messagePush/messagePush",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息推送",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/alarmingList/alarmingList.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<!-- 宫格列表 -->
-		<!-- <square :cuIconList="cuIconList"></square> -->
-		<view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
+		<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"  @tap="goProcessList">
 					<image src="../../static/square-dl.png" style="width:100rpx;height:100rpx"></image>
@@ -16,7 +16,7 @@
 				</view>
 				
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -31,15 +31,17 @@
 		data() {
 			return {
 				// 宫格列表数据
-				// cuIconList: [{
-				// 	imgUrl:'../../static/square-dl.png',
-				// 	badge: 120,
-				// 	name: '电力检测'
-				// }, {
-				// 	imgUrl:'../../static/square-alarm.png',
-				// 	badge: 0,
-				// 	name: '视频告警'
-				// }],
+				cuIconList: [{
+					imgUrl:'../../static/square-dl.png',
+					badge: 120,
+					name: '电力监测',
+					redirectUrl:'/pages/processList/processList?type=1'
+				}, {
+					imgUrl:'../../static/square-alarm.png',
+					badge: 0,
+					name: '视频告警',
+					redirectUrl:'/pages/processList/processList?type=2'
+				}],
 				
 			}
 		},
@@ -47,8 +49,10 @@
 			uni.setNavigationBarTitle({
 				title: '综合报警'
 			});
+			
 		},
 		methods: {
+			
 			// 页面跳转
 			goProcessList() {
 				uni.navigateTo({

pages/deviceManage/deviceManage.vue

@@ -3,9 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
-			 :key="index" :data-target="'move-box-' + index">
+			 :key="index" :data-target="'move-box-' + index" @tap="goDeviceDetail">
 				<view class="cu-avatar round lg" :style="`background-image:url(${item.imgUrl})`"></view>
-				<view class="content" @tap="goDeviceManage">
+				<view class="content" >
 					<view class="">{{item.title}}</view>
 				</view>
 				<view class="nav-right num">
@@ -33,15 +33,18 @@
 				modalName: null,
 			};
 		},
-		methods: {
-			goDeviceManage() {
-				uni.navigateTo({
-					url: '/pages/deviceManage/deviceManage',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
+		methods: {
+			
+			// 页面跳转
+			goDeviceDetail() {
+				uni.navigateTo({
+					url: '/pages/deviceManage/deviceDetail/deviceDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			
 
 
 

pages/deviceType/deviceType.vue

@@ -3,9 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
-			 :key="index" :data-target="'move-box-' + index">
+			 :key="index" :data-target="'move-box-' + index" @tap="hrefKing(index)">
 				<view class="cu-avatar round lg" :style="`background-image:url(${item.imgUrl})`"></view>
-				<view class="content" @tap="goDeviceManage">
+				<view class="content" >
 					<view class="">{{item.title}}</view>
 				</view>
 				<view class="nav-right num">
@@ -40,14 +40,39 @@
 			};
 		},
 		methods: {
-			goDeviceManage() {
-				uni.navigateTo({
-					url: '/pages/deviceManage/deviceManage',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			}
+			// goDeviceManage() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/deviceManage/deviceManage',
+			// 		success: res => {},
+			// 		fail: () => {},
+			// 		complete: () => {}
+			// 	});
+			// },
+			hrefKing(index) {
+			                // log(index)
+			                let url = "";
+			                switch (index) {
+			                    case 0:
+			                        url = "/pages/videoList/videoList"//进口水果
+			                        break;
+			                    case 1:
+			                        url = "/pages/deviceManage/deviceManage"//热门品种
+			                        break;
+			                    
+			                    default:
+			                        break;
+			                }
+			                if (url) {
+			                    uni.navigateTo({
+			                        url: url
+			                    })
+			                } else {
+			                    uni.showToast({
+			                        title:'功能未完成~',
+			                        icon:'none'
+			                    })
+			                }
+			            },
 
 
 

pages/index/index.vue

@@ -51,14 +51,14 @@
 	import chart from './components/chart/chart.vue';
 	import chart2 from './components/chart2/chart2.vue';
 	import chart3 from './components/chart3/chart3.vue';
-	import square from '../../components/square/square.vue';
+	// import square from '../../components/square/square.vue';
 
 	export default {
 		components: {
 			chart,
 			chart2,
 			chart3,
-			square
+			// square
 		},
 		data() {
 			return {
@@ -67,37 +67,40 @@
 				cuIconList: [{
 					imgUrl:'../../static/square1.png',
 					badge: 120,
-					name: '综合报警'
+					name: '综合报警',
+					redirectUrl:'/pages/siteList/siteList?type=1'
 				}, {
 					imgUrl:'../../static/square2.png',
 					badge: 0,
-					name: '运行监测'
+					name: '运行监测',
+					redirectUrl:'/pages/siteList/siteList?type=2'
 				}, {
 					imgUrl:'../../static/square-wb.png',
 					badge: 0,
-					name: '维保'
+					name: '维保',
+					redirectUrl:''
 				}, {
 					imgUrl:'../../static/square-bx.png',
 					badge: 22,
-					name: '报修'
+					name: '报修',
+					redirectUrl:''
 				}, {
 					imgUrl:'../../static/square-rl.png',
 					badge: 0,
-					name: '人脸识别'
+					name: '人脸识别',
+					redirectUrl:''
 				}, {
 					imgUrl:'../../static/square-xj.png',
 					badge: 0,
 					badge: 0,
-					name: '巡检'
-				}, {
-					imgUrl:'../../static/square-sp.png',
-					badge: 0,
-					name: '视频检测'
-				}, {
+					name: '巡检',
+					redirectUrl:''
+				},  {
 					imgUrl:'../../static/square-bz.png',
 					badge: 0,
 					badge: 0,
-					name: '风险保障'
+					name: '风险保障',
+					redirectUrl:''
 				}],
 				Inv: 0,
 

pages/info/info.vue

@@ -1,22 +1,213 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+<template>
+	<view class="processWrapper ">
+		
+		<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"  @tap="goUnprocessDetail">
+						<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.subTitle}}
+								</view>
+							</view>
+							<view class="pro-date ">{{item.time}}</view>
+						</view>
+						<view class="action">
+							<view class="unProcess">{{item.status}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<block v-if="TabCur==1">
+			<view class="processList">
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in processedList" :key="index" @tap="goProcessedDetail">
+						<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.title}}</view>
+							</view>
+							<view class="pro-des  ">
+								<view class="text-cut">
+									{{item.subTitle}}
+								</view>
+							</view>
+							<view class="pro-date ">{{item.time}}</view>
+						</view>
+						<view class="action">
+							<view class="processed">{{item.status}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
+				unporcessList:[{
+					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'
+				},
+				{
+					title:'母线停电',
+					subTitle:'事件未处理测试',
+					status:'未处理',
+					time:'2020-01-08 15:15:12'
+				},
+				{
+					title:'母线停电',
+					subTitle:'事件未处理测试',
+					status:'未处理',
+					time:'2020-01-08 15:15:12'
+				}],
+				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'
+				},
+				{
+					title:'母线停电',
+					subTitle:'事件已处理测试',
+					status:'已处理',
+					time:'2020-01-08 15:15:12'
+				},
+				{
+					title:'母线停电',
+					subTitle:'事件已处理测试',
+					status:'已处理',
+					time:'2020-01-08 15:15:12'
+				}],
 
-<style>
+				
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+				TabCur: 0,
+				
+				tabNav: ['未处理', '已处理']
+			};
+		},
+		methods: {
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			},
+			
+			// 页面跳转
+			goUnprocessDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/unprocessDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goProcessedDetail(){
+				uni.navigateTo({
+					url: '/pages/processedDetail/processedDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
 
+	.processList{
+		position:static;
+	}
+	
 </style>

pages/processList/processList.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="processWrapper ">
+	<view class="processWrapper ">
+		<cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="backText">返回</block><block slot="content">布局</block></cu-custom>
 		<scroll-view scroll-x class="bg-white nav text-center fixed" :style="[{top:CustomBar + 'px'}]">
 			<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav" :key="index" @tap="tabSelect"
 			 :data-id="index">
@@ -180,7 +181,6 @@
 				listTouchDirection: null,
 				CustomBar: this.CustomBar,
 				TabCur: 0,
-				
 				tabNav: ['未处理', '已处理']
 			};
 		},
@@ -213,6 +213,7 @@
 </script>
 
 <style lang="scss">
+	//已处理未处理消息个数样式
 	.nav .cu-item.cur{
 		position:relative;
 		border-bottom: 8rpx solid;

pages/processedDetail/processedDetail.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view>
 					<text>站点地址：</text>
-					<text>沪太路8786弄155号</text>
+					<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
 				</view>
 				<view>
 					<text>联系人：</text>
@@ -41,7 +41,7 @@
 				</view>
 				<view>
 					<text>联系方式：</text>
-					<text>15122423833</text>
+					<text>15122423833<text class="phone icon iconfont" @click="submit()">&#xe61d;</text></text>
 				</view>
 				<view>
 					<text>运行数据：</text>
@@ -98,7 +98,31 @@
 
 			}
 		},
-		methods: {
+		methods: {
+			
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: '15122423833' //仅为示例
+				});
+			},
+			mapLocation(){
+				uni.getLocation({
+				    type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+				    success: function (res) {
+				        const latitude =31.469465;
+				        const longitude = 121.327514;
+						console.log(latitude);
+				        uni.openLocation({
+				            latitude: latitude,
+				            longitude: longitude,
+				            success: function () {
+				                console.log('success');
+				            }
+				        });
+				    }
+				});
+			},
+			
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},

pages/setting/setting.vue

@@ -1,22 +1,111 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
+<template>
+	<view class="setting-wrapper">
+		<view class="top-banner justify-center align-center text-center">
+			<view>
+				<image width="130" src="../../static/personal-head.png"></image>
+				<view class="userName">admin</view>
+				<view>伍继智慧用电</view>
+			</view>
+		</view>
+		<view class="cu-list menu-avatar">
+			<view class="cu-item" @tap="goMessagePush()">
+				<view class="cu-avatar " style="background-image:url(../../static/setting-icon1.png)"></view>
+				<view class="content">
+					<view class="">消息推送</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+			<view class="cu-item" @tap="goSiteManage">
+				<view class="cu-avatar " style="background-image:url(../../static/setting-icon2.png)"></view>
+				<view class="content">
+					<view class="">站点管理</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+			<view class="cu-item" @tap="goSiteManage">
+				<view class="cu-avatar " style="background-image:url(../../static/setting-icon3.png)"></view>
+				<view class="content">
+					<view class="">设备管理</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			}
+		},
 		methods: {
-			
+			goSiteManage() {
+				uni.navigateTo({
+					url: '/pages/siteManage/siteManage',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goMessagePush() {
+				uni.navigateTo({
+					url: '/pages/messagePush/messagePush',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.setting-wrapper {
+		.top-banner {
+			width: 100%;
+			height: 380rpx;
+			background: url(../../static/setting-bg.png) no-repeat;
+			color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			image {
+				width: 130rpx;
+				height: 130rpx;
+			}
+			.userName {
+				margin-top: 30rpx;
+				margin-bottom: 10rpx;
+			}
+		}
+		.cu-avatar {
+			width:40rpx;height:40rpx;
+			background-color:#fff;
 		}
-	}
-</script>
-
-<style>
-
+		.cu-list.menu-avatar>.cu-item {
+			height:120rpx;
+			.content{
+				left:70rpx;
+			}
+			.nav-right{
+				margin-right:10rpx;
+			}
+		}
+
+	}
 </style>

pages/siteList/siteList.vue

@@ -1,114 +1,97 @@
 <template>
-	<view class="site-wrapper">
-		<!-- 筛选框start -->
-		<view class="cu-bar search bg-gray filter-section" :style="[{top:CustomBar + 'px'}]">
-			<view class="search-form round bg-white">
-				<text class="cuIcon-search"></text>
-				<input class="" @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="请输入站点名称"
-				 confirm-type="search"></input>
-			</view>
-			<view class="action">
-				<button class="cu-btn bg-blue round">查询</button>
-			</view>
-		</view>
-		<!-- 筛选框end -->
-		
+	<view class="site-wrapper">
+
+
 		<!-- 站点列表start -->
-		<view class="site-items" :style="[{top:CustomBar + 'px'}]">
-			<view class="cu-list menu-avatar">
-				<view class="cu-item"  :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in 12" :key="index"
-					 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
-					<view class="cu-avatar round lg" style="background-image: url(../../static/site-icon.png);"></view>
-					<view class="content" @tap="goAlarmingList">
-					<!-- <view class="content" @tap="goDeviceType"> -->
-						<view class="text-grey site-tit">测试站点一</view>
-					</view>
-					<view class="nav-right">
-						<view class="text-grey text-xs">
-							<image src="../../static/nav-icon.png" style="width:25rpx;height:25rpx"></image>
+		<view class="site-items" :style="[{top:CustomBar + 'px'}]">
+			<view class="cu-list menu-avatar">
+				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteListData"
+				 :key="index" :data-target="'move-box-' + index">
+					<view class="cu-avatar round lg"  v-if="type==1"  style="background-image: url(../../static/site-icon-alarm.png);"></view>
+					<view class="cu-avatar round lg" v-else style="background-image: url(../../static/site-icon.png);"></view>
+					<view class="content" v-if="type==1" @tap="goAlarmingList">
+						<view class="text-grey site-tit">
+							{{item.siteName}}
+							<text>（共3个未处理告警）</text>
+						</view>
+						
+					</view>
+					<view class="content" v-else @tap="goDeviceType">
+						<view class="text-grey site-tit">
+							{{item.siteName}}
+							<text>（共3个设备）</text>
+
 						</view>
+						
 					</view>
-					<view class="move">
-						<view class="bg-grey">编辑</view>
-						<view class="bg-red">删除</view>
-					</view>
-				</view>
+					<view class="nav-right num">
+						<view class="text-grey">
+							<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+						</view>
+					</view>
+
+
+				</view>
 			</view>
 
 		</view>
-		<!-- 站点列表end
-		
-		<!-- 新增按钮start -->
-		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx"></image>
-		</view>
-		<!-- 新增按钮end -->
+		<!-- 站点列表end -->
+
+
 	</view>
 
 </template>
 
 <script>
+	import json from '../../data/json.js';
+
 	export default {
-		data() {
-			return {
-		
-				modalName: null,
-				listTouchStart: 0,
-				listTouchDirection: null,
-				CustomBar: this.CustomBar,
-			};
-		},
-		methods: {
-			
-			// 页面跳转
-			goAlarmingList() {
-				uni.navigateTo({
-					url: '/pages/alarmingList/alarmingList',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goDeviceType() {
-				uni.navigateTo({
-					url: '/pages/deviceType/deviceType',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			
-			InputFocus(e) {
-				this.InputBottom = e.detail.height
-			},
-			InputBlur(e) {
-				this.InputBottom = 0
-			},
-		
-			// ListTouch触摸开始
-			ListTouchStart(e) {
-				this.listTouchStart = e.touches[0].pageX
-			},
-		
-			// ListTouch计算方向
-			ListTouchMove(e) {
-				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
-			},
-		
-			// ListTouch计算滚动
-			ListTouchEnd(e) {
-				if (this.listTouchDirection == 'left') {
-					this.modalName = e.currentTarget.dataset.target
-				} else {
-					this.modalName = null
-				}
-				this.listTouchDirection = null
-			}
+		data() {
+			return {
+				type: '0',
+
+				siteListData: json.siteListData,
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+			};
+		},
+
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
+		},
+		methods: {
+
+
+
+			// 页面跳转
+			goAlarmingList() {
+				uni.navigateTo({
+					url: '/pages/alarmingList/alarmingList',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goDeviceType() {
+				uni.navigateTo({
+					url: '/pages/deviceType/deviceType',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+
+
+
 		}
-		
+
 	}
 </script>
 
 <style>
-	
+
 </style>

pages/unprocessDetail/unprocessDetail.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view>
 					<text>站点地址：</text>
-					<text>沪太路8786弄155号</text>
+					<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
 				</view>
 				<view>
 					<text>联系人：</text>
@@ -41,15 +41,18 @@
 				</view>
 				<view>
 					<text>联系方式：</text>
-					<text>15122423833</text>
+					<text>
+						15122423833 
+						<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
+					</text>
 				</view>
 				<view>
 					<text>运行数据：</text>
-					<text class="checkMore">点击查看</text>
+					<text class="checkMore" @tap="goOpeDataDetail">点击查看</text>
 				</view>
 				<view>
 					<text>视频：</text>
-					<text class="checkMore">点击查看</text>
+					<text class="checkMore" @tap="goVideoDetail">点击查看</text>
 				</view>
 			</view>
 		</view>
@@ -102,11 +105,53 @@
 				radio: 'A',
 				radio: 'B',
 				modalName: null,
-				reason: ''
-
+				reason: '',
 			}
 		},
 		methods: {
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: '15122423833' //仅为示例
+				});
+			},
+			mapLocation(){
+				uni.getLocation({
+				    type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+				    success: function (res) {
+				        const latitude =31.469465;
+				        const longitude = 121.327514;
+						console.log(latitude);
+				        uni.openLocation({
+				            latitude: latitude,
+				            longitude: longitude,
+				            success: function () {
+				                console.log('success');
+				            }
+				        });
+				    }
+				});
+			},
+
+			// 页面跳转
+			goOpeDataDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goVideoDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/videoDetail/videoDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+
+			},
+
+
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},
@@ -140,7 +185,9 @@
 			color: #999999;
 		}
 
-	}
+	}
+	
+
 	// textarea
 	.JTxtArea {
 		position: relative;
@@ -152,10 +199,11 @@
 		&.lg {
 			min-height: 100rpx;
 		}
+
 		&:after {
 			content: attr(data-maxnum);
 			position: absolute;
-			right:10rpx;
+			right: 10rpx;
 			bottom: 0px;
 		}
 	}

static/iconfont/iconfont.css

@@ -3,14 +3,15 @@
 
 
 
+
 @font-face {
   font-family: 'iconfont';  /* project id 2394829 */
-  src: url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.eot');
-  src: url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot');
+  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.svg#iconfont') format('svg');
 }
 
 .iconfont {

unpackage/dist/dev/app-plus/static/iconfont/iconfont.css

@@ -3,14 +3,15 @@
 
 
 
+
 @font-face {
   font-family: 'iconfont';  /* project id 2394829 */
-  src: url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.eot');
-  src: url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_2394829_c89vlstyj6b.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot');
+  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.svg#iconfont') format('svg');
 }
 
 .iconfont {