告警已处理未处理详情， 站点列表页新增 画面检测引入特殊字体，其他微调

App.vue

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

colorui/main.css

@@ -3340,7 +3340,7 @@ scroll-view.cu-steps .cu-item {
 
 .line-yellow::after,
 .lines-yellow::after {
-	border-color: #fbbd08;
+	border-color: #EFEF04;
 }
 
 .line-olive::after,
@@ -3414,7 +3414,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-yellow {
-	background-color: #fbbd08;
+	background-color: #EFEF04;
 	color: #333333;
 }
 
@@ -3499,7 +3499,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-yellow.light {
-	color: #fbbd08;
+	color: #EFEF04;
 	background-color: #fef2ced2;
 }
 
@@ -3836,7 +3836,7 @@ scroll-view.cu-steps .cu-item {
 .text-yellow,
 .line-yellow,
 .lines-yellow {
-	color: #fbbd08;
+	color: #EFEF04;
 }
 
 .text-olive,

common/common.scss

@@ -6,10 +6,13 @@ body {
 radio,checkbox {
 			transform: scale(0.77)
 }
+/* 画面监控引入特殊字体 */
+	@font-face {
+	  font-family: 'FANDOLFANG-REGULAR';  /* project id 2394829 */
+	  src: url('static/font/FANDOLFANG-REGULAR.OTF');
+	}
 
 .searchSelect{
-	
-	
 		position: -webkit-fixed;
 		    position: fixed;
 		    // top: 88rpx;
@@ -270,7 +273,8 @@ radio,checkbox {
 	
 	.submitBottomBtn {
 		position: fixed;
-		width: calc(100% - 40rpx);
+		width: 100%;
+		left:0;
 		bottom: 44rpx;
 		z-index: 999;
 		background-color: #ffffff;

data/json.js

@@ -1,95 +1,209 @@
-// 本地模拟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":'测试站点三'
-},
-];
-// 本地模拟json数据
+// 本地模拟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": '测试站点三'
+	},
+];
+// 本地模拟json数据
 let cuIconList = [{
-					imgUrl: '../../static/square1.png',
-					badge: 120,
-					name: '综合报警',
-					redirectUrl: '/pages/siteList/siteList?type=1'
-				}, {
-					imgUrl: '../../static/square2.png',
-					badge: 0,
-					name: '运行监测',
-					redirectUrl: '/pages/siteList/siteList?type=2'
-				}, {
-					imgUrl: '../../static/square-wb.png',
-					badge: 0,
-					name: '维保',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-bx.png',
-					badge: 22,
-					name: '报修',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-rl.png',
-					badge: 0,
-					name: '人脸识别',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-xj.png',
-					badge: 0,
-					badge: 0,
-					name: '巡检',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-bz.png',
-					badge: 0,
-					badge: 0,
-					name: '风险保障',
-					redirectUrl: ''
-				}]
-
-// 定义数据出口
-module.exports = {
-  siteListData: siteListData,
-  cuIconList:cuIconList
-}
+		imgUrl: '../../static/square1.png',
+		badge: 120,
+		name: '综合报警',
+		redirectUrl: '/pages/siteList/siteList?type=1'
+	}, {
+		imgUrl: '../../static/square2.png',
+		badge: 0,
+		name: '运行监测',
+		redirectUrl: '/pages/siteList/siteList?type=2'
+	}, {
+		imgUrl: '../../static/square-wb.png',
+		badge: 0,
+		name: '维保',
+		redirectUrl: ''
+	}, {
+		imgUrl: '../../static/square-bx.png',
+		badge: 22,
+		name: '报修',
+		redirectUrl: ''
+	}, {
+		imgUrl: '../../static/square-rl.png',
+		badge: 0,
+		name: '人脸识别',
+		redirectUrl: ''
+	}, {
+		imgUrl: '../../static/square-xj.png',
+		badge: 0,
+		badge: 0,
+		name: '巡检',
+		redirectUrl: ''
+	}, {
+		imgUrl: '../../static/square-bz.png',
+		badge: 0,
+		badge: 0,
+		name: '风险保障',
+		redirectUrl: ''
+	}];
+	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'
+		},
+		{
+			title: '母线停电',
+			subTitle: '事件未处理测试',
+			status: '未处理',
+			time: '2020-01-08 15:15:12'
+		},
+		{
+			title: '母线停电',
+			subTitle: '事件未处理测试',
+			status: '未处理',
+			time: '2020-01-08 15:15:12'
+		}
+	];
+	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'
+					},
+					{
+						title: '母线停电',
+						subTitle: '事件已处理测试',
+						status: '已处理',
+						time: '2020-01-08 15:15:12'
+					},
+					{
+						title: '母线停电',
+						subTitle: '事件已处理测试',
+						status: '已处理',
+						time: '2020-01-08 15:15:12'
+					}
+				]
+
+// 定义数据出口
+module.exports = {
+	siteListData: siteListData,
+	cuIconList: cuIconList,
+	unprocessList:unprocessList,
+	processedList:processedList
+}

