auto commit

common/apiurl.js

@@ -21,6 +21,18 @@ const apiurl = {
 	getDeviceListUrl:'/roadspace/list',
 	//巡检员分配路段数据集接口
 	getRoadListUrl:'/roadspace/getRoadList',
+	//地磁、车位锁设备信息
+	getSelectDeviceListUrl:'/roadspace/selectDeviceList',
+	//设备低电量，低信号，故障分隔值数据接口
+	geoDeviceStatustUrl:'/roadspace/type/geo_device_status',
+	//地磁、车位锁设备详情
+	findRoadSpaceVoByIdUrl:'/roadspace/findDeviceById',
+	//地磁、车位锁设备详情
+	deviceLogUrl:'/roadspace/selectDeviceLog',
+	//设备异常上报
+	deviceexcptionprocessUrl:'/deviceexcptionprocess',
+	//心跳是否有车状态数据接口
+	placeStatusUrl:'/roadspace/type/place_status',
 }
 
 export {

common/config.js

@@ -1,6 +1,14 @@
 const config = {
 	// wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
 	
+	//#ifdef APP-PLUS
+	platform:'app',
+	//#endif
+	
+	//#ifdef H5
+	platform:'h5',
+	//#endif
+	
 	//64
 	baseUrl:'https://wx.hw.hongweisoft.com/parking/inspection',// 64服务器
 	upFileUrl:'https://wx.hw.hongweisoft.com/ycpharmacy/file/upload/single/minio',

common/http.api.js

@@ -16,6 +16,12 @@ const install = (Vue, vm) => {
 	let punchIn = (params = {}) => vm.$u.post(apiurl.punchInUrl, params);
 	let getDeviceList = (params = {}) => vm.$u.get(apiurl.getDeviceListUrl,params);
 	let getRoadList = (params = {}) => vm.$u.get(apiurl.getRoadListUrl,params);
+	let getSelectDeviceList = (params = {}) => vm.$u.get(apiurl.getSelectDeviceListUrl,params);
+	let geoDeviceStatust = (params = {}) => vm.$u.get(apiurl.geoDeviceStatustUrl,params);
+	let findRoadSpaceVoById = (params = {}) => vm.$u.get(apiurl.findRoadSpaceVoByIdUrl,params);
+	let deviceLog = (params = {}) => vm.$u.get(apiurl.deviceLogUrl,params);
+	let deviceexcptionprocess = (params = {}) => vm.$u.post(apiurl.deviceexcptionprocessUrl, params);
+	let placeStatus = (params = {}) => vm.$u.get(apiurl.placeStatusUrl,params);
 	
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
@@ -30,7 +36,13 @@ const install = (Vue, vm) => {
 		punchInfo,
 		punchIn,
 		getDeviceList,
-		getRoadList
+		getRoadList,
+		getSelectDeviceList,
+		geoDeviceStatust,
+		findRoadSpaceVoById,
+		deviceLog,
+		deviceexcptionprocess,
+		placeStatus
 	};
 }
 

mycss.scss

@@ -32,7 +32,7 @@
 			}
 			.txt{
 				margin-top: 7rpx;
-				font-size: 24rpx;
+				font-size: 30rpx;
 				font-weight: 400;
 				color: #353535;
 				line-height: 33rpx;

pages.json

@@ -67,6 +67,34 @@
 			"style": {
 				"navigationBarTitleText": "重置密码"
 			}
+		},
+		{
+			"path": "pages/deviceList/deviceList",
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "路段列表"
+			}
+		},
+		{
+			"path": "pages/deviceList/deviceListType1/deviceListType1",//地磁
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "设备列表"
+			}
+		},
+		{
+			"path": "pages/deviceList/deviceListType1/deviceInfo",//地磁设备详情
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "设备详情"
+			}
+		},
+		{
+			"path": "pages/deviceList/deviceListType2/deviceListType2",//车位锁
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "设备列表"
+			}
 		}
 		
     ],

pages/center/center.scss

