modify

common/common.scss

@@ -17,13 +17,13 @@ radio,checkbox {
 	table{
 		border-collapse: collapse;
 		width:100%;
-		text-align:center
+		text-align:left
 	}
 	table,tr,td,th{
 		border:1px solid #e2e2e2;
 	}
 	td,th{
-		padding:6rpx;
+		padding:14rpx 10rpx;
 		font-size:26rpx;
 	}
 	
@@ -231,15 +231,15 @@ radio,checkbox {
 
 .pro-res {}
 
-.processList {
-	margin-top:100rpx;
-	/* position: fixed; */
-
+.processList,.fireBashWrapper.pushListWrapper{
+	margin-top:90rpx;
 	width: 100%;
-	height: calc(100% - 100rpx);
+	height: calc(100% - 90rpx);
 	overflow-y: scroll;
+}
+.share-item.active{
+	color:red
 }
-
 
 
 
@@ -722,4 +722,19 @@ radio,checkbox {
 	}
 	
 	
+	// 提交页面
+	.successWrapper{
+		text-align:center;
+		padding-top:100rpx;
+		img{
+			width:313rpx;
+			margin-right:32rpx;
+			margin-bottom:20rpx
+			}
+			view{
+				font-size:36rpx;
+			}
+		
+	}
+	
 	

pages.json

@@ -320,13 +320,6 @@
 		}
 
 		, {
-			"path": "pages/add-test/add-test",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
 			"path": "pages/siteDetail/siteDetail",
 			"style": {
 				"navigationBarTitleText": "站点详情",
@@ -358,13 +351,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/authAdd/authAdd",
-			"style": {
-				"navigationBarTitleText": "权限新增",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/siteAdd/siteAdd",
 			"style": {
@@ -658,6 +644,43 @@
             }
             
         }
+        ,{
+            "path" : "pages/accountManage/accountManage",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "用户管理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/accountManage/perAdd/perAdd",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "新增人员",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/accountManage/success/success",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提交成功",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+       
+        ,{
+            "path" : "pages/index/components/searchSelect/searchSelect",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	
 	

pages/accountManage/accountManage.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="padding">
+		<table>
+			<tr>
+				<th>人员名称</th>
+				<th>联系方式</th>
+				<th>所在单位</th>
+				<th>角色权限</th>
+			</tr>
+			<tr>
+				<td>张三</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>李四</td>
+				<td>13262908433</td>
+				<td>上海永天科技</td>
+				<td>普通员工</td>
+			</tr>
+			<tr>
+				<td>王五</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			<tr>
+				<td>赵六</td>
+				<td>13262908433</td>
+				<td>虹泾总部园</td>
+				<td>管理员</td>
+			</tr>
+			
+		</table>
+		
+		
+		<view class="btn-area submitBottomBtn padding-lr-sm">
+			<button class="bg-blue round  margin-top" @click="goAddPer()">新 增</button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			goAddPer() {
+				uni.navigateTo({
+					url: '/pages/accountManage/perAdd/perAdd',
+					
+				});
+			},
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/accountManage/perAdd/perAdd.vue

@@ -0,0 +1,336 @@
+<template>
+	<view class="appWrapper">
+
+		<form action="">
+			<view class="form-item margin-top">
+				<view class="title">
+					<text class="necessary">*</text>
+					联系方式:
+				</view>
+				<input name="input" v-model="formMess.deviceNo"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">姓名:</view>
+				<input name="input" v-model="formMess.deviceName"></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>
+				<radio-group name="gender">
+					<label class="margin-right">
+						<radio value="管理员" checked /><text>管理员</text>
+					</label>
+					<label>
+						<radio value="普通员工" /><text>普通员工</text>
+					</label>
+				</radio-group>
+			</view>
+
+
+			<view class="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+			</view>
+		</form>
+
+
+	</view>
+</template>
+
+<script>
+	var graceChecker = require("../../../common/graceChecker.js");
+	// import add from '../../common/select.js';
+	export default {
+
+		data() {
+			return {
+				index: -1,
+				picker: ['楼层一', '楼层二', '楼层三'],
+				type: '0',
+
+				isShow: false,
+				formMess: {
+					"userName": "sss",
+					"siteName": "",
+					"place": "",
+					"longitude": "",
+					"dimension": "",
+					"contactor": "",
+					"mobile": "",
+				},
+
+				// 站点多选下拉
+				siteItemData: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
+				newDataList: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
+
+				selectedData: [],
+				// 站点多选下拉 end
+
+
+			}
+		},
+		onLoad: function(option) {
+
+		},
+		methods: {
+			submit() {
+				uni.navigateTo({
+					url: '/pages/accountManage/success/success',
+					
+				});
+			},
+			add: function(item, index) {
+				this.selectedData.push(item);
+				this.newDataList.splice(index, 1);
+				this.isShow = false;
+				this.formMess.siteName = ''
+			},
+			deleteItem: function(item, index) {
+				// this.selectedData.remove(item);
+				this.selectedDaxta.splice(index, 1);
+				this.newDataList.push(item);
+
+
+			},
+
+			// 站点多选下拉
+			test: function() {
+				this.isShow = !this.isShow;
+			},
+			test2: function() {
+				this.isShow = false;
+			},
+			handleInput() {
+				// var newlist = this.siteItemData.filter(item => item.indexOf(this.formMess.siteName) > -1)
+				// this.newDataList = newlist;
+				// console.log(this.newDataList)
+			},
+			// 站点多选下拉 end
+
+
+
+			formSubmit: function(e) {
+				console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
+				//定义表单规则
+				var rule = [{
+						name: "userName",
+						checkType: "string",
+						checkRule: "1,3",
+						errorMsg: "姓名应为1-3个字符..."
+					},
+					// {name:"gender", checkType : "in", checkRule:"男,女",  errorMsg:"请选择性别"},
+					// {name:"loves", checkType : "notnull", checkRule:"",  errorMsg:"请选择爱好"}
+				];
+				//进行表单检查
+				var formData = e.detail.value;
+				var checkRes = graceChecker.check(formData, rule);
+				if (checkRes) {
+					uni.showToast({
+						title: "验证通过!",
+						icon: "none"
+					});
+				} else {
+					uni.showToast({
+						title: graceChecker.error,
+						icon: "none"
+					});
+				}
+			},
+			formReset: function(e) {
+				console.log('清空数据')
+			}
+
+
+
+
+
+		}
+	}
+</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 label text {
+		position: relative;
+		top: 2rpx
+	}
+
+	.form-item {
+		padding: 0 40rpx;
+		display: flex;
+		align-items: top;
+		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;
+		}
+
+
+	}
+
+
+
+
+
+	/* 站点多选下拉样式 start */
+
+	.layui-btn {
+		background-color: #5fb878;
+	}
+
+	a {
+		text-decoration: none;
+	}
+
+	.label {
+		padding: 2px 0px;
+		background: #aaa;
+		border-radius: 2px;
+		color: #fff;
+		display: block;
+		line-height: 20px;
+		height: 20px;
+		margin: 2px 5px 2px 0;
+		float: left;
+	}
+
+	.label span {
+		padding: 0 5px;
+		color: #fff;
+	}
+
+	.close {
+		padding: 1px 5px !important;
+	}
+
+	.close:hover {
+		/* background-color: #009E94;
+	    border-radius: 2px;
+	    color: tomato; */
+	}
+
+	.selectId input {
+		width: 100% !important;
+	}
+
+	.selectId input {
+		height: 25px;
+		padding: 1px 5px;
+		border-radius: 3px;
+		width: calc(100% - 12px);
+		outline-color: #5fb878;
+		border: 1px solid #5fb878;
+	}
+
+	.selectId {
+		position: relative;
+	}
+
+	.selectId dl {
+		border: 1px solid #eee;
+		border-radius: 3px;
+		margin: 2px 0px;
+		max-height: 300px;
+		overflow-x: hidden;
+		white-space: nowrap;
+		position: absolute;
+		width: 100%;
+		top: 40px;
+		background: #fff;
+		z-index: 1000
+	}
+
+	.selectId dl dd {
+		margin: 0;
+		padding: 5px 10px;
+	}
+
+	.selectId dl dd:hover {
+		background-color: #5FB878;
+		color: white;
+	}
+
+	.AD {
+		/* width: 210px;
+	        margin-left: 40px; */
+		overflow-y: auto;
+		max-height: 200px;
+		/* border: 2px solid #5fb878;
+	        border-radius: 6px;
+	        padding: 1px 2px; */
+	}
+
+	form .AD span {
+		width: auto;
+	}
+
+	.siteSelect {
+		width: 71%;
+		display: inline-block;
+	}
+
+
+	/* 站点多选下拉样式end */
+</style>

pages/accountManage/success/success.vue

@@ -0,0 +1,49 @@
+<template>
+	<view class="successWrapper">
+
+		
+
+			<view>
+				<img src="../../../static/success.png" alt="">
+				<!-- <img src="../../../static/fail.png" alt=""> -->
+				<view>提交成功</view>
+			</view>
+			<view class="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top" @click="submit()">返 回 </button>
+			</view>
+	
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				
+
+
+			}
+		},
+		onLoad: function(option) {
+
+		},
+		methods: {
+			
+
+
+
+
+
+		}
+	}
+</script>
+
+
+
+
+<style lang="scss">
+	
+</style>

pages/add-test/add-test.vue

@@ -1,85 +0,0 @@
-<template>
-	<view>
-		<view class="uni-padding-wrap uni-common-mt">
-			<form @submit="formSubmit" @reset="formReset">
-				<view class="uni-form-item uni-column">
-					<view class="title">姓名</view>
-					<input class="uni-input" name="nickname" placeholder="请输入姓名" />
-				</view>
-				<view class="uni-form-item uni-column">
-					<view class="title">性别</view>
-					<radio-group name="gender">
-						<label>
-							<radio value="男" /><text>男</text>
-						</label>
-						<label>
-							<radio value="女" /><text>女</text>
-						</label>
-					</radio-group>
-				</view>
-				<view class="uni-form-item uni-column">
-					<view class="title">爱好</view>
-					<checkbox-group name="loves">
-						<label>
-							<checkbox value="读书" /><text>读书</text>
-						</label>
-						<label>
-							<checkbox value="写字" /><text>写字</text>
-						</label>
-					</checkbox-group>
-				</view>
-				<view class="uni-form-item uni-column">
-					<view class="title">年龄</view>
-					<slider value="20" name="age" show-value></slider>
-				</view>
-				<view class="uni-form-item uni-column">
-					<view class="title">保留选项</view>
-					<view>
-						<switch name="switch" />
-					</view>
-				</view>
-				<view class="uni-btn-v">
-					<button form-type="submit">Submit</button>
-					<button type="default" form-type="reset">Reset</button>
-				</view>
-			</form>
-		</view>
-	</view>
-</template>
-<script>
-	var  graceChecker = require("../../common/graceChecker.js");
-	export default {
-		data() {
-			return {
-			}
-		},
-		methods: {
-			formSubmit: function(e) {
-				console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
-                //定义表单规则
-                var rule = [
-                    {name:"nickname", checkType : "string", checkRule:"1,3",  errorMsg:"姓名不能为空"},
-                    {name:"gender", checkType : "in", checkRule:"男,女",  errorMsg:"请选择性别"},
-                    {name:"loves", checkType : "notnull", checkRule:"",  errorMsg:"请选择爱好"}
-                ];
-                //进行表单检查
-                var formData = e.detail.value;
-                var checkRes = graceChecker.check(formData, rule);
-                if(checkRes){
-                    uni.showToast({title:"验证通过!", icon:"none"});
-                }else{
-                    uni.showToast({ title: graceChecker.error, icon: "none" });
-                }
-			},
-			formReset: function(e) {
-				console.log('清空数据')
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-form-item .title {
-		padding: 20rpx 0;
-	}
-</style>

pages/analyse/buildingCheck/buildingCheck.vue

@@ -13,10 +13,11 @@
 				</view>
 			</view>
 			<view class="cu-bar search bg-gray filter-section">
-				<view class="search-form round bg-white" style="margin-bottom:26rpx">
+				 <calendar></calendar>
+				<!-- <view class="search-form round bg-white" style="margin-bottom:26rpx">
 					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false" type="text"
-					 placeholder="选择时间" confirm-type="search"></input>
-				</view>
+					 placeholder="请选择时间" confirm-type="search"></input>
+				</view> -->
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>
 				</view>
@@ -24,7 +25,7 @@
 		</view>
 		<!-- 筛选框end -->
 		
-		<view class="processStatus" style="margin-top:206rpx">
+		<view class="processStatus  bg-white margin-bottom-sm" style="margin-top:206rpx">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				安全分析
@@ -34,12 +35,12 @@
 			</view>
 		</view>
 		
-		<view class="basic-info" >
+		<view class="basic-info  bg-white margin-bottom-sm" >
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				消防各子系统安装情况
 			</view>
-			<view class="info-content padding-lr">
+			<view class="info-content padding-lr padding-bottom">
 				<table style="border:1px solid #ccc"  cellspacing="0" cellpadding="0" align="center">
 					<tr>
 						<td>子系统安装情况</td>
@@ -47,110 +48,136 @@
 						<td>误报频率</td>
 					</tr>
 					<tr>
-						<td>建筑物类别</td>
-						<td>办公</td>
+						<td>火灾自动报警系统 </td>
+						<td>报警数量68，处理37</td>
+						<td>12%</td>
 					</tr>
 					<tr>
-						<td>建造日期</td>
-						<td>1999年3月21日</td>
+						<td>电气火灾监控系统</td>
+						<td>报警数量595，处理88</td>
+						<td>0</td>
 					</tr>
 					<tr>
-						<td>使用性质</td>
-						<td> 办公  </td>
+						<td>消防给水系统</td>
+						<td>报警数量1414，处理1252  </td>
+						<td>1% </td>
 					</tr>
 					<tr>
-						<td>火灾危险级</td>
-						<td> 一级</td>
+						<td>消火栓系统</td>
+						<td>报警数量3020，处理387</td>
+						<td> 15%</td>
 					</tr>
 					<tr>
-						<td>耐火等级</td>
-						<td>一级 </td>
+						<td>自动喷水灭火系统</td>
+						<td>报警数量36351，处理9</td>
+						<td>  23%</td>
 					</tr>
 					<tr>
-						<td> 结构类型</td>
-						<td>砖混结构</td>
+						<td>防排烟系统</td>
+						<td>报警数量10，处理9</td>
+						<td> 0</td>
 					</tr>
+				</table>
+			</view>
+		</view>
+		
+		<view class="processStatus  bg-white margin-bottom-sm">
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				告警频发点位统计分析
+			</view>
+			<view class="info-content padding-lr padding-bottom">
+				<table style="border:1px solid #ccc"  cellspacing="0" cellpadding="0" align="center">
 					<tr>
-						<td>建筑高度</td>
-						<td> 100m</td>
+						<td>子系统 </td>
+						<td>报警点位 </td>
+						<td>报警次数</td>
 					</tr>
 					<tr>
-						<td> 建筑面积</td>
-						<td>15698.3㎡</td>
+						<td rowspan="3">火灾自动报警系统</td>
+						<td>一楼大厅门口 </td>
+						<td>12</td>
 					</tr>
 					<tr>
-						<td>占地面积</td>
-						<td>15698.3㎡</td>
+						
+						<td>二楼茶水间</td>
+						<td>10</td>
 					</tr>
-	
 					<tr>
-						<td>标准层面积</td>
-						<td>5000㎡</td>
+						
+						<td>厨房</td>
+						<td>8</td>
 					</tr>
 					<tr>
-						<td>地上层数  </td>
-						<td>3</td>
+						<td rowspan="3"> 电气火灾监控系统</td>
+						<td> 二楼卫生间  </td>
+						<td> 7</td>
 					</tr>
 					<tr>
-						<td>地上层面积  </td>
-						<td>5000㎡</td>
+						
+						<td>二楼茶水间</td>
+						<td>6</td>
 					</tr>
-					
 					<tr>
-						<td>地下层数 </td>
-						<td> 0</td>
+						<td>三楼大厅</td>
+						<td>5</td>
 					</tr>
+					
 					<tr>
-						<td>地下层面积 </td>
-						<td>-</td>
+						<td>消防给水系统</td>
+						<td>二楼接待室</td>
+						<td>4</td>
 					</tr>
 					<tr>
-						<td>消防控制室位置</td>
-						<td>一楼</td>
+						<td> 消火栓系统</td>
+						<td> 三楼会议室</td>
+						<td>3</td>
 					</tr>
 					<tr>
-						<td> 避难层数量</td>
+						<td> 自动喷水灭火系统</td>
+						<td> 一楼大厅 </td>
 						<td>2</td>
 					</tr>
 					<tr>
-						<td> 消防电梯数量</td>
-						<td>2</td>
+						<td rowspan="2">防排烟系统</td>
+						<td>三楼档案室 </td>
+						<td>1</td>
+					</tr>
+					<tr>
+						<td>一楼展厅</td>
+						<td>1</td>
 					</tr>
+					
 				</table>
 			</view>
 		</view>
-
-		
-		<view class="processStatus">
-			<view class="info-tit margin-left-xs">
-				<text class="cuIcon-titles margin-right-xs"></text>
-				告警频发点位统计分析
-			</view>
-			<view class="padding-lr">
-				<img src="../../../static/building1.png" alt="" width="100%">
-			</view>
-		</view>
 		
 		
-		<view class="processStatus">
+		<view class="processStatus  bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				存在问题或需要改进事项
 			</view>
-			<view class="padding-lr padding-bottom-lg">
-				<img src="../../../static/building2.png" alt="" width="100%">
-				<br><br>
+			<view class="padding-lr padding-bottom-lg" style="font-size:30rpx;text-indent:60rpx;line-height:1.7">
+				<view>用户信息传输装置该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view>水系统该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view> 消防栓该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view>液位该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view>电气火灾该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view> 视频监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view> 电梯监测该类设备隐患极高或存在故障，建议尽早进行排查； </view>
+				<view>可燃气体监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
 			</view>
 		</view>
 		
-		<view class="processStatus">
+		<view class="processStatus  bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				其他事宜
 			</view>
-			<view class="padding-lr padding-bottom-lg">
-				<img src="../../../static/building2.png" alt="" width="100%">
-				<br><br>
+			<view class="padding-lr padding-bottom-lg" style="font-size:30rpx;text-indent:60rpx;line-height:1.7">
+				<view>目前数据反映：烟感该类设备通信情况较好，需要保持； </view>
+				<view>目前数据反映：RTU该类设备通信情况较好，需要保持。</view>
 			</view>
 		</view>
 
@@ -221,7 +248,21 @@
 	
 	
 
-	
+page {
+		background: #EDEDED;
+	}
+/deep/ .leave_cont .ul .li{
+		width:42%!important;
+		
+	}
+/deep/ .leave_cont .ul{
+		background:#fff;
+		
+	}
+/deep/	.date{font-size:28rpx;}
+/deep/	.leave_cont{
+	width:76%
+}
 	
 
 

pages/analyse/buildingCheck/components/chart/chart.vue

@@ -80,10 +80,6 @@
 						center: ['50%', '55%'],
 						itemStyle: {
 							normal: {
-								// shadowBlur: 20,
-								// shadowColor: '#F9F5F7',
-								// shadowOffsetX: 0,
-								// shadowOffsetY: 0,
 							},
 						},
 						data: [{
@@ -124,21 +120,7 @@
 						},
 						label: {
 							normal: {
-								formatter: '{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 + '%';
-
-								// },
-
+								formatter: '{b}：\n{d}%',
 							}
 						},
 					}]

pages/analyse/buildingCheck/components/chart2/chart2.vue

@@ -1,222 +0,0 @@
-<template>
-	<view class="content">
-
-		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts2" class="echarts"></view>
-
-	</view>
-</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 {
-		props:{
-			bindData:{
-				type:Object,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				option: {
-					color: ['#F67F32', '#3BD2BD', '#1DABFE'],
-
-					title: {
-						left: 'center'
-					},
-					tooltip: {
-						trigger: 'item',
-						// formatter: "{a} <br/>{b}: {c} ({d}%)"
-						formatter: "{b}: {c} "
-					},
-
-					title: [{ //aa标题
-						text: '{val|' +(parseInt(this.bindData.alarmCount)+parseInt(this.bindData.eventCount)+ parseInt(this.bindData.hiddenDangerCount))+ '}\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%'],
-						center: ['50%', '55%'],
-						itemStyle: {
-							normal: {
-								shadowBlur: 20,
-								shadowColor: '#F9F5F7',
-								shadowOffsetX: 0,
-								shadowOffsetY: 0,
-							},
-						},
-
-						data: [{
-								name: "报警",
-								value: this.bindData.alarmCount
-							},
-							{
-								name: "事件",
-								value: this.bindData.eventCount
-							},
-							{
-								name: "隐患",
-								value: this.bindData.hiddenDangerCount
-							},
-
-						],
-						emphasis: {
-							itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-							}
-						},
-						labelLine: {
-							normal: {
-								length: 10, //aa折线长度
-								length2: 20, //aa折线长度
-
-							}
-						},
-						label: {
-							normal: {
-								formatter: '{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 + '%';
-
-								// },
-
-							}
-						},
-					}]
-				}
-			}
-		},
-		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.min.js'
-				script.onload = this.initEcharts.bind(this)
-				document.head.appendChild(script)
-			}
-		},
-		methods: {
-			initEcharts() {
-				myChart = echarts.init(document.getElementById('echarts2'))
-				// 观测更新的数据在 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/analyse/buildingCheck/components/chart3/chart3.vue

@@ -1,236 +0,0 @@
-<template>
-	<view class="content">
-		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts3" class="echarts"></view>
-
-	</view>
-</template>
-
-<script>
-	//start
-
-	//end
-
-
-	export default {
-		
-		
-		props:{
-			bindData:{
-				type:Object,
-				default: ''
-			}
-		},
-		
-		data() {
-			return {
-				option: {
-					// legend: {
-					//         data: ['bar', 'bar2', 'bar3', 'bar4'],
-					// 		color: ['#1ECC22', '#0FC6C8','#0D88F0', '#FF1313', '#FF522A' ],
-							
-					//     },
-					grid: {  //aa位置
-						top: '2%',
-						right: '8%',
-						bottom: '1%',
-						left: '17%',
-						
-					},
-
-					color: ['#1ECC22', '#0FC6C8','#0D88F0', '#FF1313', '#FF522A' ],
-					xAxis: [{
-						show: false
-					}],
-					yAxis: [{  //aay轴
-							axisTick: 'none',
-							axisLine: 'none',
-							axisLabel: {
-								verticalAlign: 'bottom',
-								align: 'bottom',
-								padding: [0, 0, 8, 5],
-								textStyle: {
-									color: '#333',
-									fontSize:'15'
-
-								}
-							},
-							data: ['正常','其他','预警','故障','离线'   ],
-
-						},
-						{
-							//左侧柱状图的Y轴
-							axisTick: 'none',
-							axisLine: 'none',
-							data: [this.bindData.normalCount,this.bindData.otherCount,this.bindData.earlyWarningCount,this.bindData.earlyWarningCount,this.bindData.offlineCount],
-							axisLabel: {
-								show: true,
-								verticalAlign: 'bottom',
-								align: 'right',
-								padding: [0, 10, 8, 0],
-								textStyle: {
-									color: '#333',
-									fontSize:'15'
-
-								},
-								formatter: function(value) {
-									return value 
-								}
-
-							}
-						},
-
-					],
-					series: [{
-							type: 'bar',
-							data: [this.bindData.normalCount, , , , ],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									barBorderRadius: 6,
-								}
-							},
-							z: 2
-						}, {
-							type: 'bar',
-							data: [ ,this.bindData.otherCount, , , ],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									barBorderRadius: 6,
-								}
-							},
-							z: 2
-						}, {
-							type: 'bar',
-							data: [ , ,this.bindData.earlyWarningCount, , ],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									barBorderRadius: 6,
-								}
-							},
-							z: 2
-						},
-						{
-							type: 'bar',
-							data: [ , , ,this.bindData.faultCount, ],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									barBorderRadius: 6,
-								}
-							},
-							z: 2
-						},
-						{
-							type: 'bar',
-							data: [ , , , ,this.bindData.offlineCount],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									barBorderRadius: 6,
-								}
-							},
-							z: 2
-						},
-
-						{
-							type: 'bar',
-							barGap: '-100%',
-							data: [1000, 1000, 1000, 1000, 1000],
-							barWidth: 6,
-							itemStyle: {
-								normal: {
-									color: 'rgba(0,0,0, 0.15)',
-									barBorderRadius: 6,
-								}
-							},
-							z: 0
-						},
-					]
-				}
-			}
-			
-			
-		},
-		computed: {
-					// total:function(){
-					// 	 return parseInt(this.bindData.normalCount)+3
-					//  },
-					// onePersent:function(){
-					// 	 return parseInt(1/this.total*100)
-					//  },
-					 
-					 
-		},
-		onLoad() {
-			
-			// this.option.series.reverse()
-
-		},
-		
-		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.min.js'
-				script.onload = this.initEcharts.bind(this)
-				document.head.appendChild(script)
-			}
-		},
-		methods: {
-			initEcharts() {
-				myChart = echarts.init(document.getElementById('echarts3'))
-				// 观测更新的数据在 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;
-		/* 	background:pink */
-	}
-</style>

pages/analyse/buildingCheck/components/chart4/chart4.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="content">
-		111{{nowData}}
-		<br>
-		222{{bindData}}
-
-	</view>
-</template>
-
-<script>
-	
-	
-	export default {
-		 name: 'chart4',
-		
-		props:{
-			bindData:{
-				type:Object,
-				default: ''
-			},
-		},
-		data() {
-			return {
-				nowData:this.bindData
-				}
-		},
-		onLoad() {
-
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-
-<style>
-	
-</style>

pages/authAdd/authAdd.vue

@@ -1,632 +0,0 @@
-<template>
-	<view class="appWrapper">
-		<!-- 权限新增 start -->
-		<form action=""  v-if="!phone">
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					用户名称
-				</view>
-
-				<select name="" id="" v-model="formMess.mobile" filterable clearable>
-					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
-				</select>
-
-			</view>
-			
-			<view class="form-item">
-				<view class="title " style="vertical-align:top">
-					<text class="necessary">*</text>
-					站点:
-				</view>
-				<view style="position:relative" class="innerZd">
-					<input name="siteName" v-model="formMess.siteName" @click="test" @focus="focusfns" @input="handleInput()"
-					 placeholder="请输入或选择"></input>
-
-					<view class="siteItems" v-if="isShow" style="max-height:60vh;overflow:auto">
-						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
-
-						<view class="site-item" v-for="(item,index) in siteItemData" @click="add(item,index)" :key="index">{{item.siteName}}</view>
-					</view>
-					<view style="width:500rpx;max-height:30vh;overflow:scroll" class="selectedBox">
-						<button class="cu-btn  sm margin-xs" v-for="(item,index) in selectedData" @click="deleteItem(item,index)">
-							{{item.siteName}}
-							<text class="lg text-gray cuIcon-close"></text>
-						</button>
-
-					</view>
-				</view>
-
-
-			</view>
-
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					角色权限
-				</view>
-				<radio-group name="gender" @change="radioChange">
-					<label class="margin-right">
-						<radio value="2" checked /><text>维护人员</text>
-					</label>
-					<label>
-						<radio value="3" /><text>供电人员</text>
-					</label>
-				</radio-group>
-			</view>
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
-			</view>
-		</form>
-		<!-- 权限新增 end -->
-		
-		
-		
-		<!-- 权限修改 start -->
-		<form action=""  v-else>
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					用户名称
-				</view>
-		
-				<select name="" id="" v-model="authorityData.phone" filterable clearable disabled="disabled"> 
-					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
-				</select>
-		
-			</view>
-			
-			<view class="form-item">
-				<view class="title " style="vertical-align:top">
-					<text class="necessary">*</text>
-					站点:
-				</view>
-				<view style="position:relative" class="innerZd">
-					<input name="siteName" v-model="authorityData.siteName" @click="test" @focus="focusfns" @input="handleInput()"
-					 placeholder="请输入或选择"></input>
-		
-					<view class="siteItems" v-if="isShow" style="max-height:60vh;overflow:auto">
-						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
-		
-						<view class="site-item" v-for="(item,index) in siteItemData" @click="add(item,index)" :key="index">{{item.siteName}}</view>
-					</view>
-					<view style="width:500rpx;max-height:30vh;overflow:scroll" class="selectedBox">
-						<button class="cu-btn  margin-xs" v-for="(item,index) in selectedData" @click="deleteItem(item,index)">
-							{{item.siteName}}
-							<text class="lg text-gray cuIcon-close"></text>
-						</button>
-		
-					</view>
-				</view>
-		
-		
-			</view>
-		
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					角色权限
-				</view>
-				<radio-group name="gender" @change="radioChange">
-					<label class="margin-right">
-						<radio value="2" :checked='authorityData.permissionLabel == 2' /><text>维护人员</text>
-					</label>
-					<label>
-						<radio value="3" :checked='authorityData.permissionLabel == 3' /><text>供电人员</text>
-					</label>
-				</radio-group>
-			</view>
-		
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="editSbuimt">提 交 </button>
-			</view>
-		</form>
-		<!-- 权限修改 end -->
-	</view>
-</template>
-
-<script>
-	export default {
-
-		data() {
-			return {
-				index: -1,
-				type: '0',
-				
-				
-				phone:'',
-				authorityData:{},
-
-				isShow: false,
-				formMess: {
-					"userName": "",
-					"siteName": "",
-					"place": "",
-					"longitude": "",
-					"dimension": "",
-					"contactor": "",
-					"mobile": "",
-					
-					
-					
-				},
-
-				// 站点多选下拉
-				siteItemDataOrigin: [],
-				selectedData: [],
-				phoneData:[],
-				siteItemData: [],
-				selectedArr: [],
-				selectedString: '',
-				radioOne: 3,
-
-				
-			}
-		},
-
-		mounted() {
-			document.addEventListener('click', (e) => {
-				if (e.target.className != 'uni-input-input') {
-					this.isShow = false;
-				}
-			});
-		},
-		onLoad: function(option) {
-			this.phone = option.phone;
-			if (option.phone) {
-				uni.setNavigationBarTitle({
-					title: '权限修改'
-				});
-				this.getAuthority({"phone":this.phone})
-			} else {
-				uni.setNavigationBarTitle({
-					title: '权限新增'
-				});
-			}
-			this.getSiteList();
-			this.getphoneList()
-			
-			
-			
-
-
-		},
-		methods: {
-			
-			//修改提交
-			editSbuimt(){
-				this.selectedArr = [];
-				this.selectedData.forEach(item => {
-					this.selectedArr.push(item.id)
-				})
-				
-				//修改验证
-				
-				if (!this.selectedData.length) {
-					uni.showToast({
-						title: "请选择站点",
-						icon: "none"
-					});
-					return
-				}
-				console.log('this.selectedData')
-				console.log(this.selectedData)
-				this.selectedString = this.selectedArr.toString();
-				this.setEditAuthority({
-					"phone": this.authorityData.phone,
-					"siteId": this.selectedString,
-					"permissionLabel": this.radioOne
-				})
-				
-			},
-			
-			
-			// 修改请求
-			async setEditAuthority(params={}) {
-				const res = await this.$myRequest({
-					url: 'AuthorityManagement/setEditAuthority',
-					data:params
-				})
-				if (!res.data.flag) {
-					uni.showToast({
-						title: "添加失败",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: "添加成功",
-					});
-				}
-				setTimeout(() => {
-					uni.navigateTo({
-						url: '/pages/authManage/authManage',
-				
-					});
-				}, 1000);
-			
-			},
-			
-			
-			// 回显信息请求
-			async getAuthority(params={}) {
-				const res = await this.$myRequest({
-					url: 'AuthorityManagement/getAuthority',
-					data:params
-				})
-				this.authorityData=res.data.data[0]
-				this.selectedData=res.data.data[0].siteIdData
-			
-			},
-			
-			
-			radioChange(e) {
-				console.log('type:' + e.detail.value);
-				this.radioOne = e.detail.value;
-			},
-			//新增提交
-			async addSubmit() {
-				this.selectedArr = [];
-				this.selectedData.forEach(item => {
-					this.selectedArr.push(item.id)
-				})
-				this.selectedString = this.selectedArr.toString();
-				//提交验证
-				if (!this.formMess.mobile) {
-					uni.showToast({
-						title: "请选择用户",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.selectedData.length) {
-					uni.showToast({
-						title: "请选择站点",
-						icon: "none"
-					});
-					return
-				}
-				let res = await this.addAuthority({
-					"phone": this.formMess.mobile,
-					"siteId": this.selectedString,
-					"permissionLabel": this.radioOne
-				})
-
-				if (!res.data.flag) {
-					uni.showToast({
-						title: "添加失败",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: "添加成功",
-					});
-				}
-				setTimeout(() => {
-					uni.navigateTo({
-						url: '/pages/authManage/authManage',
-
-					});
-				}, 1000);
-
-			},
-
-
-			//电话号码下拉请求数据
-			async getphoneList() {
-				const res = await this.$myRequest({
-					url: 'AuthorityManagement/getPhoneList',
-				})
-			
-				this.phoneData = res.data.data;
-				console.log(this.phoneData)
-				
-			},
-			//站点下拉请求数据
-			async getSiteList() {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/getSiteList',
-				})
-				this.siteItemData = res.data.data;
-				this.siteItemDataOrigin = res.data.data;
-				
-			},
-			
-			
-			addAuthority(params = {}) {
-				return this.$myRequest({
-					url: 'AuthorityManagement/setaddAuthority',
-					data: params
-				})
-			},
-
-			add: function(item, index) {
-				this.selectedData.push(item);
-				console.log('1111')
-				console.log(this.selectedData)	
-				this.isShow = false;
-				this.formMess.siteName = '';
-				this.siteItemData.splice(index, 1);
-
-			},
-			deleteItem: function(item, index) {
-				this.selectedData.splice(index, 1);
-				this.siteItemDataOrigin.push(item);
-				//将元素根据搜索内容过滤出来  这里改变了siteItemData
-				this.siteItemData = this.getNotSelectItem();
-				this.siteItemData = this.siteItemData.filter(item => item.siteName.indexOf(this.formMess.siteName) > -1);
-			},
-
-			// 站点多选下拉
-			test: function() {
-				this.isShow = !this.isShow;
-			},
-			test2: function() {
-				this.isShow = false;
-			},
-			handleInput() {
-				//将元素根据搜索内容过滤出来  这里改变了siteItemData
-				this.siteItemData = this.getNotSelectItem();
-				this.siteItemData = this.siteItemData.filter(item => item.siteName.indexOf(this.formMess.siteName) > -1);
-
-			},
-			// 站点多选下拉 end
-
-			getNotSelectItem() {
-
-				let ok1 = this.siteItemDataOrigin;
-				let ok2 = this.selectedData;
-
-				if (ok2.length) {
-					for (let i = 0; i < ok2.length; i++) {
-						for (let j = 0; j < ok1.length; j++) {
-							if (ok1[j] === ok2[i]) { //值已经被选中
-								ok1.splice(j, 1);
-							}
-						}
-					}
-
-				}
-				return ok1;
-			},
-
-			formSubmit: function(e) {
-				console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
-				//定义表单规则
-				var rule = [{
-						name: "userName",
-						checkType: "string",
-						checkRule: "1,3",
-						errorMsg: "姓名应为1-3个字符..."
-					},
-					// {name:"gender", checkType : "in", checkRule:"男,女",  errorMsg:"请选择性别"},
-					// {name:"loves", checkType : "notnull", checkRule:"",  errorMsg:"请选择爱好"}
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				if (checkRes) {
-					uni.showToast({
-						title: "验证通过!",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: "none"
-					});
-				}
-			},
-			formReset: function(e) {
-				console.log('清空数据')
-			},
-			focusfns: function(e) {
-				// this.getNotSelectItem();
-
-				//将元素根据搜索内容过滤出来  这里改变了siteItemData
-
-				this.siteItemData = this.getNotSelectItem();
-
-
-				this.siteItemData = this.siteItemData.filter(item => item.siteName.indexOf(this.formMess.siteName) > -1);
-			},
-
-
-
-
-
-		}
-	}
-</script>
-
-
-
-
-<style lang="scss">
-	page {
-		height: 100% !important
-	}
-
-
-	.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 label text {
-		position: relative;
-		top: 2rpx
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		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;
-		}
-
-
-	}
-
-
-
-
-
-	/* 站点多选下拉样式 start */
-
-	.layui-btn {
-		background-color: #5fb878;
-	}
-
-	a {
-		text-decoration: none;
-	}
-
-	.label {
-		padding: 2px 0px;
-		background: #aaa;
-		border-radius: 2px;
-		color: #fff;
-		display: block;
-		line-height: 20px;
-		height: 20px;
-		margin: 2px 5px 2px 0;
-		float: left;
-	}
-
-	.label span {
-		padding: 0 5px;
-		color: #fff;
-	}
-
-	.close {
-		padding: 1px 5px !important;
-	}
-
-	.close:hover {
-		/* background-color: #009E94;
-	    border-radius: 2px;
-	    color: tomato; */
-	}
-
-	.selectId input {
-		width: 100% !important;
-	}
-
-	.selectId input {
-		height: 25px;
-		padding: 1px 5px;
-		border-radius: 3px;
-		width: calc(100% - 12px);
-		outline-color: #5fb878;
-		border: 1px solid #5fb878;
-	}
-
-	.selectId {
-		position: relative;
-	}
-
-	.selectId dl {
-		border: 1px solid #eee;
-		border-radius: 3px;
-		margin: 2px 0px;
-		max-height: 300px;
-		overflow-x: hidden;
-		white-space: nowrap;
-		position: absolute;
-		width: 100%;
-		top: 40px;
-		background: #fff;
-		z-index: 1000
-	}
-
-	.selectId dl dd {
-		margin: 0;
-		padding: 5px 10px;
-	}
-
-	.selectId dl dd:hover {
-		background-color: #5FB878;
-		color: white;
-	}
-
-	.AD {
-		/* width: 210px;
-	        margin-left: 40px; */
-		overflow-y: auto;
-		max-height: 200px;
-		/* border: 2px solid #5fb878;
-	        border-radius: 6px;
-	        padding: 1px 2px; */
-	}
-
-	form .AD span {
-		width: auto;
-	}
-
-	.siteSelect {
-		width: 71%;
-		display: inline-block;
-	}
-	.selectedBox .cu-btn{
-		padding: 6rpx 20rpx;
-		    font-size: 22rpx;
-		    height: auto;
-		    line-height: 36rpx;
-		    text-align: left;
-		
-	}
-
-
-	/* 站点多选下拉样式end */
-</style>

pages/export/export.vue

@@ -2,7 +2,6 @@
 	<view class="processWrapper ">
 		<view class="ding">
 			<calendar></calendar>
-			
 		</view>
 
 		<block v-if="TabCur==0">

pages/index/components/searchSelect/searchSelect.vue

@@ -0,0 +1,95 @@
+<template>
+	<view>
+		
+		<view class="searchSelect shadow" v-if="flag">
+			<view class="cu-bar search bg-white">
+				<view class="search-form round" style="margin-top:0">
+					<input @focus="InputFocus" @blur="InputBlur" @input="handleInput()" v-model="searchInput"
+						:adjust-position="false" type="text" placeholder="" confirm-type="search"
+						style="border:none"></input>
+					<text class="cuIcon-search "></text>
+				</view>
+			</view>
+			<view class="select-items">
+				<view class="select-item" v-for="(item,index) in searchList" @click="clickSelectItem(item,index)"
+					:key="index">{{item}}</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'searchSelect',
+		props: {
+			flag: {
+				type: Boolean,
+				default: false
+			},
+			searchList: {
+				type: Array,
+				// default: []
+			},
+			searchList2: {
+				type: Array,
+				// default: []
+			}
+		},
+		data() {
+			return {
+				
+				searchInput: '',
+				// flag: false,
+				// searchList: [],
+				// searchList2: [],
+				
+			}
+		},
+		onload(){
+			this.getSearchList();
+		},
+		methods: {
+			
+			//请求
+			async getSearchList(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'Index/getSiteDropDownBox',
+					data: ming
+				})
+				res.data.data.forEach(item => {
+					this.searchList.push(item.siteName)
+					this.searchList2.push(item.siteName)
+				});
+			},
+			// 下拉选择
+			clickSelectItem(item, index) {
+				this.getSearchList({
+					"siteName": item
+				});
+				this.flag = false
+			},
+			handleInput() {
+				var newlist = this.searchList2.filter(item => item.indexOf(this.searchInput) > -1)
+				this.searchList = newlist
+			},
+			
+			
+			InputFocus(e) {
+				this.InputBottom = e.detail.height
+			},
+			InputBlur(e) {
+				this.InputBottom = 0
+			},
+			
+			changeTab(Inv) {
+				that.navIdx = Inv;
+			
+			}
+			}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/index.vue

@@ -16,6 +16,7 @@
 			</view>
 		</view>
 		<!-- 下拉选择 end -->
+		<!-- <search-Select :flag="flag"></search-Select> -->
 
 		<!-- 图表 -->
 		<view class="section1 section bg-white padding-xs">
@@ -52,7 +53,7 @@
 							<image src="../../static/chart3-5.png" style="width:64rpx;height:64rpx"></image>
 						</li>
 					</ul>
-					<chart3 :bindData="staticData">
+					<chart3 :bindData="staticData" :searchList="searchList"  :searchList2="searchList2">
 					</chart3>
 				</view>
 			</view>
@@ -80,6 +81,10 @@
 	import chart from './components/chart/chart.vue';
 	import chart2 from './components/chart2/chart2.vue';
 	import chart3 from './components/chart3/chart3.vue';
+	
+	import searchSelect from './components/searchSelect/searchSelect.vue';
+	
+	
 	import json from '../../data/json.js';
 
 	export default {
@@ -87,25 +92,23 @@
 			chart,
 			chart2,
 			chart3,
+			searchSelect
 		},
 
 		data() {
 			return {
-				componentKey: 0,
-				arr: [],
-				searchInput: '',
-
-				flag: false,
-				cuIconList: json.cuIconList,
-				Inv: 0,
-
-
 				staticData: json.staticData.data[0],
 				alarmCount: json.staticData.data[0].alarmCount,
+				cuIconList: json.cuIconList,
+				Inv: 0,
 
+				
+				flag: false,
 				searchList: [],
 				searchList2: [],
-
+				
+				
+				searchInput: '',
 			};
 		},
 
@@ -122,9 +125,7 @@
 
 			// 图表切换渲染
 			this.hackReset = true;
-			// this.$nextTick(() => {
-			// 	this.hackReset = true;
-			// })
+		
 
 			// 数据渲染
 			this.getSearchList();
@@ -158,9 +159,10 @@
 					case 7:
 						url = "/pages/safeGuard/safeGuard"
 						break;
-						case 8:
-							url = "/pages/test/test"
+						case 10:
+							url = "/pages/accountManage/accountManage"
 							break;
+						
 					default:
 						break;
 				}
