消息推送 管理新增 分析 视频详情页排版 主页两个echarts图表完善

App.vue

@@ -17,6 +17,10 @@
 	@import "colorui/main.css";
 	@import "colorui/icon.css";
 	@import "static/iconfont/iconfont.css";
-	@import "common/common.css";
-	
+/* 	@import "common/common.css";
+ */</style>
+
+<style lang="scss">
+	@import "common/common.scss";
 </style>
+

colorui/main.css

@@ -271,8 +271,8 @@ radio.radio .uni-radio-input-checked::after {
 
 .switch-sex[checked] .wx-switch-input,
 .switch-sex.checked .uni-switch-input {
-	background: #0081ff !important;
-	border-color: #0081ff !important;
+	background: #4074E7 !important;
+	border-color: #4074E7 !important;
 }
 
 switch.red[checked] .wx-switch-input.wx-switch-input-checked,
@@ -354,8 +354,8 @@ radio.blue[checked] .wx-radio-input,
 switch.blue.checked .uni-switch-input,
 checkbox.blue.checked .uni-checkbox-input,
 radio.blue.checked .uni-radio-input {
-	background-color: #0081ff !important;
-	border-color: #0081ff !important;
+	background-color: #4074E7 !important;
+	border-color: #4074E7 !important;
 	color: #ffffff !important;
 }
 
@@ -3360,7 +3360,7 @@ scroll-view.cu-steps .cu-item {
 
 .line-blue::after,
 .lines-blue::after {
-	border-color: #0081ff;
+	border-color: #4074E7;
 }
 
 .line-purple::after,
@@ -3434,7 +3434,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-blue {
-	background-color: #0081ff;
+	background-color: #4074E7;
 	color: #ffffff;
 }
 
@@ -3519,7 +3519,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-blue.light {
-	color: #0081ff;
+	color: #4074E7;
 	background-color: #cce6ff;
 }
 
@@ -3574,7 +3574,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-gradual-blue {
-	background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
+	background-image: linear-gradient(45deg, #4074E7, #1cbbb4);
 	color: #ffffff;
 }
 
@@ -3860,7 +3860,7 @@ scroll-view.cu-steps .cu-item {
 .text-blue,
 .line-blue,
 .lines-blue {
-	color: #0081ff;
+	color: #4074E7;
 }
 
 .text-purple,

common/common.css → common/common.scss

@@ -2,7 +2,12 @@
 body {
 	font-size: 32rpx;
 }
-
+
+radio,checkbox {
+			transform: scale(0.77)
+}
+
+		
 /* 九宫格样式 */
 .cu-list.grid>.cu-item uni-text {
 	color: #333;
@@ -18,14 +23,14 @@ body {
 }
 
 .iconfont.phone {
-		color:#08BE04;
+		color:#08BE04!important;
 		font-size:45rpx;
 		position:relative;
 		top:6rpx;
 		left:10rpx;
 	}
 	.iconfont.map{
-		color:#4074E7;
+		color:#4074E7!important;
 		font-size:38rpx;
 	}
 	
@@ -55,11 +60,11 @@ body {
 	width: 460rpx;
 }
 
-.unProcess {
+.unProcess,.error {
 	color: #FF4E00
 }
 
-.processed {
+.processed ,.online{
 	color: #08BE04
 }
 
@@ -68,7 +73,7 @@ body {
 /* 站点列表页 */
 /* 筛选框 */
 .filter-section {
-	position: fixed;
+	/* position: fixed; */
 	/* top: 88rpx; */
 	width: 100%;
 	z-index: 9
@@ -106,7 +111,21 @@ body {
 	right: 20rpx
 }
 
-
+.ding{
+		position: sticky;
+			/* #ifdef H5 */
+			top: 44px;
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+			z-index: 999;
+			flex: 1;
+			flex-direction: column;
+			overflow: hidden;
+			background-color: #ffffff;
+	
+	}
 /* 已处理未处理列表 */
 .processList .cu-list.menu-avatar .cu-item {
 	height: 178rpx;
@@ -125,7 +144,7 @@ body {
 .pro-res {}
 
 .processList {
-	position: fixed;
+	/* position: fixed; */
 	top: 100rpx;
 	width: 100%;
 	height: calc(100% - 100rpx);
@@ -169,3 +188,43 @@ body {
 	width: 160rpx;
 	display: inline-block
 }
+.info-content view text:last-child {
+	color:#333
+}
+
+
+.analyse-wrapper {
+		.top-banner {
+			width: 100%;
+			height: 273rpx;
+			background: url(/static/analyse-bg.png) no-repeat;
+			background-size:cover;
+			
+		}
+		.cu-list.menu-avatar .cu-item{
+		
+			margin:30rpx 0 0;
+			margin-left:0;
+			
+			.cu-avatar{
+				background-color:rgba(0,0,0,0);
+				left:26rpx;
+			}
+			.content{
+				left:130rpx;
+				font-size:32rpx;
+			}
+		}
+		
+		
+
+	}
+	
+	
+	.submitBottomBtn {
+		position: fixed;
+		width: calc(100% - 40rpx);
+		bottom: 44rpx;
+		z-index: 999;
+		background-color: #ffffff;
+	}

data/json.js

@@ -0,0 +1,55 @@
+// 本地模拟json数据
+let siteListData = [{
+  "id"	: 1,
+  "siteName":'测试站点一'
+},
+{
+  "id"	: 2,
+   "siteName":'测试站点二'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 4,
+   "siteName":'测试站点四'
+},
+{
+  "id"	: 5,
+   "siteName":'测试站点五'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+{
+  "id"	: 3,
+   "siteName":'测试站点三'
+},
+]
+
+// 定义数据出口
+module.exports = {
+  siteListData: siteListData
+}

pages.json

@@ -1,66 +1,97 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
-		
+
+
 		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		},
-		{
-			"path": "pages/alarmingList/alarmingList"
-			
-		},
-		
+		},
+		{
+			"path": "pages/alarmingList/alarmingList"
+
+		},
+
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
-
-			}
-		},
-		{
-			"path": "pages/siteList/siteList",
-			"style": {
-				"navigationBarTitleText": "站点列表"
-			}
-		},
-		{
-			"path": "pages/processList/processList",
-			"style": {
-
-			}
-		},
-		{
-			"path": "pages/unprocessDetail/unprocessDetail",
-			"style": {
-				"navigationBarTitleText": "未处理详情页"
-			}
-		},
-		{
-			"path": "pages/processedDetail/processedDetail",
-			"style": {
-				"navigationBarTitleText": "处理详情页"
-			}
-		},
-		
-		{
-			"path": "pages/deviceType/deviceType",
-			"style": {
-				"navigationBarTitleText": "设备类型"
-			}
-		},
-		{
-			"path": "pages/deviceManage/deviceManage",
-			"style": {
-				"navigationBarTitleText": "设备管理"
-			}
-		},
-		
-	
-		
-		
+				"navigationBarTitleText": "首页",
+				"app-plus": {
+
+					// "titleNView": {
+					// 	"buttons": [{
+					// 			"text": "扫一扫",
+					// 			"fontSize": "22",
+					// 			"redDot": true
+					// 		},
+					// 		{
+
+					// 			"text": "",
+					// 			"fontSize": "22",
+					// 			"select": true,
+					// 			"width": "auto"
+					// 		}
+					// 	]
+					// }
+					// "titleNView": {
+					// 	"titleText": "",
+					// 	"tags": [{
+					// 		"tag": "img",
+					// 		"src": "/static/nav.png",
+					// 		"position": {
+					// 			"left": "auto",
+					// 			"top": "auto",
+					// 			"width": "110px",
+					// 			"height": "26px"
+					// 		}
+					// 	}]
+					// }
+				}
+
+			}
+		},
+		{
+			"path": "pages/siteList/siteList",
+			"style": {
+				"navigationBarTitleText": "站点列表"
+			}
+		},
+		{
+			"path": "pages/processList/processList",
+			"style": {
+				"navigationBarTitleText": "处理列表"
+			}
+		},
+		{
+			"path": "pages/unprocessDetail/unprocessDetail",
+			"style": {
+				"navigationBarTitleText": "未处理"
+			}
+		},
+		{
+			"path": "pages/processedDetail/processedDetail",
+			"style": {
+				"navigationBarTitleText": "处理"
+			}
+		},
+
+		{
+			"path": "pages/deviceType/deviceType",
+			"style": {
+				"navigationBarTitleText": "设备类型"
+			}
+		},
+		{
+			"path": "pages/deviceManage/deviceManage",
+			"style": {
+				"navigationBarTitleText": "设备管理"
+			}
+		},
+
+
+
+
 		{
 			"path": "pages/info/info",
 			"style": {
@@ -81,186 +112,165 @@
 		}
 
 
-	    ,{
-            "path" : "pages/index/components/chart/chart",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/components/chart2/chart2",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/components/chart3/chart3",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/siteList/siteList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "站点列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/alarmingList/alarmingList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "综合报警",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/processList/processList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "处理列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "components/square/square",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/unprocessDetail/unprocessDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "未处理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/unprocessDetail/unprocessDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "未处理",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/processedDetail/processedDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "已处理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/deviceType/deviceType",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备类型",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/deviceManage/deviceManage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/unprocessDetail/opeDataDetail/opeDataDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运行数据",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pages/unprocessDetail/videoDetail/videoDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "视频监测",
-		        "enablePullDownRefresh": false
-		    }
-		    
+		, {
+			"path": "pages/index/components/chart/chart",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/components/chart2/chart2",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/components/chart3/chart3",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/siteList/siteList",
+			"style": {
+				"navigationBarTitleText": "站点列表",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/alarmingList/alarmingList",
+			"style": {
+				"navigationBarTitleText": "综合报警",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/processList/processList",
+			"style": {
+				"navigationBarTitleText": "处理列表",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "components/square/square",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/unprocessDetail/unprocessDetail",
+			"style": {
+				"navigationBarTitleText": "未处理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/unprocessDetail/unprocessDetail",
+			"style": {
+				"navigationBarTitleText": "未处理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/processedDetail/processedDetail",
+			"style": {
+				"navigationBarTitleText": "已处理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/deviceType/deviceType",
+			"style": {
+				"navigationBarTitleText": "设备类型",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/deviceManage/deviceManage",
+			"style": {
+				"navigationBarTitleText": "设备管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"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
+			}
+
+		},
+		{
+			"path": "pages/add/add",
+			"style": {
+				"navigationBarTitleText": "设备新增",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/components/chart4/chart4",
+			"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",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
-	"tabBar": {
-		"borderStyle":"white",
+	"tabBar": {
+		"borderStyle": "white",
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/home.png",
@@ -285,12 +295,12 @@
 				"iconPath": "static/setting.png",
 				"selectedIconPath": "static/setting-selected.png",
 				"text": "设置"
-			}
-			// {
-			// 	"pagePath": "pages/login/login",
-			// 	"iconPath": "static/setting.png",
-			// 	"selectedIconPath": "static/setting-selected.png",
-			// 	"text": "登录"
+			}
+			// {
+			// 	"pagePath": "pages/login/login",
+			// 	"iconPath": "static/setting.png",
+			// 	"selectedIconPath": "static/setting-selected.png",
+			// 	"text": "登录"
 			// }
 		]
 

pages/add/add.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="appWrapper padding-sm">
+		<form action="">
+			<view class="form-item margin-top">
+				<view class="title">设备编号:</view>
+				<input name="input"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">设备名称:</view>
+				<input name="input"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">安装位置:</view>
+				<input name="input"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">所属楼层:</view>
+				<select name="" id="">
+					<option value="">楼层一</option>
+					<option value="">楼层一</option>
+					<option value="">楼层一</option>
+				</select>
+			</view>
+			<view class="form-item">
+				<view class="title">站点:</view>
+				<select name="" id="">
+					<option value="">站点一</option>
+					<option value="">站点一</option>
+					<option value="">站点一</option>
+				</select>
+			</view>
+			<view class="form-item">
+				<view class="title">设备类型:</view>
+				<select name="" id="">
+					<option value="">智慧用电</option>
+					<option value="">视频监控</option>
+				</select>
+			</view>
+			
+			<view class="btn-area submitBottomBtn">
+				<button class="bg-blue round  margin-top">提 交 </button>
+			</view>
+		</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				index: -1,
+				picker: ['楼层一', '楼层二', '楼层三'],
+
+			}
+		},
+		methods: {
+			PickerChange(e) {
+				this.index = e.detail.value
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.cu-form-group {
+		border-top: 0;
+
+	}
+
+	input,
+	select,
+	option {
+		line-height: 70rpx;
+		padding: 0 20rpx;
+		height: 70rpx;
+		border: 1px solid #EDEDED;
+		// width:500rpx!important;
+		background-color: #fff;
+		box-sizing: border-box;
+		appearance: none;
+		-moz-appearance: none;
+		-webkit-appearance: none;
+		color: #999;
+
+
+	}
+
+	select:focus,
+	select:active,
+	select:hover {
+		outline: none;
+	}
+	select {
+	    background: url(../../static/arrow.png) no-repeat scroll 98% center;
+	    background-size: 6%;
+	}
+
+
+	.form-item {
+		padding: 0 40rpx;
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+
+		.title {
+			width: 170rpx;
+		}
+
+		input,
+		select {
+			width: 500rpx;
+			font-size:28rpx;
+		}
+
+
+	}
+</style>

pages/analyse/analyse.vue

@@ -1,22 +1,81 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
+<template>
+	<view class="analyse-wrapper">
+		<view class="top-banner justify-center align-center text-center">
+			
+		</view>
+		<view class="cu-list menu-avatar padding-lr">
+			<view class="cu-item shadow">
+				<view class="cu-avatar " style="background-image:url(../../static/yb-icon.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  shadow" >
+				<view class="cu-avatar " style="background-image:url(../../static/build-icon.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: {
-			
-		}
-	}
+			
+
+		}
+	}
 </script>
-
 <style>
-
+	.shadow {
+		box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+	}
+</style>
+
+<style lang="scss">  
+
+	// .analyse-wrapper {
+	// 	.top-banner {
+	// 		width: 100%;
+	// 		height: 273rpx;
+	// 		background: url(../../static/analyse-bg.png) no-repeat;
+	// 		background-size:cover;
+			
+	// 	}
+	// 	.cu-list.menu-avatar .cu-item{
+		
+	// 		margin:30rpx 0 0;
+	// 		margin-left:0;
+			
+	// 		.cu-avatar{
+	// 			background-color:rgba(0,0,0,0);
+	// 			left:26rpx;
+	// 		}
+	// 		.content{
+	// 			left:130rpx;
+	// 			font-size:32rpx;
+	// 		}
+	// 	}
+		
+		
+
+	// }
 </style>

pages/deviceManage/deviceDetail/deviceDetail.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="wrapper">
+		<image src="../../../static/device-bg.png"></image>
+		<!-- <image src="../../static/device-bg.png" alt=""></image> -->
+		<view class="left-items">
+			<view class="device-item">12</view>
+			<view class="device-item">12</view>
+			<view class="device-item">1212</view>
+			<view class="device-item">2121</view>
+		</view>
+		
+		<view class="right-items">
+			<view class="device-item">2121</view>
+			<view class="device-item">2121</view>
+			<view class="device-item">2121</view>
+			<view class="device-item">3333</view>
+			<view class="device-item">2121</view>
+			<view class="device-item">433</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff", //文字颜色
+				backgroundColor: "#000033", //底部背景色
+		
+			})
+			
+		
+		},
+		methods: {
+			
+		}
+	}
+</script>
+	
+<style lang="scss">
+	image{
+		height:1206rpx;
+		width:750rpx;
+		// height: calc(100vh - 88rpx);
+		
+	}
+	.wrapper{
+		width:100%;
+		height: calc(100vh - 80rpx);
+		background-color:#000033;
+		// background-image:url(../../../static/device-bg.png);
+		// background-size:cover;
+		position:relative;
+		.left-items{
+			position:absolute;
+			top:100rpx;
+			left:134rpx;
+		}
+		.right-items{
+			position:absolute;
+			top:100rpx;
+			left:530rpx;
+			
+		}
+		.device-item{
+			width:100rpx;
+			margin-bottom:32rpx;
+			height:42rpx;
+			// background:pink;
+			font-size:28rpx;
+			text-align:left;
+			padding-left:10rpx;
+			line-height:42rpx;
+		
+		}
+		.device-item:nth-child(3){
+			margin-bottom:94rpx;
+		};
+		
+		
+	}
+
+</style>

pages/index/components/chart2/chart2.vue

@@ -7,6 +7,25 @@
 </template>
 
 <script>
+	let echartData = [{
+			name: "报警",
+			value: 1000
+		},
+		{
+			name: "事件",
+			value: 2920
+		},
+		{
+			name: "隐患",
+			value: 2200
+		},
+
+	];
+	let title = '总数';
+	let total = echartData.reduce((a, b) => {
+		return a + b.value * 1
+	}, 0);
+
 	export default {
 		data() {
 			return {
@@ -15,35 +34,72 @@
 				option: {
 
 					title: {
-
 						left: 'center'
 					},
 					tooltip: {
-						trigger: 'item'
+						trigger: 'item',
+						formatter: "{a} <br/>{b}: {c} ({d}%)"
 					},
-					legend: {
-						left: 'center'
+					title: [{ //aa标题
+						text: '{val|' + total + '}\n{name|' + title + '}',
+						top: '45%',
+						left: 'center',
+						textStyle: {
+							rich: {
+								name: {
+									fontSize: 14,
+									fontWeight: 'normal',
+									color: '#666666',
+									padding: [5, 0]
+								},
+								val: {
+									fontSize: 24,
+									color: '#333333',
+								}
+							}
+						}
+					}],
+					legend: { //aa图例
+						orient: 'horizontal',
+						icon: 'circle',
+						itemWidth: 12,
+						itemHeight: 12,
+						itemGap: 60,
+						// top: -10,
+						textStyle: {
+
+							fontSize: 14,
+							rich: {
+								name: {
+									fontSize: 18
+								},
+								value: {
+									fontSize: 14,
+									padding: [0, 20, 0, 5]
+								},
+
+							}
+						},
 					},
 					color: ['#F67F32', '#3BD2BD', '#1DABFE'],
 					series: [{
 						name: '访问来源',
 						type: 'pie',
-						radius: ['35%', '60%'],
-						center: ['50%', '50%'],
-						data: [{
-								value: 1048,
-								name: '报警'
-							},
-							{
-								value: 735,
-								name: '隐患'
-							},
-							{
-								value: 580,
-								name: '事件'
+						radius: ['40%', '60%'],
+						center: ['50%', '55%'],
+						itemStyle: {
+							normal: {
+
+								shadowBlur: 20,
+								shadowColor: '#F9F5F7',
+								shadowOffsetX: 0,
+								shadowOffsetY: 0,
+
+
 							},
+						},
 
-						],
+						data: echartData,
 						emphasis: {
 							itemStyle: {
 								shadowBlur: 10,

pages/index/components/chart4/chart4.vue

@@ -0,0 +1,210 @@
+<template>
+	<view class="content">
+
+		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts" class="echarts"></view>
+
+	</view>
+</template>
+
+<script>
+	let title = '报警总数';
+	let echartData = [{
+			name: "报警",
+			value: 1000
+		},
+		{
+			name: "事件",
+			value: 2920
+		},
+		
+
+	];
+
+	let formatNumber = function(num) {
+		let reg = /(?=(\B)(\d{3})+$)/g;
+		return num.toString().replace(reg, ',');
+	}
+	let total = echartData.reduce((a, b) => {
+		return a + b.value * 1
+	}, 0);
+
+	export default {
+		data() {
+			return {
+				option: {
+					color: ['#67e0e3', '#e062ae'],
+					tooltip: {
+						trigger: 'item',
+						                formatter: "{a} <br/>{b}: {c} ({d}%)"
+					},
+
+					title: [{ //aa标题
+						text: '{val|' + total + '}\n{name|' + title + '}',
+						top: '45%',
+						left: 'center',
+						textStyle: {
+							rich: {
+								name: {
+									fontSize: 14,
+									fontWeight: 'normal',
+									color: '#666666',
+									padding: [5, 0]
+								},
+								val: {
+									fontSize: 24,
+									color: '#333333',
+								}
+							}
+						}
+					}],
+					legend: { //aa图例
+						orient: 'horizontal',
+						icon: 'circle',
+						itemWidth: 12,
+						itemHeight: 12,
+						itemGap: 60,
+						// top: -10,
+						textStyle: {
+
+							fontSize: 14,
+							rich: {
+								name: {
+									fontSize: 18
+								},
+								value: {
+									fontSize: 14,
+									padding: [0, 20, 0, 5]
+								},
+
+							}
+						},
+					},
+					series: [{
+						name: '报警分析',
+						type: 'pie',
+						radius: ['40%', '60%'], //aa环装圈粗细
+						center: ['50%', '55%'],
+
+						itemStyle: {
+							normal: {
+
+								shadowBlur: 20,
+								shadowColor: '#F9F5F7',
+								shadowOffsetX: 0,
+								shadowOffsetY: 0,
+
+								
+							},
+						},
+
+						data: echartData,
+						
+						labelLine: {
+							normal: {
+								length: 10, //aa折线长度
+								length2: 20, //aa折线长度
+
+							}
+						},
+						label: {
+							normal: {
+								// formatter: '{a|{b}：{d}%}',
+								formatter: params => {
+									var percent = 0;
+									var total = 0;
+									for (var i = 0; i < echartData.length; i++) {
+										total += echartData[i].value;
+									}
+									console.log(111);
+									console.log(total);
+
+									percent = ((params.value / total) * 100).toFixed(0);
+									return params.name + ': ' + percent + '%';
+
+								},
+								// padding: [0, -60, 25, -60], //aa折线上的文字位置
+								rich: {
+									name: {
+										fontSize: 14,
+										padding: [0, 10, 0, -5],
+										
+									},
+									value: {
+										fontSize: 14,
+										// fontWeight: 'bold',
+										
+									}
+								}
+							}
+						},
+					}]
+				}
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			changeOption() {
+				const data = this.option.series[0].data
+				// 随机更新示例数据
+				data.forEach((item, index) => {
+					data.splice(index, 1, Math.random() * 40)
+				})
+			},
+			onViewClick(options) {
+				console.log(options)
+			}
+		}
+	}
+</script>
+
+<script module="echarts" lang="renderjs">
+	let myChart
+	export default {
+		mounted() {
+			if (typeof window.echarts === 'function') {
+				this.initEcharts()
+			} else {
+				// 动态引入较大类库避免影响页面展示
+				const script = document.createElement('script')
+				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
+				script.src = 'static/echarts.js'
+				script.onload = this.initEcharts.bind(this)
+				document.head.appendChild(script)
+			}
+		},
+		methods: {
+			initEcharts() {
+				myChart = echarts.init(document.getElementById('echarts'))
+				// 观测更新的数据在 view 层可以直接访问到
+				myChart.setOption(this.option)
+			},
+			updateEcharts(newValue, oldValue, ownerInstance, instance) {
+				// 监听 service 层数据变更
+				myChart.setOption(newValue)
+			},
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.echarts {
+		width: 100%;
+		height: 500rpx;
+		margin-top: 70rpx;
+	}
+</style>

pages/index/index.vue

@@ -10,7 +10,8 @@
 			</view>
 			<view>
 				<view v-if="Inv == 0">
-					<chart></chart>
+					<!-- <chart></chart> -->
+					<chart4></chart4>
 				</view>
 				<view v-if="Inv == 1">
 					
@@ -51,6 +52,7 @@
 	import chart from './components/chart/chart.vue';
 	import chart2 from './components/chart2/chart2.vue';
 	import chart3 from './components/chart3/chart3.vue';
+	import chart4 from './components/chart4/chart4.vue';
 	// import square from '../../components/square/square.vue';
 
 	export default {
@@ -58,6 +60,7 @@
 			chart,
 			chart2,
 			chart3,
+			chart4
 			// square
 		},
 		data() {

pages/login/login.vue

@@ -96,9 +96,9 @@
 
 <style>
 	.section {
-		height: calc(100vh - 190rpx);
+		height: 400rpx;
 		background-image: url(/static/login-bg.png);
-		background-size: contain;
+		background-size: cover;
 		background-repeat: no-repeat;
 	}
 

pages/messagePush/messagePush.vue

@@ -0,0 +1,125 @@
+<template>
+	<view class="padding-sm">
+
+		<form action="">
+			<checkbox-group class="block" @change="CheckboxChange">
+				<view class="  margin-top  ">
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[0].checked?'checked':''" :checked="checkbox[0].checked?true:false" value="A"></checkbox>
+						<view class="title">电力监测</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[1].checked?'checked':''" :checked="checkbox[1].checked?true:false" value="B"></checkbox>
+						<view class="title">视频报警</view>
+					</view>
+					<!-- <view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[2].checked?'checked':''" :checked="checkbox[2].checked?true:false" value="C"></checkbox>
+						<view class="title">火警报警</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[3].checked?'checked':''" :checked="checkbox[3].checked?true:false" value="D"></checkbox>
+						<view class="title">火警报警</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[4].checked?'checked':''" :checked="checkbox[4].checked?true:false" value="E"></checkbox>
+						<view class="title">火警报警</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[5].checked?'checked':''" :checked="checkbox[5].checked?true:false" value="F"></checkbox>
+						<view class="title">火警报警</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[6].checked?'checked':''" :checked="checkbox[6].checked?true:false" value="G"></checkbox>
+						<view class="title">火警报警</view>
+					</view>
+					<view class="flex align-center checkItems">
+						<checkbox class="blue" :class="checkbox[7].checked?'checked':''" :checked="checkbox[7].checked?true:false" value="H"></checkbox>
+						<view class="title">火警报警</view>
+					</view> -->
+				</view>
+
+			</checkbox-group>
+
+
+
+			<view class="btn-area submitBottomBtn">
+				<button class="bg-blue round  margin-top">提 交 </button>
+			</view>
+
+		</form>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				checkbox: [{
+						value: 'A',
+						checked: false
+					},
+					{
+						value: 'B',
+						checked: false
+					},
+					{
+						value: 'C',
+						checked: false
+					},
+					{
+						value: 'D',
+						checked: false
+					},
+					{
+						value: 'E',
+						checked: false
+					},
+					{
+						value: 'F',
+						checked: false
+					},
+					{
+						value: 'G',
+						checked: false
+					},
+					{
+						value: 'H',
+						checked: false
+					}
+				],
+
+			}
+		},
+		methods: {
+			CheckboxChange(e) {
+				var items = this.checkbox,
+					values = e.detail.value;
+				for (var i = 0, lenI = items.length; i < lenI; ++i) {
+					items[i].checked = false;
+					for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
+						if (items[i].value == values[j]) {
+							items[i].checked = true;
+							break
+						}
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.checkItems {
+		width: 50%;
+		display: inline-block;
+		text-align: center;
+		margin-bottom: 40rpx;
+
+		.title {
+			display: inline-block;
+			margin-left: 10rpx;
+		}
+	}
+	
+</style>

pages/processList/processList.vue

@@ -1,19 +1,22 @@
 <template>
-	<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">
-				<view class="cu-tag badge" >
-					<block class="cu-tag badge" v-if="item.badge!=1">99</block>
-				</view>
-				{{tabNav[index]}}
-			</view>
-		</scroll-view>
+	<view class="processWrapper ">
+		<!-- 		<cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="backText">返回</block><block slot="content">布局</block></cu-custom>
+ -->	<view class="ding">
+	 <scroll-view scroll-x class="bg-white nav text-center" >
+	 	<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav" :key="index" @tap="tabSelect"
+	 	 :data-id="index">
+	 		<view class="cu-tag badge">
+	 			<block class="cu-tag badge" v-if="item.badge!=1">99</block>
+	 		</view>
+	 		{{tabNav[index]}}
+	 	</view>
+	 </scroll-view>
+ </view>
+		
 		<block v-if="TabCur==0">
-			<view class="processList">
+			<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-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">
@@ -34,26 +37,26 @@
 			</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 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>
 
@@ -63,119 +66,121 @@
 <script>
 	export default {
 		data() {
-			return {
-				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'
-				}],
-
-				
+			return {
+				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'
+					}
+				],
+
+
 				modalName: null,
 				listTouchStart: 0,
 				listTouchDirection: null,
@@ -188,46 +193,51 @@
 			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: () => {}
-				});
-				
+			},
+
+			// 页面跳转
+			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">
+<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{
-			color:#4274E7
-		}
+	
+	.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 {
+			color: #4274E7
+		}
+	}
 </style>

pages/setting/setting.vue

@@ -79,7 +79,8 @@
 		.top-banner {
 			width: 100%;
 			height: 380rpx;
-			background: url(../../static/setting-bg.png) no-repeat;
+			background: url(../../static/setting-bg.png) no-repeat;
+			background-size:cover;
 			color: #fff;
 			display: flex;
 			justify-content: center;

pages/siteManage/siteManage.vue

@@ -0,0 +1,156 @@
+<template>
+	<view class="site-wrapper">
+		<!-- 筛选框start -->
+		<view class="ding">
+			<view class="cu-bar search bg-gray filter-section">
+				<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>
+		</view>
+		
+		<!-- 筛选框end -->
+
+		<!-- 站点列表start -->
+		<view class="site-items">
+			<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"
+				 @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" v-if="type==1" @tap="goAlarmingList">
+						<view class="text-grey site-tit">{{item.siteName}}</view>
+					</view>
+					<view class="content" v-else  @tap="goDeviceType">
+						<view class="text-grey site-tit">{{item.siteName}}</view>
+					</view>
+					<view class="nav-right num">
+						<view class="text-grey text-xs">
+							<image src="../../static/nav-icon.png" style="width:25rpx;height:25rpx;margin-right:26rpx"></image>
+						</view>
+					</view>
+					<view class="move">
+						<view class="bg-grey">编辑</view>
+						<view class="bg-red">删除</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<!-- 站点列表end
+		
+		<!-- 新增按钮start -->
+		<view class="plus">
+			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage"></image>
+		</view>
+		<!-- 新增按钮end -->
+	</view>
+
+</template>
+
+<script>
+	import json from '../../data/json.js';
+	
+	export default {
+		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;
+			 
+			 // this.getData()
+		},
+		methods: {
+			
+			// getData(){
+			// 	uni.request({
+			// 	    url: '../../data/json.js', //仅为示例，并非真实接口地址。
+			// 	    data: {
+			// 	         text: 'uni.request'
+			// 	    },
+			// 	    header: {
+			// 	        'custom-header': 'hello' //自定义请求头信息
+			// 	    },
+			// 	    success: (res) => {
+			// 	        console.log(res);
+			// 	        // this.text = 'request success';
+			// 	    }
+			// 	});
+			// },
+			
+			
+			// 页面跳转
+			goAddPage() {
+				uni.navigateTo({
+					url: '/pages/add/add',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			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
+			}
+		}
+
+	}
+</script>
+
+<style>
+
+</style>

pages/unprocessDetail/opeDataDetail/opeDataDetail.vue

@@ -0,0 +1,66 @@
+<template>
+	<view>
+		<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time">进线一</view>
+			<button class="cu-btn bg-green sm">在线</button>
+		</view>
+		<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>Uab:</text>
+					<text>219.06V</text>
+				</view>
+				<view>
+					<text>Ubc：</text>
+					<text>0.00V</text>
+				</view>
+				<view>
+					<text>Uca：</text>
+					<text>219.06V</text>
+				</view>
+				<view>
+					<text>la：</text>
+					<text>0.00A</text>
+				</view>
+				<view>
+					<text>lb：</text>
+					<text>0.00A</text>
+				</view>
+				<view>
+					<text>lc：</text>
+					<text>0.00A</text>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			
+		
+		
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	.info-content uni-view uni-text:first-child{
+		width:90rpx;
+	}
+
+</style>

pages/unprocessDetail/unprocessDetail.vue

@@ -176,9 +176,7 @@
 	}
 
 	.processStatus {
-		radio {
-			transform: scale(0.77)
-		}
+		
 
 		textarea {
 			background: #F5F5F5;

pages/unprocessDetail/videoDetail/videoDetail.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<video src="" style="width:750rpx" ></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/videoDetail/videoDetail.vue

@@ -0,0 +1,81 @@
+<template>
+	<view>
+		<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time">火点侦测摄像机</view>
+		</view>
+		<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>视频监控</text>
+				</view>
+				<view>
+					<text>设备编号：</text>
+					<text>YTVA00001</text>
+				</view>
+				<view>
+					<text style="width:auto!important">物联网卡号：</text>
+					<text></text>
+				</view>
+				<view>
+					<text>安装位置：</text>
+					<text>伍继办公室</text>
+				</view>
+				<view>
+					<text>添加时间：</text>
+					<text>2019-05-28 16:12:45</text>
+				</view>
+				<view>
+					<text>设备地址：</text>
+					<text>上海市虹口区塘沽路</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">
+				<video src="" style="width:690rpx;"></video>
+				<br><br>
+			</view>
+		</view>
+		<!-- 处理状态end -->
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			
+			}
+		},
+		methods: {
+			
+			
+
+			
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	
+
+	
+	
+
+
+</style>

pages/videoList/videoList.vue

@@ -0,0 +1,74 @@
+<template>
+
+	<view class="">
+		<view class="cu-list menu-avatar">
+			<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
+			 :key="index" :data-target="'move-box-' + index" @tap="goVideoDetail">
+				<view class="cu-avatar round lg" :style="`background-image:url(${item.imgUrl})`" style="opacity:.7"></view>
+				<view class="content">
+					<view class="">{{item.title}}</view>
+				</view>
+				<view class="nav-right num">
+					<view v-if="item.status=='在线'" class="online" >
+						{{item.status}}
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+					<view v-else-if="item.status=='离线'" class="text-gray" >
+						{{item.status}}
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+					<view v-else="item.status=='故障'" class="error" >
+						{{item.status}}
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				deviceData: [{
+						status: '离线',
+						imgUrl: '../../static/video-icon-off.png',
+						title: 'C59360332',
+						num: 6
+					}, {
+						status: '在线',
+						imgUrl: '../../static/video-icon-on.png',
+						title: 'C59360332',
+						num: 11
+					},
+					{
+						status: '异常',
+						imgUrl: '../../static/video-icon-error.png',
+						title: 'C59360332',
+						num: 6
+					}
+				],
+				modalName: null,
+
+			};
+		},
+		methods: {
+			goVideoDetail() {
+				uni.navigateTo({
+					url: '/pages/videoDetail/videoDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	
+</style>

uni.scss

@@ -73,4 +73,5 @@ $uni-font-size-title:40rpx;
 $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:36rpx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
+$uni-font-size-paragraph:30rpx;
+