@@ -80,7 +80,7 @@
 		.feature-left{
 			display: flex;
 			align-items: center;
-			font-size: 26rpx;
+			font-size: 34rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #555555;

pages/deviceList/deviceList.vue

@@ -0,0 +1,173 @@
+<template>
+	<view>
+		<view>
+			<u-navbar
+			 :title="title" 
+			 title-color="#fff" 
+			 :custom-back="customBack" 
+			 :border-bottom="false" 
+			 back-icon-color="#CCE8FF" 
+			 :background="{background: '#4D68DC' }"></u-navbar>
+		</view>
+		<mescroll-uni ref="mescrollRef" @init="mescrollInit" :top="config.platform=='h5'?100:180" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<view class="device-list u-flex u-flex-wrap u-row-start">
+				<view class="device-item"
+				@click="goListPage(item)" 
+				v-for="item in dataList" :key="item.roadNo"
+				>
+					<u-icon name="star-fill" color="#0082FF" size="45"></u-icon>
+					<!-- <image class="img" src="/static/img/icon-device.png" mode="widthFix"></image> -->
+					<!-- <view class="device-name">{{item.deviceName}}</view> -->
+					<view class="txt u-line-1">{{item.roadName}}</view>
+				</view>
+			</view>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default{
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		data(){
+			return{
+				title:"选择路段",
+				deviceTypeId:'',
+				dataList:[],
+				upOption:{
+					// page: {
+					// 	size: 10 // 每页数据的数量
+					// },
+					// auto:false,
+					// use:false,
+					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+					empty:{
+						tip: '~ 暂无数据 ~', // 提示
+						// btnText: '去看看'
+					}
+				},
+			}
+		},
+		onLoad(page){
+			// console.log('page',page);
+			this.deviceType = page.param;
+		},
+		onShow(){
+			
+		},
+		methods:{
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				// console.log('page',page)
+				//联网加载数据
+				// let keyword = this.tabs[this.tabIndex]?.text;
+				let type = '';
+				if(this.deviceType==1){
+					type=1
+				}else if(this.deviceType==2){
+					type=1
+				}else if(this.deviceType==3){
+					type=2
+				}
+				let params ={
+					type:type,
+					pageNum:page.num,
+					pageSize:page.size
+				} 
+				this.$u.api.getRoadAllList(params).then(curPageData=>{
+					console.log('curPageData',curPageData)
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					// this.mescroll.endSuccess(curPageData.data.total);
+					this.mescroll.endBySize(curPageData.data.length, curPageData.data.length);
+					//设置列表数据
+					if(page.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList=this.dataList.concat(curPageData.data); //追加新数据
+					if(this.dataList.length>=1){
+						// this.title = this.dataList[0].roadwayName
+					}
+				}).catch((err)=>{
+					uni.showToast({
+						title:'链接失败'
+					});
+					console.log('err',err)
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+			//点击空布局按钮的回调
+			emptyClick(){
+				
+			},
+			customBack(){
+				uni.reLaunch({
+				    url: '/pages/index/index'
+				});
+			},
+			goListPage(roadItem) {
+				console.log('this.deviceType',this.deviceType)
+				console.log('roadItem',roadItem)
+				let path = '';
+				if(this.deviceType==1){
+					path = 'pages/deviceList/deviceListType1/deviceListType1'
+				}else if(this.deviceType==2){
+					path = 'pages/deviceList/deviceListType2/deviceListType2'
+				}else if(this.deviceType==3){
+					path = 'pages/deviceList/deviceListType3/deviceListType3'
+				}
+			  this.$u.route({
+			    url: path,
+				params:{
+					roadNo:roadItem.roadNo,
+					roadName:roadItem.roadName,
+					deviceType:this.deviceType
+				}
+			  })
+			},
+			openPage(path,param) {
+			  this.$u.route({
+			    url: path,
+				params:{
+					param:param,
+					deviceTypeId:this.deviceTypeId
+				}
+			  })
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{background-color: #fff;}
+	// @import  './deviceList.scss'
+	.device-list{
+		margin: 24rpx 0;
+		.device-item{
+			background-color: #F1F8FF;
+			border-radius: 10rpx;
+			box-sizing: border-box;
+			padding: 20rpx 10rpx;
+			text-align: center;
+			width: 45%;
+			margin: 0 0 24rpx 3.3%;
+			.img{
+				width: 57rpx;
+				height: 55rpx;
+				margin-bottom: 10rpx;
+			}
+			.device-name{
+				font-size: 24rpx;
+				color: #606266;
+				margin-bottom: 5rpx;
+			}
+			.text{
+				font-size: 28rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #474747;
+				line-height: 40rpx;
+				letter-spacing: 1px;
+			}
+		}
+	}
+</style>

pages/deviceList/deviceListType1/deviceInfo.vue

@@ -0,0 +1,332 @@
+<template>
+	<view>
+		<u-navbar
+		 :title="title" 
+		 title-color="#fff" 
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: 'linear-gradient(99deg, #7A4398 0%, #5A5DB9 100%)' }"></u-navbar>
+		<view class="base-info">
+			<view class="base-info-item u-flex u-row-between">
+				<view class=""><b>泊位号：</b>{{pageData.spaceNo}}</view>
+				<text class="report" @click="handlepopupShow">异常上报</text>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>设备编号：</b>{{pageData.deviceNo}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>电量值：</b>{{pageData.deviceBattery}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>信号值：</b>{{pageData.deviceSignal}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>车牌号：</b>{{pageData.vehicleNo}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>入场时间：</b>{{pageData.inTime}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>停车时长：</b>{{pageData.parkingTime}}</view>
+			</view>
+		</view>
+		<view class="device-log">
+			<u-divider
+			ref="divider"
+			bg-color="#F1F8FF" 
+			color="#010101" 
+			border-color="#6d6d6d">设备心跳</u-divider>
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:300" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+				<view class="device-list u-text-center ">
+					<view v-if="dataList.length>=1" class="list-header u-flex u-row-around">
+						<view class="u-flex-2">时间</view>
+						<view class="u-flex-1">事件类型</view>
+						<view class="u-flex-1">是否有车</view>
+					</view>
+					<view class="device-list-item u-flex u-row-around" v-for="item in dataList" :key="item.id">
+						<view class="u-flex-2">{{item.createTime}}</view>
+						<view class="u-flex-1">{{item.msgType|deviceLogMsgType}}</view>
+						<view class="u-flex-1">{{filterPlaceStatus(item.msgType)}}</view>
+					</view>
+				</view>
+			</mescroll-uni>
+		</view>
+		<u-popup v-model="popupShow" mode="bottom">
+			<view class="form-content">
+			<u-form :model="form" ref="uForm" >
+				<u-form-item label="问题描述" prop="exceprionDes" required :label-width="labelWidth">
+					<u-input type="textarea" :border="true" maxlength="200" v-model="form.exceprionDes" />
+				</u-form-item>
+				<u-form-item label="图片说明" :label-width="labelWidth" :border-bottom="false">
+					<u-upload ref="uploadRef" :action="action" max-count="5"></u-upload>
+				</u-form-item>
+			</u-form>
+			<u-button type="primary" @click="submit" style="margin-top: 20vh;">提交</u-button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default{
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		data(){
+			return{
+				roadName:'',
+				roadNo:'',
+				deviceType:'',
+				title:'设备详情',
+				pageData:[],
+				deviceID:'',
+				downOption:{
+					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+				},
+				upOption:{
+					page: {
+						size: 10 // 每页数据的数量
+					},
+					auto:true,
+					// use:false,
+					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+					empty:{
+						tip: '~ 暂无数据 ~', // 提示
+						// btnText: '去看看'
+					}
+				},
+				dataList:[],
+				dividerBottom:0,
+				popupShow:false,
+				labelWidth:190,
+				action:this.config.upFileUrl,
+				form:{
+					deviceId:'',
+					deviceType:'',
+					exceprionDes:'',
+					imgList:[]
+				},
+				rules:{
+					roadName: [
+						{ 
+							required: true, 
+							message: '请选择路段', 
+							trigger: ['change','blur'],
+						}
+					],
+					exceprionDes: [
+						{ 
+							required: true, 
+							message: '请输入内容', 
+							trigger: ['change','blur'],
+						}
+					],
+				},
+				placeStatus:[],
+			}
+		},
+		onLoad(page){
+			this.deviceID = page.id;
+			this.form.deviceId = page.id;
+			if(page.roadName){
+				this.roadName = page.roadName;
+				this.title = page.roadName;
+			}
+			if(page.roadNo){
+				this.roadNo = page.roadNo
+			}
+			if(page.deviceType){
+				this.deviceType = page.deviceType;
+				this.form.deviceType = page.deviceType;
+			}
+			this.getPlaceStatus();
+		},
+		onShow(){
+			this.findRoadSpaceVoById();
+		},
+		mounted() {
+			let divider = this.$refs.divider.$el.getBoundingClientRect();
+			this.dividerBottom = divider.bottom*2;
+		},
+		onReady() {
+			// this.$refs.uForm.setRules(this.rules);
+		},
+		computed:{
+			filterPlaceStatus(){
+				return function(value){
+					let v = '';
+					for (let i = 0; i < this.placeStatus.length; i++){
+						console.log('value',value);
+						console.log('item',this.placeStatus[i]);
+						let item = this.placeStatus[i];
+						if (value == item.value) {
+						  v = item.label;
+						  break;
+						}
+					}
+					return v
+				}
+			}
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+				  url: '/pages/deviceList/deviceListType1/deviceListType1',
+					params:{
+						roadNo:this.roadNo,
+						roadName:this.roadName,
+						deviceType:this.deviceType,
+					}
+				})
+			},
+			findRoadSpaceVoById(){
+				this.$u.api.findRoadSpaceVoById({id:this.deviceID}).then(res=>{
+					if(res.code==200){
+						this.pageData = res.data;
+						// console.log('findRoadSpaceVoById',res);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				// console.log('page',page);
+				let params ={
+					deviceId:this.deviceID,
+					pageNum:page.num,
+					pageSize:page.size
+				};
+				this.$u.api.deviceLog(params).then(curPageData=>{
+					// console.log('word',word);
+					 console.log('curPageData',curPageData);
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					// this.mescroll.endSuccess(curPageData.data.total);
+					this.mescroll.endBySize(curPageData.data.rows.length, curPageData.data.total);
+					//设置列表数据
+					if(page.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList=this.dataList.concat(curPageData.data.rows); //追加新数据
+					console.log('this.dataList',this.dataList);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+			//点击空布局按钮的回调
+			emptyClick(){
+				uni.showToast({
+					title:'点击了按钮,具体逻辑自行实现'
+				})
+			},
+			handlepopupShow(){
+				this.popupShow = true;
+				this.$nextTick(() => {
+					this.$refs.uForm.setRules(this.rules)
+				})
+			},
+			submit(){
+				let that = this;
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						console.log('验证通过');
+						// delete this.dealForm.selectedUserList;
+						let files = [];
+						// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
+						files = this.$refs.uploadRef.lists.filter(val => {
+							return val.progress == 100;
+						})
+						console.log('files',files);
+						// 如果您不需要进行太多的处理，直接如下即可
+						// files = this.$refs.uUpload.lists;
+						files.forEach(function(item){
+							if(item.response.data){that.form.imgList.push(item.response.data.url)}
+						});
+						console.log('this.form',this.form);
+						this.$u.api.deviceexcptionprocess(this.form).then(res=>{
+							console.log('res',res);
+							this.form = {};
+							uni.showToast({
+								icon:'none',
+								title:res.msg,
+								duration:1500,
+							});
+							this.popupShow = false;
+						}).catch(err=>{
+							uni.showToast({
+								icon:'none',
+								title:err.msg
+							})
+							console.log('err',err);
+						})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+			getPlaceStatus(){
+				this.$u.api.placeStatus().then(res=>{
+					let that = this;
+					console.log('getPlaceStatus',res.data.data);
+					res.data.data.map(function(currentValue){
+					    that.placeStatus.push({value:currentValue.dictValue,label:currentValue.dictLabel})
+					    // console.log('currentValue',currentValue);
+					})
+					
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+// @import  './login.scss'
+page{background: #F1F8FF;}
+.base-info{
+	background-color: #fff;
+	padding: 30rpx 30rpx 40rpx;
+	.base-info-item{
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #6E6E6E;
+		line-height: 40rpx;
+		letter-spacing: 1rpx;
+		margin-bottom: 26rpx;
+	}
+	.report{
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #0082FF;
+		line-height: 40rpx;
+		letter-spacing: 1rpx;
+	}
+}
+.device-log{
+	background-color: #F1F8FF;
+	padding-top: 50rpx;
+	.list-header{
+		margin-bottom: 24rpx;
+	}
+	.device-list-item{
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #7D7D7D;
+		line-height: 33rpx;
+		letter-spacing: 1rpx;
+		margin-bottom: 20rpx;
+	}
+}
+.form-content{
+	padding: 24rpx;
+}
+</style>

pages/deviceList/deviceListType1/deviceListType1.vue

@@ -0,0 +1,239 @@
+<template>
+	<view>
+		<u-navbar
+		 :title="title" 
+		 title-color="#fff" 
+		 :is-back="true"
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: '#4D68DC' }"></u-navbar>
+		<u-tabs :list="tabList" :is-scroll="false" height="108" bar-width="100" :current="tabCurrent" @change="tabChange"></u-tabs>
+		<!-- <u-gap height="20" bg-color="#F6F6F6"></u-gap> -->
+		<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?220:300" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<view class="device-list u-flex u-flex-wrap u-row-start">
+				<view class="device-list-item u-m-b-24" v-for="item in dataList" :key="item.id"
+				@click="goDetails(item.id)">
+					<view class="top u-flex u-flex-wrap u-row-between">
+						<view class="space-name">{{item.spaceName}}</view>
+						<view class="signal">
+							<text :class="{'low':item.deviceSignal<lowSignal}">{{item.deviceSignal}}</text>
+							<image v-if="item.deviceSignal<lowSignal" class="img" src="../../../static/img/signal-r.png" mode="heightFix"></image>
+							<image v-else class="img" src="../../../static/img/signal-g.png" mode="heightFix"></image>
+							<image v-if="item.deviceBattery<lowBattery" class="img" src="../../../static/img/electricity-r.png" mode="heightFix"></image>
+							<image v-else class="img" src="../../../static/img/electricity-g.png" mode="heightFix"></image>
+						</view>
+					</view>
+					<view class="vehicleNo">{{item.vehicleNo}}</view>
+					<image v-if="item.placeStatus!= 1" class="carImg" src="../../../static/img/qiche-g.png" mode="heightFix"></image>
+					<image v-else class="carImg" src="../../../static/img/qiche.png" mode="heightFix"></image>
+					<view class="parkingTime">{{item.parkingTime}}</view>
+					<view class="deviceNo">{{item.deviceNo}}</view>
+				</view>
+			</view>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default{
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			
+		},
+		data(){
+			return{
+				roadName:'',
+				roadNo:'',
+				title:"设备列表",
+				tabCurrent:0,
+				breakStatus:'',
+				tabList:[
+					{name:'全部',status:''},
+					{name:'异常',status:'0'},
+					{name:'低电量',status:'3200_b'},
+					{name:'低信号',status:'-100_s'}
+				],
+				downOption:{
+					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+				},
+				upOption:{
+					page: {
+						size: 10 // 每页数据的数量
+					},
+					auto:true,
+					// use:false,
+					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+					empty:{
+						tip: '~ 暂无数据 ~', // 提示
+						// btnText: '去看看'
+					}
+				},
+				dataList:[],
+				lowBattery:'',
+				lowSignal:''
+				
+			}
+		},
+		onLoad(page){
+			console.log('page',page);
+			this.getGeoDeviceStatust()
+			if(page.roadName){
+				this.roadName = page.roadName;
+				this.title = page.roadName;
+			}
+			if(page.roadNo){
+				this.roadNo = page.roadNo
+			}
+			if(page.deviceType){
+				this.deviceType = page.deviceType
+			}
+		},
+		onShow(){
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+				  url: '/pages/deviceList/deviceList',
+					params:{
+						param:this.deviceType
+					}
+				})
+				// uni.reLaunch({
+				//     url: '/pages/deviceList/deviceList'
+				// });
+			},
+			openPage(path,id) {
+			  this.$u.route({
+			    url: path,
+				params:{
+					id:id
+				}
+			  })
+			},
+			goDetails(id){
+				this.$u.route({
+				  url: 'pages/deviceList/deviceListType1/deviceInfo',
+					params:{
+						id:id,
+						roadNo:this.roadNo,
+						roadName:this.roadName,
+						deviceType:this.deviceType,
+					}
+				})
+			},
+			// 切换菜单
+			tabChange(index) {
+				this.tabCurrent = index;
+				this.breakStatus = this.tabList[index].status;
+				this.refresh()
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				// console.log('page',page);
+				let params ={
+					roadNo:this.roadNo,
+					deviceType:this.deviceType,//设备类型: 1-地磁 2-车位锁
+					breakStatus:this.breakStatus,//设备状态：低电量 （3200_b ）、 低信号（ -100_s）、有故障（0）
+					pageNum:page.num,
+					pageSize:page.size
+				};
+				this.$u.api.getSelectDeviceList(params).then(curPageData=>{
+					// console.log('word',word);
+					 console.log('curPageData',curPageData);
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					this.mescroll.endSuccess(curPageData.data.total);
+					this.mescroll.endBySize(curPageData.data.rows.length, curPageData.data.total);
+					//设置列表数据
+					if(page.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList=this.dataList.concat(curPageData.data.rows); //追加新数据
+					console.log('this.dataList',this.dataList);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+			//点击空布局按钮的回调
+			emptyClick(){
+				uni.showToast({
+					title:'点击了按钮,具体逻辑自行实现'
+				})
+			},
+			refresh(){
+				this.mescroll.resetUpScroll( );
+			},
+			getGeoDeviceStatust(){
+				this.$u.api.geoDeviceStatust().then(res=>{
+					let that = this;
+					res.data.data.forEach(function(item){
+						if(item.dictLabel=='低电量'){that.lowBattery = Number( item.dictValue.split('_')[0] )}
+						if(item.dictLabel=='低信号'){that.lowSignal = Number( item.dictValue.split('_')[0] )}
+					});
+					console.log('this.lowBattery',this.lowBattery);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+page{background-color: #F3F3F3;}
+.device-list{
+	margin: 24rpx 0;
+	.device-list-item{
+		background-color: #fff;
+		width: 45%;
+		margin: 0 0 24rpx 3.3%;
+		padding: 15rpx;
+		border-radius: 13rpx;
+		.top{
+			margin-bottom: 20rpx;
+			.space-name{
+				color: #5B5B5B;
+				font-size: 26rpx;
+			}
+			.signal{
+				font-size: 26rpx;
+				color: #5B5B5B;
+				.img{
+					display: inline-block;
+					height: 26rpx;
+					margin-left: 7rpx;
+				}
+			}
+			.low{color: #f00;}
+		}
+		.vehicleNo{
+			height: 42rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #212121;
+			line-height: 42rpx;
+			text-align: center;
+		}
+		.carImg{
+			height: 118rpx;
+			display: block;
+			margin: 16rpx auto 18rpx;
+		}
+		.parkingTime{
+			height: 37rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #5B5B5B;
+			line-height: 37rpx;
+			margin-bottom: 15rpx;
+			text-align: center;
+		}
+		.deviceNo{text-align: center;}
+	}
+	
+}
+</style>

pages/deviceList/deviceListType2/deviceListType2.vue

@@ -0,0 +1,228 @@
+<template>
+	<view>
+		<u-navbar
+		 :title="title" 
+		 title-color="#fff" 
+		 :is-back="true"
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: '#4D68DC' }"></u-navbar>
+		<u-tabs :list="tabList" :is-scroll="false" height="108" bar-width="100" :current="tabCurrent" @change="tabChange"></u-tabs>
+		<!-- <u-gap height="20" bg-color="#F6F6F6"></u-gap> -->
+		<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?220:300" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<view class="device-list u-flex u-flex-wrap u-row-start">
+				<view class="device-list-item u-m-b-24" v-for="item in dataList" :key="item.id"
+				@click="openPage('pages/maintenanceCenter/maintenanceDetails/maintenanceDetails',item.id)">
+					<view class="top u-flex u-flex-wrap u-row-between">
+						<view class="space-name">{{item.spaceName}}</view>
+						<view class="signal">
+							<text :class="{'low':item.deviceSignal<lowSignal}">{{item.deviceSignal}}</text>
+							<image v-if="item.deviceSignal<lowSignal" class="img" src="../../../static/img/signal-r.png" mode="heightFix"></image>
+							<image v-else class="img" src="../../../static/img/signal-g.png" mode="heightFix"></image>
+							<image v-if="item.deviceBattery<lowBattery" class="img" src="../../../static/img/electricity-r.png" mode="heightFix"></image>
+							<image v-else class="img" src="../../../static/img/electricity-g.png" mode="heightFix"></image>
+						</view>
+					</view>
+					<view class="vehicleNo">{{item.vehicleNo}}</view>
+					<image v-if="item.placeStatus!= 1" class="carImg" src="../../../static/img/qiche-g.png" mode="heightFix"></image>
+					<image v-else class="carImg" src="../../../static/img/qiche.png" mode="heightFix"></image>
+					<view class="parkingTime">{{item.parkingTime}}</view>
+					<view class="deviceNo">{{item.deviceNo}}</view>
+				</view>
+			</view>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default{
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			
+		},
+		data(){
+			return{
+				roadName:'',
+				roadNo:'',
+				title:"设备列表",
+				tabCurrent:0,
+				breakStatus:'',
+				tabList:[
+					{name:'全部',status:''},
+					{name:'异常',status:'0'},
+					{name:'低电量',status:'3200_b'},
+					{name:'低信号',status:'-100_s'}
+				],
+				downOption:{
+					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+				},
+				upOption:{
+					page: {
+						size: 10 // 每页数据的数量
+					},
+					auto:true,
+					// use:false,
+					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+					empty:{
+						tip: '~ 暂无数据 ~', // 提示
+						// btnText: '去看看'
+					}
+				},
+				dataList:[],
+				lowBattery:'',
+				lowSignal:''
+				
+			}
+		},
+		onLoad(page){
+			console.log('page',page);
+			this.getGeoDeviceStatust()
+			if(page.roadName){
+				this.roadName = page.roadName;
+				this.title = page.roadName;
+			}
+			if(page.roadNo){
+				this.roadNo = page.roadNo
+			}
+			if(page.deviceType){
+				this.deviceType = page.deviceType
+			}
+		},
+		onShow(){
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+				  url: '/pages/deviceList/deviceList',
+					params:{
+						param:this.deviceType
+					}
+				})
+				// uni.reLaunch({
+				//     url: '/pages/deviceList/deviceList'
+				// });
+			},
+			openPage(path,repairId) {
+			  this.$u.route({
+			    url: path,
+				params:{
+					repairId:repairId
+				}
+			  })
+			},
+			// 切换菜单
+			tabChange(index) {
+				this.tabCurrent = index;
+				this.breakStatus = this.tabList[index].status;
+				this.refresh()
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				// console.log('page',page);
+				let params ={
+					roadNo:this.roadNo,
+					deviceType:this.deviceType,//设备类型: 1-地磁 2-车位锁
+					breakStatus:this.breakStatus,//设备状态：低电量 （3200_b ）、 低信号（ -100_s）、有故障（0）
+					pageNum:page.num,
+					pageSize:page.size
+				};
+				this.$u.api.getSelectDeviceList(params).then(curPageData=>{
+					// console.log('word',word);
+					 console.log('curPageData',curPageData);
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					this.mescroll.endSuccess(curPageData.data.total);
+					this.mescroll.endBySize(curPageData.data.rows.length, curPageData.data.total);
+					//设置列表数据
+					if(page.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList=this.dataList.concat(curPageData.data.rows); //追加新数据
+					console.log('this.dataList',this.dataList);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+			//点击空布局按钮的回调
+			emptyClick(){
+				uni.showToast({
+					title:'点击了按钮,具体逻辑自行实现'
+				})
+			},
+			refresh(){
+				this.mescroll.resetUpScroll( );
+			},
+			getGeoDeviceStatust(){
+				this.$u.api.geoDeviceStatust().then(res=>{
+					let that = this;
+					res.data.data.forEach(function(item){
+						if(item.dictLabel=='低电量'){that.lowBattery = Number( item.dictValue.split('_')[0] )}
+						if(item.dictLabel=='低信号'){that.lowSignal = Number( item.dictValue.split('_')[0] )}
+					});
+					console.log('this.lowBattery',this.lowBattery);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+page{background-color: #F3F3F3;}
+.device-list{
+	margin: 24rpx 0;
+	.device-list-item{
+		background-color: #fff;
+		width: 45%;
+		margin: 0 0 24rpx 3.3%;
+		padding: 15rpx;
+		border-radius: 13rpx;
+		.top{
+			margin-bottom: 20rpx;
+			.space-name{
+				color: #5B5B5B;
+				font-size: 26rpx;
+			}
+			.signal{
+				font-size: 26rpx;
+				color: #5B5B5B;
+				.img{
+					display: inline-block;
+					height: 26rpx;
+					margin-left: 7rpx;
+				}
+			}
+			.low{color: #f00;}
+		}
+		.vehicleNo{
+			height: 42rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #212121;
+			line-height: 42rpx;
+			text-align: center;
+		}
+		.carImg{
+			height: 118rpx;
+			display: block;
+			margin: 16rpx auto 18rpx;
+		}
+		.parkingTime{
+			height: 37rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #5B5B5B;
+			line-height: 37rpx;
+			margin-bottom: 15rpx;
+			text-align: center;
+		}
+		.deviceNo{text-align: center;}
+	}
+	
+}
+</style>

pages/equipmentList/equipmentList.vue

@@ -23,11 +23,14 @@
 		<mescroll-uni ref="mescrollRef" @init="mescrollInit" top="300" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
 			<view class="g-device-item u-flex u-row-between u-m-b-24" v-for="item in dataList" :key="item.id">
 				<view class="u-font-30" style="color: #414141;">
-					<view class="u-m-b-20 ">
-						
+					<view class="u-m-b-10 ">
 						<text>{{item.deviceType|deviceType}}</text>
 						<text  class="u-p-l-40" style="font-weight: bold;">{{item.roadName}}-{{item.spaceName}}</text>
 					</view>
+					<view class="u-m-b-10" v-if="item.deviceType==3">
+						<text>{{item.entranceName}}</text>
+						<text class="u-m-l-20">{{item.roadwayName}}</text>
+					</view>
 					<view class="u-font-26">设备编号：{{item.deviceNo}}</view>
 				</view>
 				<view class="">

pages/index/index.vue

@@ -19,19 +19,19 @@
 					<view class="count" style="color: #0074DD;">{{deviceStatisData.totalNum||'0'}}</view>
 					<view class="name">总设备数</view>
 				</u-col>
-				<u-col span="4" text-align="center" @click="openPage('pages/equipmentList/equipmentList','0')">
+				<u-col span="4" text-align="center" @click="openPage('pages/equipmentList/equipmentList','1')">
 					<view class="count" style="color: #f00;">{{deviceStatisData.onlineNum||'0'}}</view>
-					<view class="name">设备离线</view>
+					<view class="name">正常</view>
 				</u-col>
-				<u-col span="4" text-align="center" @click="openPage('pages/equipmentList/equipmentList','2')">
+				<u-col span="4" text-align="center" @click="openPage('pages/equipmentList/equipmentList','0')">
 					<view class="count" style="color: #07A68D;">{{deviceStatisData.exceptionNum||'0'}}</view>
-					<view class="name">未检测</view>
+					<view class="name">异常</view>
 				</u-col>
 			</u-row>
 		</view>
 		<view class="list-block equipment">
 			<view class="list-block-til u-font-18">设备信息</view>
-			<view class="list-block-con u-flex u-flex-wrap u-row-left"  v-if="deviceTypeListData.length>0">
+			<!-- <view class="list-block-con u-flex u-flex-wrap u-row-left"  v-if="deviceTypeListData.length>0">
 				<view class="list-block-item" 
 				 @click="openPage('pages/deviceList/deviceList',item.id)"
 				 v-for="item in deviceTypeListData" :key="item.id">
@@ -39,7 +39,24 @@
 					<view class="txt">{{item.deviceTypeName}}</view>
 				</view>
 			</view>
-			<u-empty text="暂无内容" mode="list" v-else></u-empty>
+			<u-empty text="暂无内容" mode="list" v-else></u-empty> -->
+			<view class="list-block-con u-flex u-flex-wrap u-row-left">
+				<view class="list-block-item" 
+				 @click="openPage('pages/deviceList/deviceList','1')" >
+					<image class="img" src="../../static/img/dici.png" mode="widthFix"></image>
+					<view class="txt">地磁</view>
+				</view>
+				<view class="list-block-item"
+				 @click="openPage('pages/deviceList/deviceList','2')" >
+					<image class="img" src="../../static/img/cheweisuo.png" mode="widthFix"></image>
+					<view class="txt">车位锁</view>
+				</view>
+				<view class="list-block-item"
+				 @click="openPage('pages/deviceList/deviceList','3')" >
+					<image class="img" src="../../static/img/daozha.png" mode="widthFix"></image>
+					<view class="txt">道闸</view>
+				</view>
+			</view>
 		</view>
 		<view class="list-block">
 			<view class="list-block-til  u-font-18">考勤管理</view>

pages/login/login.vue

@@ -12,11 +12,11 @@
 				<u-input v-model="form.officerNo" placeholder="请输入工号" />
 			</u-form-item>
 			<u-form-item label="" prop="loginPwd" left-icon="lock-fill" :left-icon-style="{color:'#fff'}" :border-bottom="false" label-width="120">
-				<u-input :loginPwd-icon="true" type="loginPwd" v-model="form.loginPwd" placeholder="请输入密码" />
+				<u-input :loginPwd-icon="true" type="password" v-model="form.loginPwd" placeholder="请输入密码" />
 			</u-form-item>
 			<u-button class="submit-btn" type="default" @click="submit" >登录</u-button>
 		</u-form>
-		<u-bottom></u-bottom>
+		<!-- <u-bottom></u-bottom> -->
 	</view>
 </template>
 

pages/report/report.vue

@@ -50,7 +50,7 @@
 					exceprionDes: [
 						{ 
 							required: true, 
-							message: '请输入姓名', 
+							message: '请输入内容', 
 							trigger: ['change','blur'],
 						}
 					],

utils/filter.js

@@ -137,10 +137,7 @@ Vue.filter("deviceType",function(value){
 			return '车位锁'
 			break;
 		case 3:
-			return 'led显示屏'
-			break;
-		case 4:
-			return '车牌识别设备'
+			return '栏杆道闸'
 			break;
 		default:
 			return '未知'
@@ -153,13 +150,26 @@ Vue.filter("deviceStatus",function(value){
 	status = Number(value);
 	switch (value){
 		case 0:
-			return '已离线'
+			return '异常'
 			break;
 		case 1:
-			return '运行中'
+			return '正常'
 			break;
-		case 2:
-			return '未检测'
+		default:
+			return '未知'
+			break;
+	}
+});
+
+// 查看设备事件信息事件类型
+Vue.filter("deviceLogMsgType",function(value){
+	status = Number(value);
+	switch (value){
+		case 0:
+			return '事件帧'
+			break;
+		case 1:
+			return '心跳帧'
 			break;
 		default:
 			return '未知'
@@ -171,3 +181,4 @@ Vue.filter("deviceStatus",function(value){
 
 
 
+

uview-ui/libs/request/index.js

@@ -1,5 +1,6 @@
 import deepMerge from "../function/deepMerge";
 import validate from "../function/test";
+import jsonlint from "./jsonlint";
 class Request {
 	// 设置全局默认配置
 	setConfig(customConfig) {
@@ -25,9 +26,15 @@ class Request {
 		options.params = options.params || {};
 		options.header = Object.assign({}, this.config.header, options.header);
 		options.method = options.method || this.config.method;
+		
 
 		return new Promise((resolve, reject) => {
 			options.complete = (response) => {
+				 if (typeof response.data === 'string') {
+					try {
+						response.data = { ...jsonlint.parse(response.data) };
+					} catch (e) { /* Ignore */ }
+				 }
 				// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
 				uni.hideLoading();
 				// 清除定时器，如果请求回来了，就无需loading
@@ -105,8 +112,9 @@ class Request {
 			// 默认的请求头
 			header: {},
 			method: 'POST',
-			// 设置为json，返回后uni.request会对数据进行一次JSON.parse
-			dataType: 'json',
+			// 默认为json，返回后uni.request会对数据进行一次JSON.parse
+			// 设置为string,采用jsonlint.parse格式化uni.request返回数据
+			dataType: 'string',
 			// 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
 			responseType: 'text',
 			showLoading: true, // 是否显示请求中的loading
@@ -114,7 +122,7 @@ class Request {
 			loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
 			timer: null, // 定时器
 			originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明
-			loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
+			loadingMask: true // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
 		}
 	
 		// 拦截器