@@ -179,6 +181,16 @@
 					});
 				}
 			},
+			// 页面跳转
+			goOfflineList() {
+				uni.navigateTo({
+					url: '/pages/deviceOffLine/deviceOffLine',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			
 
 			//请求
 			async getSearchList(ming = {}) {
@@ -191,8 +203,12 @@
 					this.searchList2.push(item.siteName)
 				});
 			},
-
-
+			
+			showTag() {
+				this.flag = !this.flag;
+			},
+			
+			
 			// 下拉选择
 			clickSelectItem(item, index) {
 				this.getSearchList({
@@ -205,9 +221,7 @@
 				this.searchList = newlist
 			},
 
-			showTag() {
-				this.flag = !this.flag;
-			},
+			
 
 			InputFocus(e) {
 				this.InputBottom = e.detail.height
@@ -222,16 +236,7 @@
 			},
 
 
-			// 页面跳转
-			goOfflineList() {
-				uni.navigateTo({
-					url: '/pages/deviceOffLine/deviceOffLine',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-
+		
 		}
 	}
 </script>

pages/info/fireBashDetail/fireBashDetail.vue

@@ -47,8 +47,8 @@
 				<text class="icon iconfont margin-right-xs margin-left-lg">&#xe60c;</text>
 				分享
 			</view>
-			<view class="share-item"><text class="icon iconfont margin-right-xs margin-left-lg">&#xe62a;</text>收藏</view>
-			<view class="share-item"><text class="icon iconfont margin-right-xs margin-left-lg">&#xe600;</text>点赞</view>
+			<view class="share-item" @click="clickPraise()" :class="[praise?'active':'']"><text class="icon iconfont margin-right-xs margin-left-lg"  >&#xe62a;</text>收藏</view>
+			<view class="share-item"  @click="clickZan()" :class="[zan?'active':'']"><text class="icon iconfont margin-right-xs margin-left-lg">&#xe600;</text>点赞</view>
 		</view>
 
 
@@ -62,10 +62,20 @@
 	export default {
 		data() {
 			return {
+				praise:false,
+				zan:false
 
 			}
 		},
 		methods: {
+			clickPraise() {
+		
+				this.praise = !this.praise;
+			},
+			clickZan() {
+		
+				this.zan = !this.zan;
+			},
 
 		}
 	}

pages/info/pushList/pushList.vue

@@ -1,22 +1,192 @@
 <template>
-	<view>
+	<view class="fireBashWrapper pushListWrapper ">
+		<!-- 		<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="" style="margin-top:0">
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index"  @tap="goFireBaseDetail">
+						<view class="cu-avatar" style="background-image:url(../../../static/push-list.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.subtit}}
+								</view>
+							</view>
+							<view class="pro-date">{{item.time}}</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</block>
+		<block v-if="TabCur==1">
+			<view class="" style="margin-top:0">
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index"  @tap="goFireBaseDetail">
+						<view class="cu-avatar" style="background-image:url(../../../static/push-list.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.subtit}}
+								</view>
+							</view>
+							<view class="pro-date">{{item.time}}</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</block>
+
 	</view>
 </template>
 
 <script>
+	import json from '../../../data/json.js';
 	export default {
 		data() {
 			return {
+				unporcessList:[{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				}],
 				
-			}
+				processedList: json.processedList,
+
+				type: '0',
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+				TabCur: 0,
+				tabNav: ['未读', '已读']
+			};
 		},
+		
 		methods: {
-			
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			},
+
+			// 页面跳转
+			goUnprocessDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/unprocessDetail?type=1',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goProcessedDetail() {
+				uni.navigateTo({
+					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: () => {}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<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
+		}
+	}
 </style>
+

pages/safeGuard/QA/QA.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="qa">
 		<view class="cu-list menu-avatar">
-			<view class="qa-tit cu-item ">
+			<view class="qa-tit cu-item " @click="click">
 				<view class="cu-avatar round" style="background-image: url(../../static/zr.png)"></view>
 				<view class="content">
 					<view class="title">保险责任</view>
 				</view>
 				<view class="nav-right">
-					<view>
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe63d;</text>
+					<view :class="[isShow?'':'rotate180']">
+						<text class="icon iconfont margin-right-xs margin-left-xs " >&#xe63d;</text>
 					</view>
 				</view>
 			</view>
-			<view class="qa-des padding ">
+			<view class="qa-des padding " v-show="isShow">
 				<view>一、保险期间内，被保险人在保险单载明的场 所内依法从事生产、经营活动时，因该场所内发生 火灾、爆炸造成第三人身伤亡，依照中华人民共和 国法律（不包括港澳台地区法律）应由被保险人承
 					担的经济赔偿责任，保险人按照本保险合同的约定 负责赔偿。 </view>
 				<view>二、发生保险事故后，被保险人因此而被提起 仲裁或者诉讼的，应由被保险人支付的仲裁或诉讼 费用以及事先经保险人书面同意支付的其它必要、
@@ -22,38 +22,38 @@
 		</view>
 
 		<view class="cu-list menu-avatar">
-			<view class="qa-tit cu-item ">
+			<view class="qa-tit cu-item " @click="click2">
 				<view class="cu-avatar round" style="background-image: url(../../static/xe.png)"></view>
 				<view class="content">
 					<view class="title">保险限额</view>
 				</view>
 				<view class="nav-right">
-					<view>
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe63d;</text>
+					<view  :class="[isShow2?'':'rotate180']">
+						<text class="icon iconfont margin-right-xs margin-left-xs">&#xe63d;</text>
 					</view>
 				</view>
 			</view>
-			<view class="qa-des padding ">
+			<view class="qa-des padding "  v-show="isShow2">
 				<view>保险合同的责任限额包括每人责任限额和累计 责任限额，由投保人与保险人协商确定，并在保险 合同中载明。</view>
 			</view>
 			<view class="bottom-line"></view>
 		</view>
 
 		<view class="cu-list menu-avatar">
-			<view class="qa-tit cu-item ">
+			<view class="qa-tit cu-item " @click="click3">
 				<view class="cu-avatar round" style="background-image: url(../../static/qt.png)"></view>
 				<view class="content">
 					<view class="title">其他事项</view>
 				</view>
 				<view class="nav-right">
-					<view>
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe63d;</text>
+					<view  :class="[isShow3?'':'rotate180']">
+						<text class="icon iconfont margin-right-xs margin-left-xs">&#xe63d;</text>
 					</view>
 				</view>
 			</view>
-			<view class="qa-des padding ">
+			<view class="qa-des padding "  v-show="isShow3">
 				<view>保险责任开始前，投保人要求解除保险合同的， 应当向保险人支付相当于保险费5%的退保手续费， 保险人应当退还剩余部分保险费；保险人要求解除 保险合同的，不得向投保人收取手续费并应退还已
-					收取的保险费。  </view>
+					收取的保险费。 </view>
 				<view>保险责任开始后，投保人要求解除保险合同的， 自书面通知送达保险人之日起，保险合同解除，保 险人按照保险责任开始之日起至合同解除之日止期 间按短期费率计收保险费，并退还剩余部分保险费；
 					保险人要求解除保险合同的，应提前十五日向投保 人发出解约通知书解除本保险合同，保险人按照保 险责任开始之日起至合同解除之日止期间与保险期 间的日比例计收保险费，并退还剩余部分保险费。</view>
 			</view>
@@ -66,15 +66,35 @@
 	export default {
 		data() {
 			return {
+				isShow: true,
+				isShow2: true,
+				isShow3: true
 
 			}
 		},
 		methods: {
+			click() {
+				this.isShow = !this.isShow;
+			},
+			click2() {
+				this.isShow2 = !this.isShow2;
+			},
+			click3() {
+				this.isShow3 = !this.isShow3;
+			}
+
 
 		}
 	}
 </script>
 
 <style>
+	.rotate180{
+		transform:rotate(180deg);
+		-ms-transform:rotate(180deg); /* Internet Explorer */
+		-moz-transform:rotate(180deg); /* Firefox */
+		-webkit-transform:rotate(180deg); /* Safari 和 Chrome */
+		-o-transform:rotate(180deg); /* Opera */
+	}
 
 </style>

pages/xunJian/xunJian.vue

@@ -20,11 +20,11 @@
 </template>
 
 <script>
-	// import json from '../../data/json.js';
+	import json from '../../data/json.js';
 	export default {
 		data() {
 			return {
-			// inspectList: json.xunJianList,
+			inspectList: json.xunJianList,
 
 			};
 		},