main.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import App from './App'
+ // import wx from 'node_modules/jweixin-module/lib/index'
 
 // 引入colorui组件
 import cuCustom from 'colorui/components/cu-custom.vue'

manifest.json

@@ -17,7 +17,10 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "VideoPlayer" : {},
+            "Maps" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -44,7 +47,13 @@
             "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "maps" : {
+                    "baidu" : {
+                        "appkey_ios" : "",
+                        "appkey_android" : ""
+                    }
+                }
             },
             "icons" : {
                 "android" : {
@@ -81,7 +90,7 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "static/aa.9.png"
+                    "hdpi" : "static/startUp.png"
                 }
             }
         }

package-lock.json

@@ -13,6 +13,11 @@
         "zrender": "5.0.4"
       }
     },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "mpvue-echarts": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/mpvue-echarts/-/mpvue-echarts-0.3.2.tgz",

package.json

@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "echarts": "^5.0.2",
+    "jweixin-module": "^1.6.0",
     "mpvue-echarts": "^0.3.2"
   }
 }

pages.json

@@ -255,7 +255,17 @@
 			}
 
 		}
-	],
+	    
+        ,{
+            "path" : "pages/add-test/add-test",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/add-test/add-test.vue

@@ -0,0 +1,122 @@
+<template>
+	<view class="container">
+				<form @submit="formSubmit" @reset="formReset">			
+				
+					    
+							<view class="line">
+								<label style="float: left;width: 20%;text-align: center;">姓名：</label>
+								<input name="name" class="chat_input"  style="width: 70%;float: left;font-size: large;border-bottom: 1rpx solid #F1F1F1;" type="text" placeholder="请正确填写姓名..."/>
+							</view>
+					        <view class="line">
+								<view style="width: 20%;text-align: center;">性别：</view>
+								<view>
+									<radio-group name="gender">
+										<label class="radio">
+											<radio value="男" />男
+										</label>
+										<label class="radio" style="padding-left: 20rpx;">
+											<radio value="女" />女
+										</label>
+									</radio-group>
+								</view>
+							</view>
+							<view class="line">
+								<label style="float: left;padding-left: 20rpx;">出生日期：</label>
+								<input name="birth" class="chat_input" style="float: left;" type="text" placeholder="格式:2020-01-01(选填)"/>
+							</view>
+							<view class="line">
+								<label style="float: left;width: 25%;padding-left:20rpx;text-align: center;">患者电话：</label>
+								<input name="tel" class="chat_input" style="width: 70%;float: left;font-size: large;" type="text" placeholder="请填写患者或家属手机号"/>
+							</view>
+					   
+						
+							<view class="line">
+								<label style="float: left;width: 25%;padding-left:20rpx;text-align: center;">初步诊断：</label>
+								<input name="diagnose" class="chat_input" style="width: 70%;float: left;font-size: large;" type="text" placeholder="选填"/>
+							</view>
+							<view class="line">
+								<label style="float: left;width: 25%;padding-left:20rpx;text-align: center;">检查项目：</label>
+								<input name="item" class="chat_input" style="width: 70%;float: left;font-size: large;" type="text" placeholder="请填写检查、检查部位"/>
+							</view>
+						
+			
+					
+					<view style="padding-top:20rpx;padding-bottom: 400rpx;">
+						<view type="submit" w_size="600" h_size="80" text="提交预约">提交预约</view>
+					</view>
+					
+				</form>
+				
+			</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			formSubmit:function(e){
+							let tmp = JSON.stringify(e.detail.value)
+							console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
+							var formdata = e.detail.value
+							// 数据校验
+							// console.log(formdata.birth);
+							//正则表达式
+							let reg_name = /^[\u4e00-\u9fa5]{0,}$/
+							let reg_birth = /^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/;
+							let reg_tel = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+							//结果标记
+							let sign_name = RegExp(reg_name).test(formdata.name);
+							let sign_birth = RegExp(reg_birth).test(formdata.birth);
+							let sign_tel = RegExp(reg_tel).test(formdata.tel);	
+							// console.log(sign+"，数据类型："+typeof(sign));
+							if(!sign_name||formdata.name==''){
+								this.showModal('请检查姓名');	
+							}else if(formdata.gender==''){
+								this.showModal('请选择性别')
+							}else if(!sign_birth||formdata.name==''){
+								this.showModal("请检查出生日期");
+							}else if(!sign_tel||formdata.name==''){
+								this.showModal("请检查电话号码");
+							}else if(formdata.diagnose==''){
+								this.showModal('请填写初步诊断')
+							}else if(formdata.item==''){
+								this.showModal("请填写检查部位");
+							}else{
+								uni.request({
+									url: this.$baseUrl.baseUrl+"Wxtest/ApplyCheck",
+									data: tmp,
+									method: "post",
+									success:(res)=> {
+										this.showModal(res.data.msg);
+										if (res.confirm||res.cancel) {
+											console.log('用户点击确定');
+										}
+									},
+									fail:(res)=>{
+										console.log("错误") 
+									}
+								})
+							}
+							
+						},
+						formReset: function(e) {
+							console.log('清空数据')
+						},
+						showModal:function(content){
+							uni.showModal({
+								title:'提示',
+								content:content,
+							})
+						}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/add/add.vue

@@ -1,8 +1,11 @@
 <template>
-	<view class="appWrapper padding-sm">
-		<form action="">
+	<view class="appWrapper">
+		<form action="" v-if="type==2">
 			<view class="form-item margin-top">
-				<view class="title">设备编号:</view>
+				<view class="title">
+					<text class="necessary">*</text>
+					设备编号:
+				</view>
 				<input name="input"></input>
 			</view>
 			<view class="form-item">
@@ -20,25 +23,59 @@
 					<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>
+			<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 padding-lr-sm">
+				<button class="bg-blue round  margin-top">提 交 </button>
+			</view>
+		</form>
+		<form action="" v-else>
+			<view class="form-item margin-top">
+				<view class="title">
+					<text class="necessary">*</text>
+					用户名称:
+				</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>
+				<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="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top">提 交 </button>
 			</view>
 		</form>
 	</view>
@@ -50,8 +87,25 @@
 			return {
 				index: -1,
 				picker: ['楼层一', '楼层二', '楼层三'],
+				type: '0'
 
 			}
+		},
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
+			if (option.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '站点新增'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '设备新增'
+				});
+			}
+
+
+
 		},
 		methods: {
 			PickerChange(e) {
@@ -80,7 +134,7 @@
 		box-sizing: border-box;
 		appearance: none;
 		-moz-appearance: none;
-		-webkit-appearance: none;
+		-webkit-appearance: none;
 		color: #999;
 
 
@@ -90,10 +144,11 @@
 	select:active,
 	select:hover {
 		outline: none;
-	}
-	select {
-	    background: url(../../static/arrow.png) no-repeat scroll 98% center;
-	    background-size: 6%;
+	}
+
+	select {
+		background: url(../../static/arrow.png) no-repeat scroll 98% center;
+		background-size: 6%;
 	}
 
 
@@ -103,14 +158,26 @@
 		align-items: center;
 		margin-bottom: 20rpx;
 
+
 		.title {
 			width: 170rpx;
+			position: relative;
+
+			.necessary {
+				color: red;
+				display: inline-block;
+				position: absolute;
+				top: -2rpx;
+				left: -20rpx;
+				font-size: 40rpx;
+
+			}
 		}
 
 		input,
 		select {
-			width: 500rpx;
-			font-size:28rpx;
+			width: 500rpx;
+			font-size: 28rpx;
 		}
 
 

pages/deviceManage/deviceDetail/deviceDetail.vue

@@ -1,88 +1,118 @@
-<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;
-		};
-		
-		
-	}
-
+<template>
+	<view class="wrapper flex justify-between padding-lr-lg">
+		<view class="device-items">
+			<view class="device-item">
+				<text class="text-yellow">Uab</text>
+				<text>12</text>
+				<text>V</text>
+			</view>
+			<view class="device-item">
+				<text class="text-green">Ubc</text>
+				<text>12</text>
+				<text>V</text>
+			</view>
+			<view class="device-item">
+				<text class="text-red">Uca</text>
+				<text>12</text>
+				<text>V</text>
+			</view>
+			<view class="device-item">
+				<text class="text-red">F</text>
+				<text>12</text>
+				<text>V</text>
+			</view>
+		</view>
+
+		<view class="device-items">
+			<view class="device-item">
+				<text class="text-yellow">La</text>
+				<text>12</text>
+				<text>A</text>
+			</view>
+			<view class="device-item">
+				<text class="text-green">Lb</text>
+				<text>12</text>
+				<text>A</text>
+			</view>
+			<view class="device-item">
+				<text class="text-red">Lc</text>
+				<text>12</text>
+				<text>A</text>
+			</view>
+			<view class="device-item">
+				<text class="text-yellow">P</text>
+				<text>12</text>
+				<text>kW</text>
+			</view>
+			<view class="device-item">
+				<text class="text-green">Q</text>
+				<text>12</text>
+				<text>kvar</text>
+			</view>
+			<view class="device-item">
+				<text class="text-red">cos</text>
+				<text>12</text>
+				<text>V</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+			}
+		},
+		onLoad() {
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff", //文字颜色
+				backgroundColor: "#000033", //底部背景色
+			})
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: 100% !important
+	}
+
+	.wrapper {
+		width: 100%;
+		height: 100%;
+		background-color: #000033;
+		background-image: url(../../../static/device-bg.png);
+		background-position: center 60%;
+		background-size: cover;
+		position: relative;
+
+		.device-items {
+			font-family: FANDOLFANG-REGULAR;
+			margin-top: 150rpx;
+			color: #fff;
+
+			.device-item text:first-child {
+				width: 50rpx;
+				display: inline-block;
+				font-size: 28rpx;
+			}
+			.device-item text:nth-child(2) {
+				display: inline-block;
+				width: 100rpx;
+				margin: 0 15rpx 30rpx 15rpx;
+				height: 42rpx;
+				background: #FFFFCC;
+				font-size: 28rpx;
+				text-align: left;
+				padding-left: 10rpx;
+				line-height: 42rpx;
+				color: #333;
+			}
+		}
+		.device-item:nth-child(3) {
+			margin-bottom: 94rpx;
+		}
+	}
 </style>

