modify

common/common.scss

@@ -107,6 +107,7 @@ radio,checkbox {
 .cu-list.menu-avatar>.cu-item .action {
 	width: 132rpx
 }
+
 
 .iconfont.phone {
 		color:#08BE04!important;
@@ -315,7 +316,8 @@ radio,checkbox {
 			background: url(/static/analyse-bg.png) no-repeat;
 			background-size:cover;
 			
-		}
+		}
+		
 		.cu-list.menu-avatar .cu-item{
 			margin:30rpx 0 0;
 			margin-left:0;
@@ -406,7 +408,13 @@ radio,checkbox {
 	}
 	uni-textarea{
 		width:500rpx;
-	}
+	}
+	uni-label uni-text{
+		position: relative;
+		    top: 2px;
+	}
+	
+
 	
 	select{
 		outline:none;
@@ -510,7 +518,12 @@ radio,checkbox {
 		background: #fff;
 		padding:0
 	
-	}
+	}
+		input{
+			border: 1px solid #EDEDED!important;
+			
+			
+		}
 	input,
 	select,
 	option {
@@ -518,7 +531,7 @@ radio,checkbox {
 		padding: 0 20rpx;
 		height: 70rpx;
 		border: 1px solid #EDEDED;
-		// width:500rpx!important;
+
 		background-color: #fff;
 		box-sizing: border-box;
 		appearance: none;
@@ -536,8 +549,8 @@ radio,checkbox {
 	}
 	
 	select {
-		background: url(/static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
+		background: url(/static/arrow2.png) no-repeat scroll 98% center;
+		background-size:28rpx;
 	}
 	
 	

data/json.js

@@ -388,7 +388,7 @@ let xunJianRecord = [{
 		"title": "计划：巡检计划1",
 		"des": "点位：巡检点位01",
 		"time": "2021-01-20 15:23:43",
-		"status": 2
+		"status": 1
 	},
 	{
 		"id": "561",
@@ -422,35 +422,35 @@ let repair = [{
 		"id": "561",
 		"title": "dfmz巡检报修",
 		"imgUrl": "/static/repair1.png",
-		"subTitle": "类型 故障",
+		"subTitle": "类型：故障",
 		"status": 0
 	},
 	{
 		"id": "561",
 		"title": "dfmz巡检报修",
 		"imgUrl": "/static/repair2.png",
-		"subTitle": "类型 故障",
+		"subTitle": "类型：故障",
 		"status": 1
 	},
 	{
 		"id": "561",
 		"title": "dfmz巡检报修",
 		"imgUrl": "/static/repair3.png",
-		"subTitle": "类型 故障",
+		"subTitle": "类型：故障",
 		"status": 2
 	},
 	{
 		"id": "561",
 		"title": "dfmz巡检报修",
 		"imgUrl": "/static/repair4.png",
-		"subTitle": "类型 故障",
+		"subTitle": "类型：故障",
 		"status": 3
 	},
 	{
 		"id": "561",
 		"title": "dfmz巡检报修",
 		"imgUrl": "/static/repair5.png",
-		"subTitle": "类型 故障",
+		"subTitle": "类型：故障",
 		"status": 4
 	}
 

pages.json

@@ -1,6 +1,7 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
+
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -34,8 +35,10 @@
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录"
+				
 			}
-		}, {
+		},
+		 {
 			"path": "pages/deviceOffLine/deviceOffLine",
 			"style": {
 				"navigationBarTitleText": "离线设备",
@@ -43,7 +46,7 @@
 					"titleNView": {
 						"buttons": [{
 							"text": "\ue613",
-							"fontSize": "20px",
+							"fontSize": "46rpx",
 							// "redDot": true,
 							"float": "right",
 							"fontSrc": "/static/iconfont/iconfont.ttf",
@@ -62,7 +65,7 @@
 					"titleNView": {
 						"buttons": [{
 							"text": "\ue613",
-							"fontSize": "20px",
+							"fontSize": "46rpx",
 							// "redDot": true,
 							"float": "right",
 							"fontSrc": "/static/iconfont/iconfont.ttf",
@@ -110,7 +113,7 @@
 					"titleNView": {
 						"buttons": [{
 							"text": "\ue613",
-							"fontSize": "20px",
+							"fontSize": "46rpx",
 							// "redDot": true,
 							"float": "right",
 							"fontSrc": "/static/iconfont/iconfont.ttf",
@@ -291,7 +294,7 @@
 		}, {
 			"path": "pages/videoList/videoList",
 			"style": {
-				"navigationBarTitleText": "视频检测",
+				"navigationBarTitleText": "视频监测",
 				"enablePullDownRefresh": false
 			}
 
@@ -384,7 +387,7 @@
 					"titleNView": {
 						"buttons": [{
 							"text": "\ue613",
-							"fontSize": "20px",
+							"fontSize": "46rpx",
 							// "redDot": true,
 							"float": "right",
 							"fontSrc": "/static/iconfont/iconfont.ttf",
@@ -547,7 +550,7 @@
 					"titleNView": {
 						"buttons": [{
 								"text": "\ue66b", 
-								"fontSize": "18px",
+								"fontSize": "42rpx",
 								"float": "right",
 								"fontSrc": "/static/iconfont/iconfont.ttf",
 								"width": "auto"
@@ -645,7 +648,7 @@
             "path" : "pages/accountManage/accountManage",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "用户管理",
+                "navigationBarTitleText": "人员列表",
                 "enablePullDownRefresh": false
             }
             

pages/accountManage/accountManage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="padding">
+	<view class="padding" style="height:calc(100vh - 126rpx);overflow:auto;">
 		<table>
 			<tr>
 				<th>人员名称</th>

pages/accountManage/perAdd/perAdd.vue

@@ -2,7 +2,8 @@
 	<view class="appWrapper">
 
 		<form action="">
-			<view class="form-item margin-top">
+			<view style="height:30rpx"></view>
+			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					联系方式:

pages/alarmingList/alarmingList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 宫格列表 -->
-		<view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
+		<view class="section2 section  bg-white padding-top-sm margin-bottom-sm">
 			<view class="cu-list grid col-3 no-border">
 				<view class="cu-item justify-center align-center"  v-for="(item,index) in alarmingSquareList" @tap="goProcessList()"
 				 :key="index">

pages/analyse/monthDetail/components/chart.vue

@@ -75,7 +75,7 @@
 					series: [{
 						name: '访问来源',
 						type: 'pie',
-						radius: ['40%', '60%'],
+						radius: ['0%', '60%'],
 						center: ['50%', '45%'],
 						itemStyle: {
 							normal: {

pages/analyse/monthDetail/components/chart2.vue

@@ -20,7 +20,7 @@
 		data() {
 			return {
 				option: {
-					color: ['#00E9CD', '#FF5354'],
+					color: ['#006ED6', '#FF5354'],
 
 					title: {
 						left: 'center'

pages/analyse/monthDetail/components/chart3.vue

@@ -20,7 +20,7 @@
 		data() {
 			return {
 				option: {
-					color: ['#00E9CD', '#FF5354'],
+					color: ['#006ED6', '#FF5354'],
 
 					title: {
 						left: 'center'

pages/analyse/monthDetail/components/chart4.vue

@@ -20,7 +20,7 @@
 		data() {
 			return {
 				option: {
-					color: ['#00E9CD', '#FF5354'],
+					color: ['#006ED6', '#FF5354'],
 
 					title: {
 						left: 'center'

pages/analyse/monthDetail/monthDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="reportD-wrapper">
 		<view class="text-center flex flex-wrap justify-center title-wrapper">
-			<view class="basis-xl margin title">凯撒国际会所消防报警系统监测数据 2020-11月报表</view>
+			<view class=" margin title" style="width:76%">凯撒国际会所消防报警系统监测数据 2020-11月报表</view>
 		</view>
 		<view class="basic-info bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
@@ -166,7 +166,6 @@
 						<td>1</td>
 						<td></td>
 					</tr>
-
 					<tr>
 						<td>5</td>
 						<td>火灾自动报警系统</td>
@@ -195,7 +194,6 @@
 						<td>1</td>
 						<td></td>
 					</tr>
-
 					<tr>
 						<td>9</td>
 						<td>火灾自动报警系统</td>
@@ -217,7 +215,6 @@
 						<td></td>
 					</tr>
 				</table>
-
 			</view>
 		</view>
 
@@ -241,6 +238,37 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="bg-white margin-bottom-sm">
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				统计报表
+			</view>
+			<view class="margin-lr padding-bottom-lg" style="overflow:auto">
+				<table style="border:1px solid #ccc;width:150%;" cellspacing="0" cellpadding="0" align="center">
+					<tr>
+						<th >序号</th>
+						<th >报告分类</th>
+						<th>报告属性</th>
+						<th>报告总数</th>
+						<th>已处理</th>
+						<th>未处理</th>
+						<th>处置率</th>
+					</tr>
+					<tr>
+						<td>1</td>
+						<td>火灾监测</td>
+						<td>报警</td>
+						<td>2724</td>
+						<td>1219</td>
+						<td>0</td>
+						<td>44.75%</td>
+					</tr>
+					
+				</table>
+			</view>
+		</view>
+		
 
 		<view class="bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">

pages/deviceManage/component/validCode/validCode.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex" style="width:70%;margin:30px auto 0">
+	<view class="flex" style="width:80%;margin:30px auto 0">
 		<view class="flex-sub">
 			<input type="text" class=" verifyInput">
 		</view>

pages/deviceOffLine/deviceOffLine.vue

@@ -2,6 +2,7 @@
 	<view class="site-wrapper" ref="contentWrapper">
 
 		<!-- 筛选框start -->
+		<view style="height:224rpx"></view>
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
 				<view class="search-form round bg-white" >
@@ -32,7 +33,7 @@
 
 		<!-- 设备列表start -->
 		<block class="">
-			<view class="processList" style="margin-top:206rpx">
+			<view class="processList">
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in deviceOffLineData" :key="index"  >
 						<view class="cu-avatar lg" style="background-image:url(../../static/device-icon.png);"></view>

pages/index/index.vue

@@ -6,7 +6,7 @@
 				<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>
+						style="border:none!important"></input>
 					<text class="cuIcon-search "></text>
 				</view>
 			</view>
@@ -159,9 +159,9 @@
 					case 7:
 						url = "/pages/safeGuard/safeGuard"
 						break;
-						case 8:
-							url = "/pages/test/test"
-							break;
+						// case 8:
+						// 	url = "/pages/test/test"
+						// 	break;
 						case 9:
 							url = "/pages/deviceManage/deviceManage"
 							break;

pages/login/login.vue

@@ -230,7 +230,7 @@
 	}
 
 	.shadow {
-		box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+		box-shadow: 0px 2px 4px rgb(26 26 26 / 10%);
 	}
 
 	.title {

pages/repair/repair.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="processWrapper ">
+	<view class="processWrapper " style="    height: calc(100vh - 134px);
+    overflow: scroll;">
 		
 		<!-- 宫格列表 -->
 		<view class="bg-white  " >
@@ -16,7 +17,7 @@
 		</view>
 		
 		<block>
-			<view class="processList" style="margin-top:0">
+			<view>
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
 						<view class="cu-avatar " :style="`background-image:url(${item.imgUrl})`"  style="width:82rpx;height:82rpx"></view>

pages/repair/repairDetail/repairDetail.vue

@@ -1,9 +1,10 @@
 <template>
 	<view>
 		
-		<form action="" >
+		<form action="" >
+			<view style='height:30rpx'></view>
 			
-			<view class="form-item margin-top">
+			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					报修地址：

pages/setting/setting.vue

@@ -7,8 +7,8 @@
 				<view>上海永天科技股份有限公司</view>
 			</view>
 		</view>
-		<view class="cu-list menu-avatar">
-			<view class="cu-item" @tap="goMessagePush()">
+		<view class="cu-list menu-avatar  padding-lr">
+			<view class="cu-item shadow" @tap="goMessagePush()">
 				<view class="cu-avatar " style="background-image:url(../../static/push-icon.png)"></view>
 				<view class="content">
 					<view class="">推送设置</view>
@@ -20,7 +20,7 @@
 				</view>
 			</view>
 			
-			<view class="cu-item" @tap="goBuilding()">
+			<view class="cu-item shadow" @tap="goBuilding()">
 				<view class="cu-avatar " style="background-image:url(../../static/building-icon.png)"></view>
 				<view class="content">
 					<view class="">建筑管理</view>
@@ -148,22 +148,26 @@
 			}
 		}
 		
-		.cu-list.menu-avatar>.cu-item {
-			height:120rpx;
+		.cu-list.menu-avatar .cu-item{
+			margin:30rpx 0 0;
+			margin-left:0;
 			.cu-avatar{
-				left:20rpx;
-				width:66rpx;
-				height: 58rpx;
+				background-color:rgba(0,0,0,0);
+				left:26rpx;
 			}
 			.content{
-				left:126rpx;
-			}
-			.nav-right{
-				margin-right:10rpx;
+				left:130rpx;
+				font-size:32rpx;
 			}
 		}
-	
 	}
+	
+	
 		
 	
+</style>
+<style>
+	.shadow {
+		box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+	}
 </style>

pages/unprocessDetail/unprocessDetail.vue

@@ -34,11 +34,28 @@
 					<text class="cuIcon-titles margin-right-xs"></text>
 					处理内容
 				</view>
+				
 				<view class="padding-lr padding-bottom-lg">
 					<form action="">
+						
+						<radio-group name="gender" class="">
+							<label class="margin-right">
+								<radio value="单个处理" checked /><text>单个处理</text>
+							</label>
+							<label>
+								<radio value="批量处理" /><text>批量处理</text>
+							</label>
+						</radio-group>
+						
 						<view class="cu-form-group">
-							<textarea class="JTxtArea lg" placeholder="备注信息,最多可输入50个字..." :maxlength="50" :data-maxnum="reason.length+'/50'"
-							 auto-height v-model="msg2"></textarea>
+							
+							<textarea class="JTxtArea lg" 
+							:maxlength="50" 
+							:data-maxnum="reason.length+'/50'"   placeholder="备注信息,最多可输入50个字..."
+							auto-height
+							@input="inputReason"
+							:value="reason"></textarea>
+							
 						</view>
 						<view class="btn-area">
 							<button class="bg-orange round missReport margin-top" @click="videoMissSubmit()">误 报 </button>
@@ -151,7 +168,8 @@
 			inputReason(e) {
 				this.reason = e.detail.value;
 			}
-
+			
+			
 
 		}
 	}

pages/weiBao/plan/plan.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view class="margin bg-white plan-sec text-center">
+		<view style="height:30rpx"></view>
+		<view class="bg-white plan-sec text-center" style="margin:0rpx 30rpx 30rpx 30rpx">
 			<view class="plan-tit padding-top-lg">任务名称：ui测试</view>
 			<br>
 			<chart2></chart2>

pages/weiBao/planDetail/planDetail.vue

@@ -2,8 +2,8 @@
 	<view>
 		
 		<form action=""  >
-			
-			<view class="form-item margin-top">
+			<view style="height:30rpx"></view>
+			<view class="form-item ">
 				<view class="title">
 					<text class="necessary">*</text>
 					上报名称：
@@ -24,7 +24,7 @@
 						<radio value="3" /><text>异常</text>
 					</label>
 					<label class="margin-right-xs">
-						<radio value="2" /><text>供电</text>
+						<radio value="2" /><text>故障</text>
 					</label>
 					<label>
 						<radio value="3" /><text>其他</text>

pages/weiBao/planDetailDone/planDetailDone.vue

@@ -24,7 +24,7 @@
 						<radio value="3" /><text>异常</text>
 					</label>
 					<label class="margin-right-xs">
-						<radio value="2" checked /><text>供电</text>
+						<radio value="2" checked /><text>故障</text>
 					</label>
 					<label>
 						<radio value="3" /><text>其他</text>

pages/weiBao/recordDetail/recordDetail.vue

@@ -57,12 +57,12 @@
 						<text>16666666666</text>
 					</view>
 					<view>
-						<text>维保点位：</text>
-						<text>维保点位01</text>
+						<text>维保描述：</text>
+						<text>已维保</text>
 					</view>
 					<view>
-						<text>维保描述：</text>
-						<text>测试</text>
+						<text>点位地址：</text>
+						<text>市光四村221号楼</text>
 					</view>
 					
 				</view>
@@ -74,7 +74,7 @@
 					维保图片
 				</view>
 				<view class="padding-lr padding-bottom-lg">
-					<image src="../../../static/video-img.png" style="width:100%"></image>
+					<image src="../../../static/record-detail-img.png" style="width:100%"></image>
 				</view>
 			</view>
 			<!-- 处理状态end -->

pages/xunJian/plan/plan.vue

@@ -1,6 +1,7 @@
 <template>
-	<view>
-		<view class="margin bg-white plan-sec text-center">
+	<view>
+		<view style="height:30rpx"></view>
+		<view class=" bg-white plan-sec text-center" style="margin:0rpx 30rpx 30rpx 30rpx">
 			<view class="plan-tit padding-top-lg">任务名称：ui测试</view>
 			<chart></chart>
 		</view>

pages/xunJian/planDetail/planDetail.vue

@@ -1,9 +1,10 @@
 <template>
 	<view>
 		
-		<form action=""  >
+		<form action="">
+			<view style='height:30rpx'></view>
 			
-			<view class="form-item margin-top">
+			<view class="form-item" >
 				<view class="title">
 					<text class="necessary">*</text>
 					上报名称：
@@ -24,7 +25,7 @@
 						<radio value="3" /><text>异常</text>
 					</label>
 					<label class="margin-right-xs">
-						<radio value="2" /><text>供电</text>
+						<radio value="2" /><text>故障</text>
 					</label>
 					<label>
 						<radio value="3" /><text>其他</text>

pages/xunJian/planDetailDone/planDetailDone.vue

@@ -24,7 +24,7 @@
 						<radio value="3" /><text>异常</text>
 					</label>
 					<label class="margin-right-xs">
-						<radio value="2" checked /><text>供电</text>
+						<radio value="2" checked /><text>故障</text>
 					</label>
 					<label>
 						<radio value="3" /><text>其他</text>

pages/xunJian/recordDetail/recordDetail.vue

@@ -74,7 +74,7 @@
 					巡检图片
 				</view>
 				<view class="padding-lr padding-bottom-lg">
-					<image src="../../../static/video-img.png" style="width:100%"></image>
+					<image src="../../../static/record-detail-img.png" style="width:100%"></image>
 				</view>
 			</view>
 			<!-- 处理状态end -->