pages/deviceManage/deviceManage.vue

@@ -9,7 +9,8 @@
 					<view class="">{{item.title}}</view>
 				</view>
 				<view class="nav-right num">
-					<view class="text-grey">
+					<view class="text-grey">
+						{{item.status}}
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
@@ -24,10 +25,12 @@
 			return {
 				deviceData: [{
 						imgUrl: '../../static/jx.png',
-						title: '进线一',
+						title: '进线一',
+						status:'在线'
 					}, {
 						imgUrl: '../../static/jx.png',
-						title: '进线二',
+						title: '进线二',
+						status:'离线'
 					}
 				],
 				modalName: null,

pages/index/components/chart4/chart4.vue

@@ -9,11 +9,11 @@
 <script>
 	
 	let echartData = [{
-			name: "报警",
+			name: "电力监测",
 			value: 1000
 		},
 		{
-			name: "事件",
+			name: "视频监测",
 			value: 2920
 		},
 		

pages/index/index.vue

@@ -60,8 +60,8 @@
 		<!-- <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=hrefKing(index) v-for="(item,index) in cuIconList" :key="index">
-					<image :src="`${item.imgUrl}`" style="width:100rpx;height:100rpx"></image>
+				<view class="cu-item justify-center align-center" @tap=navItemClick(index) 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 v-if="item.badge!=1">{{item.badge>99?'99+':item.badge}}</block>
 					</view>
@@ -76,7 +76,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 chart4 from './components/chart4/chart4.vue';
 	import json from '../../data/json.js';
 
 	export default {
@@ -93,17 +93,31 @@
 				// 宫格列表数据
 				cuIconList: json.cuIconList,
 				Inv: 0,
-
 			};
-
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.float == 'right') {
 				console.log("你点击了扫一扫")
 				uni.scanCode({
+					// success: function(res) {
+					// 	console.log('条码类型：' + res.scanType);
+					// 	console.log('条码内容：' + res.result);
+					// }
 					success: function(res) {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
+						let result = res.result;
+						if (result.indexOf('http://') == 0 || result.indexOf('https://') == 0) {
+							//是网址，直接跳转  
+							plus.runtime.openURL(result); //调用手机浏览器  
+							//怎么在APP内跳转网址？  
+						} else {
+							//不是网址，打印出结果  
+							uni.showToast({
+								title: res.result
+							})
+						}
+					},
+					fail: function(err) {
+						console.log('扫码失败', err)
 					}
 				});
 			} else {
@@ -115,15 +129,15 @@
 		onLoad() {},
 		methods: {
 
-			hrefKing(index) {
+			navItemClick(index) {
 				// log(index)
 				let url = "";
 				switch (index) {
 					case 0:
-						url = "/pages/siteList/siteList?type=1" //进口水果
+						url = "/pages/siteList/siteList?type=1"
 						break;
 					case 1:
-						url = "/pages/siteList/siteList?type=2" //热门品种
+						url = "/pages/siteList/siteList?type=2"
 						break;
 					default:
 						break;
@@ -136,18 +150,18 @@
 					// uni.showToast({
 					// 	title: '此模块开发中~',
 					// 	icon: 'none'
-					// });
-					uni.showModal({
-					    title: 'Tips',
-					    content: '此模块开发中~',
-						showCancel:false,
-					    success: function (res) {
-					        if (res.confirm) {
-					            console.log('用户点击确定');
-					        } else if (res.cancel) {
-					            console.log('用户点击取消');
-					        }
-					    }
+					// });
+					uni.showModal({
+						title: 'Tips',
+						content: '此模块开发中~',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
 					});
 				}
 			},

pages/login2/login2.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/messagePush/messagePush.vue

@@ -12,37 +12,13 @@
 						<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">
+			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top">提 交 </button>
 			</view>
 

pages/processList/processList.vue

@@ -16,7 +16,7 @@
 		<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-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">
@@ -30,7 +30,8 @@
 							<view class="pro-date ">{{item.time}}</view>
 						</view>
 						<view class="action">
-							<view class="unProcess">{{item.status}}</view>
+							<view class="unProcess"  v-if="type==1"  @tap="goUnprocessDetail">{{item.status}}</view>
+							<view class="unProcess" v-else @tap="goVideoUnprocessDetail">{{item.status}}</view>
 						</view>
 					</view>
 				</view>
@@ -39,7 +40,7 @@
 		<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-item" v-for="(item,index) in processedList" :key="index" >
 						<view class="cu-avatar lg" style="background-image:url(../../static/processed-icon.png);"></view>
 						<view class="content">
 							<view class="pro-title">
@@ -53,7 +54,8 @@
 							<view class="pro-date ">{{item.time}}</view>
 						</view>
 						<view class="action">
-							<view class="processed">{{item.status}}</view>
+							<view class="processed" v-if="type==1" @tap="goProcessedDetail">{{item.status}}</view>
+							<view class="processed"v-else  @tap="goVideoProcessedDetail">{{item.status}}</view>
 						</view>
 					</view>
 				</view>
@@ -63,124 +65,15 @@
 	</view>
 </template>
 
-<script>
+<script>
+	import json from '../../data/json.js';
 	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'
-					}
-				],
-
+				unporcessList: json.unprocessList,
+				processedList: json.processedList,
 
+				type: '0',
 				modalName: null,
 				listTouchStart: 0,
 				listTouchDirection: null,
@@ -188,6 +81,19 @@
 				TabCur: 0,
 				tabNav: ['未处理', '已处理']
 			};
+		},
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
+			if (option.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '电力检测'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '视频告警'
+				});
+			}
 		},
 		methods: {
 			tabSelect(e) {
@@ -198,7 +104,7 @@
 			// 页面跳转
 			goUnprocessDetail() {
 				uni.navigateTo({
-					url: '/pages/unprocessDetail/unprocessDetail',
+					url: '/pages/unprocessDetail/unprocessDetail?type=1',
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
@@ -206,12 +112,27 @@
 			},
 			goProcessedDetail() {
 				uni.navigateTo({
-					url: '/pages/processedDetail/processedDetail',
+					url: '/pages/processedDetail/processedDetail?type=1',
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
 				});
-
+			},
+			goVideoUnprocessDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/unprocessDetail?type=2',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goVideoProcessedDetail() {
+				uni.navigateTo({
+					url: '/pages/processedDetail/processedDetail?type=2',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
 			}
 		}
 	}

pages/processedDetail/processedDetail.vue

@@ -3,87 +3,152 @@
 		<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-green sm">已处理</button>
-		</view>
-		<!-- 基本信息start -->
-		<view class="basic-info">
-			<view class="info-tit margin-left-xs">
-				<text class="cuIcon-titles margin-right-xs"></text>
-				基本信息
-			</view>
-			<view class="info-content">
-				<view class="info-one-info ">
-					<text>站点名称：</text>
-					<text>测试站点一</text>
-				</view>
-				<view>
-					<text>线路名称：</text>
-					<text>进线一</text>
-				</view>
-				<view>
-					<text>警告信息：</text>
-					<text>母线停电</text>
-				</view>
-				<view>
-					<text>警告状态：</text>
-					<text>复归</text>
-				</view>
-				<view>
-					<text>采集终端：</text>
-					<text>DA00012784</text>
-				</view>
-				<view>
-					<text>站点地址：</text>
-					<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
-				</view>
-				<view>
-					<text>联系人：</text>
-					<text>韩正义</text>
-				</view>
-				<view>
-					<text>联系方式：</text>
-					<text>15122423833<text class="phone icon iconfont" @click="submit()">&#xe61d;</text></text>
+		</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>
-					<text>运行数据：</text>
-					<text class="checkMore"  @tap="goOpeDataDetail">点击查看</text>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>站点名称：</text>
+						<text>测试站点一</text>
+					</view>
+					<view>
+						<text>线路名称：</text>
+						<text>进线一</text>
+					</view>
+					<view>
+						<text>警告信息：</text>
+						<text>母线停电</text>
+					</view>
+					<view>
+						<text>警告状态：</text>
+						<text>复归</text>
+					</view>
+					<view>
+						<text>采集终端：</text>
+						<text>DA00012784</text>
+					</view>
+					<view>
+						<text>站点地址：</text>
+						<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
+					</view>
+					<view>
+						<text>联系人：</text>
+						<text>韩正义</text>
+					</view>
+					<view>
+						<text>联系方式：</text>
+						<text>15122423833<text class="phone icon iconfont" @click="submit()">&#xe61d;</text></text>
+					</view>
+					<view>
+						<text>运行数据：</text>
+						<text class="checkMore"  @tap="goOpeDataDetail">点击查看</text>
+					</view>
+					<view>
+						<text>视频：</text>
+						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
+					</view>
 				</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 class="info-one-info ">
-					<text>是否误报：</text>
-					<text>误报</text>
-				</view>
-				<view>
-					<text>处理人：</text>
-					<text>13262908415</text>
-				</view>
-				<view>
-					<text>处理时间：</text>
-					<text>2021-01-27 09:41:12</text>
-				</view>
-				<view>
-					<text>处理内容：</text>
-					<text>测试</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 class="info-one-info ">
+						<text>是否误报：</text>
+						<text>误报</text>
+					</view>
+					<view>
+						<text>处理人：</text>
+						<text>13262908415</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>2021-01-27 09:41:12</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>测试</text>
+					</view>
+			
+				</view>
+			
+			
+			</view>
+			<!-- 处理状态end -->
+		</view>
+		
+		<view v-else>
+			<!-- 基本信息start -->
+			<view class="basic-info">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					基本信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>设备名称：</text>
+						<text>火点侦测摄像机</text>
+					</view>
+					
+					<view>
+						<text>设备地址：</text>
+						<text>上海市虹口区塘沽路伍继办公室</text>
+					</view>
+					<view>
+						<text>告警信息：</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="../../static/video-img.png" style="width:100%"></image>
+				</view>
+			</view>
+			<!-- 报警当前情况截图end -->
+			<!-- 处理信息start -->
+			<view class="processStatus">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>是否误报：</text>
+						<text>误报</text>
+					</view>
+					<view>
+						<text>处理人：</text>
+						<text>13262908415</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>2021-01-27 09:41:12</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>测试</text>
+					</view>
+				</view>
+			</view>
+			<!-- 处理状态end -->
 		</view>
-		<!-- 处理状态end -->
+		
 
 	</view>
 </template>
@@ -94,9 +159,13 @@
 			return {
 				radio: 'A',
 				radio: 'B',
-				modalName: null,
-
+				modalName: null,
+				type: '0'
 			}
+		},
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
 		},
 		methods: {
 			
@@ -130,9 +199,7 @@
 					fail: () => {},
 					complete: () => {}
 				});
-			
-			},
-			
+			},
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},

pages/setting/setting.vue

@@ -30,7 +30,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-item" @tap="goSiteManage">
+			<view class="cu-item" @tap="goDeviceManage">
 				<view class="cu-avatar " style="background-image:url(../../static/setting-icon3.png)"></view>
 				<view class="content">
 					<view class="">设备管理</view>
@@ -55,7 +55,15 @@
 		methods: {
 			goSiteManage() {
 				uni.navigateTo({
-					url: '/pages/siteManage/siteManage',
+					url: '/pages/siteManage/siteManage?type=1',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goDeviceManage() {
+				uni.navigateTo({
+					url: '/pages/siteManage/siteManage?type=2',
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/siteList/siteList.vue

@@ -14,26 +14,20 @@
 							{{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>
 					<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 -->
 
@@ -60,7 +54,16 @@
 
 		onLoad: function(option) {
 			console.log(option.type); //打印出上个页面传递的参数。
-			this.type = option.type;
+			this.type = option.type;
+			if (option.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '综合报警'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '运行监测'
+				});
+			}
 		},
 		methods: {
 

pages/siteManage/siteManage.vue

@@ -1,34 +1,32 @@
 <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>
+		<!-- 筛选框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="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-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="content">
 						<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>
@@ -46,97 +44,62 @@
 		
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage"></image>
+			<image src="../../static/plus.png" style="width:125rpx;height:125rpx"  @tap="goAddPage(type)"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>
 
 </template>
 
-<script>
-	import json from '../../data/json.js';
-	
+<script>
+	import json from '../../data/json.js';
+
 	export default {
 		data() {
 			return {
-				type: '0',
-				
-				siteListData:json.siteListData,
-				
+				type: '0',
+				siteListData: json.siteListData,
 				modalName: null,
 				listTouchStart: 0,
 				listTouchDirection: null,
-				CustomBar: this.CustomBar,
-				
-				
-				
-				csListArrl:[],
-						//左滑默认宽度
-						delBtnWidth: 160,
-						
-						
-						
+				CustomBar: this.CustomBar,
+				csListArrl: [],
+				//左滑默认宽度
+				delBtnWidth: 160,
 			};
 		},
-	
-		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: () => {}
+
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
+			if (option.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '站点管理'
 				});
-			},
-			goAlarmingList() {
-				uni.navigateTo({
-					url: '/pages/alarmingList/alarmingList',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goDeviceType() {
+			} else {
+				uni.setNavigationBarTitle({
+					title: '设备管理'
+				});
+			}
+		},
+		methods: {
+
+			// 页面跳转
+			goAddPage(type) {
 				uni.navigateTo({
-					url: '/pages/deviceType/deviceType',
+					url: '/pages/add/add?type='+this.type,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
 				});
 			},
-
 			InputFocus(e) {
 				this.InputBottom = e.detail.height
 			},
 			InputBlur(e) {
 				this.InputBottom = 0
-			},
-			
+			},
+
 
 			// ListTouch触摸开始
 			ListTouchStart(e) {

pages/unprocessDetail/unprocessDetail.vue

@@ -4,96 +4,170 @@
 			<view class="time">2021-01-18 15:16:45</view>
 			<button class="cu-btn radius bg-red 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>站点名称：</text>
-					<text>测试站点一</text>
-				</view>
-				<view>
-					<text>线路名称：</text>
-					<text>进线一</text>
-				</view>
-				<view>
-					<text>警告信息：</text>
-					<text>母线停电</text>
-				</view>
-				<view>
-					<text>警告状态：</text>
-					<text>复归</text>
-				</view>
-				<view>
-					<text>采集终端：</text>
-					<text>DA00012784</text>
-				</view>
-				<view>
-					<text>站点地址：</text>
-					<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
-				</view>
-				<view>
-					<text>联系人：</text>
-					<text>韩正义</text>
-				</view>
-				<view>
-					<text>联系方式：</text>
-					<text>
-						15122423833
-						<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
-					</text>
-				</view>
-				<view>
-					<text>运行数据：</text>
-					<text class="checkMore" @tap="goOpeDataDetail">点击查看</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="">
-					<radio-group class="block" @change="RadioChange">
-						<view class=" flex align-center ">
-							<radio class="blue mr-sm margin-right-xs" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false"
-							 value="A"></radio>
-							<view class="title">单个处理</view>
-							<radio class="blue margin-left-lg margin-right-xs" :class="radio=='B'?'checked':''" :checked="radio=='B'?true:false"
-							 value="B"></radio>
-							<view class="title ">批量处理</view>
-						</view>
-					</radio-group>
-
-					<view class="cu-form-group margin-top">
-						<!-- <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="reason"></textarea>
-					</view>
-
-					<view class="btn-area">
-						<button class="bg-orange round missReport margin-top">误 报 </button>
-						<button class="bg-blue round  missReport margin-top ">非 误 报 </button>
-					</view>
-
-				</form>
-
-
-
-			</view>
+		<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>测试站点一</text>
+					</view>
+					<view>
+						<text>线路名称：</text>
+						<text>进线一</text>
+					</view>
+					<view>
+						<text>警告信息：</text>
+						<text>母线停电</text>
+					</view>
+					<view>
+						<text>警告状态：</text>
+						<text>复归</text>
+					</view>
+					<view>
+						<text>采集终端：</text>
+						<text>DA00012784</text>
+					</view>
+					<view>
+						<text>站点地址：</text>
+						<text>沪太路8786弄155号<text class="icon iconfont map" @click="mapLocation()">&#xe612;</text></text>
+					</view>
+					<view>
+						<text>联系人：</text>
+						<text>韩正义</text>
+					</view>
+					<view>
+						<text>联系方式：</text>
+						<text>
+							15122423833
+							<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
+						</text>
+					</view>
+					<view>
+						<text>运行数据：</text>
+						<text class="checkMore" @tap="goOpeDataDetail">点击查看</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="">
+						<!-- <radio-group class="block" @change="RadioChange">
+							<view class=" flex align-center ">
+								<radio class="blue mr-sm margin-right-xs" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false"
+								 value="A"></radio>
+								<view class="title">单个处理</view>
+								<radio class="blue margin-left-lg margin-right-xs" :class="radio=='B'?'checked':''" :checked="radio=='B'?true:false"
+								 value="B"></radio>
+								<view class="title ">批量处理</view>
+							</view>
+						</radio-group> -->
+			
+						<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="reason"></textarea>
+						</view>
+			
+						<view class="btn-area">
+							<!-- <button class="bg-orange round missReport margin-top">误 报 </button> -->
+							<button class="bg-blue round  missReport margin-top ">告警确认 </button>
+						</view>
+			
+					</form>
+			
+			
+			
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+		
+		<view v-else>
+			<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>上海市虹口区塘沽路伍继办公室</text>
+					</view>
+					<view>
+						<text>告警信息：</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="../../static/video-img.png" style="width:100%"></image>
+				</view>
+			</view>
+			<!-- 报警当前情况截图end -->
+			<!-- 处理状态start -->
+			<view class="processStatus">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理内容
+				</view>
+				<view class="padding-lr padding-bottom-lg">
+					<form action="">
+						<!-- <radio-group class="block" @change="RadioChange">
+							<view class=" flex align-center ">
+								<radio class="blue mr-sm margin-right-xs" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false"
+								 value="A"></radio>
+								<view class="title">单个处理</view>
+								<radio class="blue margin-left-lg margin-right-xs" :class="radio=='B'?'checked':''" :checked="radio=='B'?true:false"
+								 value="B"></radio>
+								<view class="title ">批量处理</view>
+							</view>
+						</radio-group> -->
+			
+						<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="reason"></textarea>
+						</view>
+						<view class="btn-area">
+							<button class="bg-orange round missReport margin-top">误 报 </button>
+							<button class="bg-blue round  missReport margin-top ">告警确认 </button>
+						</view>
+					</form>
+			
+			
+			
+				</view>
+			</view>
+			<!-- 处理状态end -->
 		</view>
-		<!-- 处理状态end -->
+		
+		
+		
+		
 
 	</view>
 </template>
@@ -106,8 +180,13 @@
 				radio: 'B',
 				modalName: null,
 				reason: '',
+				type: '0'
 			}
 		},
+		onLoad: function(option) {
+			console.log(option.type); //打印出上个页面传递的参数。
+			this.type = option.type;
+		},
 		methods: {
 			submit() {
 				uni.makePhoneCall({
@@ -170,16 +249,11 @@
 	}
 
 	.processStatus {
-
-
 		textarea {
 			background: #F5F5F5;
 			color: #999999;
 		}
-
 	}
-
-
 	// textarea
 	.JTxtArea {
 		position: relative;

pages/videoList/videoList.vue

@@ -17,7 +17,7 @@
 						{{item.status}}
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
-					<view v-else="item.status=='故障'" class="error" >
+					<view v-else="item.status=='异常'" class="error" >
 						{{item.status}}
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>