拍摄功能，tabs点击

common/apiurl.js

@@ -25,6 +25,8 @@ const apiurl = {
 	getSelectDeviceListUrl:'/roadspace/selectDeviceList',
 	//设备低电量，低信号，故障分隔值数据接口
 	geoDeviceStatustUrl:'/roadspace/type/geo_device_status',
+	//车位锁低电量、故障数据接口
+	lockDeviceStatustUrl:'/roadspace/type/lock_device_status',
 	//地磁、车位锁设备详情
 	findRoadSpaceVoByIdUrl:'/roadspace/findDeviceById',
 	//地磁、车位锁设备详情
@@ -49,6 +51,8 @@ const apiurl = {
 	updateInspecMsgStatusUrl:'/inspecmsg/updateInspecMsgStatus',
 	//查询未读通知数
 	getUnreadMsgTotalUrl:'/inspecmsg/selectNoRedNum',
+	//车位锁挡板状态数据接口
+	deviceLockStatusUrl:'/roadspace/type/device_lock_status',
 }
 
 export {

common/http.api.js

@@ -18,6 +18,7 @@ const install = (Vue, vm) => {
 	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 lockDeviceStatust = (params = {}) => vm.$u.get(apiurl.lockDeviceStatustUrl,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);
@@ -30,6 +31,7 @@ const install = (Vue, vm) => {
 	let inspecmsgDetails = (params = {}) => vm.$u.get(apiurl.inspecmsgDetailsUrl,params);
 	let updateInspecMsgStatus = (params = {}) => vm.$u.put(apiurl.updateInspecMsgStatusUrl,params);
 	let getUnreadMsgTotal = (params = {}) => vm.$u.get(apiurl.getUnreadMsgTotalUrl,params);
+	let deviceLockStatus = (params = {}) => vm.$u.get(apiurl.deviceLockStatusUrl,params);
 	
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
@@ -47,6 +49,7 @@ const install = (Vue, vm) => {
 		getRoadList,
 		getSelectDeviceList,
 		geoDeviceStatust,
+		lockDeviceStatust,
 		findRoadSpaceVoById,
 		deviceLog,
 		deviceexcptionprocess,
@@ -58,7 +61,8 @@ const install = (Vue, vm) => {
 		inspecmsg,
 		inspecmsgDetails,
 		updateInspecMsgStatus,
-		getUnreadMsgTotal
+		getUnreadMsgTotal,
+		deviceLockStatus
 	};
 }
 

manifest.json

@@ -53,7 +53,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : false
             },
             /* ios打包配置 */
             "ios" : {},

pages/clockIn/clockIn.scss

@@ -139,6 +139,9 @@
 
 .remark{
 	z-index:200;
+	& /deep/ .u-drawer-top{
+		top: 44px;
+	}
 	.submit-btn{
 		position: absolute;
 		right: 40rpx;

pages/clockIn/clockIn.vue

@@ -77,7 +77,7 @@
 		</u-bottom> -->
 		
 		<u-popup class="remark" v-model="remarkPopupShow" @close="remarkClose" mode="top">
-			<u-button class="submit-btn" type="primary" size="mini" @click="getPunchIn">打卡</u-button>
+			<u-button class="submit-btn" type="primary" size="default" @click="getPunchIn">打卡</u-button>
 			<view class="content">
 				<u-form-item 
 					label="备注" 

pages/deviceList/deviceListType2/deviceListType2.vue

@@ -18,8 +18,8 @@
 						<view class="space-name">{{item.spaceName}}</view>
 						<view class="signal">
 							<text>{{item.deviceStatus|device2Status}}</text>
-							<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>
+							<image v-if="item.deviceBattery&&item.deviceBattery<lowBattery" class="img" src="../../../static/img/electricity-r.png" mode="heightFix"></image>
+							<image v-else-if="item.deviceBattery&&item.deviceBattery>=lowBattery" class="img" src="../../../static/img/electricity-g.png" mode="heightFix"></image>
 						</view>
 					</view>
 					<view class="vehicleNo">{{item.vehicleNo}}</view>
@@ -49,18 +49,18 @@
 				tabCurrent:0,
 				breakStatus:'',
 				tabList:[
-					{name:'全部',status:''},
					{name:'挡板状态',status:'0'},
					{name:'低电量',status:'3200_b'},
					{name:'低信号',status:'-100_s'}
+					{name:'全部',status:''},
					{name:'挡板状态',status:'0'},
					{name:'低电量',status:'3200_b'},
					{name:'有故障',status:'0'}
 				],
 				deviceStatusSelect:false,
 				deviceStatusList:[
-					{value:'0',label:'降板'},
-					{value:'1',label:'升板'},
-					{value:'2',label:'心跳'},
-					{value:'5',label:'车辆入位'},
-					{value:'6',label:'车辆出位'},
-					{value:'7',label:'复位'},
-					{value:'8',label:'逃费'},
-					{value:'10',label:'状态上报'},
+					// {value:'0',label:'降板'},
+					// {value:'1',label:'升板'},
+					// {value:'2',label:'心跳'},
+					// {value:'5',label:'车辆入位'},
+					// {value:'6',label:'车辆出位'},
+					// {value:'7',label:'复位'},
+					// {value:'8',label:'逃费'},
+					// {value:'10',label:'状态上报'},
 				],
 				deviceStatus:'',
 				downOption:{
@@ -86,7 +86,8 @@
 		},
 		onLoad(page){
 			console.log('page',page);
-			this.getGeoDeviceStatust()
+			this.getLockDeviceStatust();
+			this.getDeviceLockStatus();
 			if(page.roadName){
 				this.roadName = page.roadName;
 				this.title = page.roadName;
@@ -141,6 +142,12 @@
 				this.breakStatus = this.tabList[index].status;
 				this.refresh();
 			},
+			deviceStatusSelectConfirm(e){
+				this.deviceStatus =e[0].value;
+				this.tabList[1].name = e[0].label;
+				this.breakStatus = '';
+				this.refresh();
+			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
 				// console.log('page',page);
@@ -177,12 +184,18 @@
 			refresh(){
 				this.mescroll.resetUpScroll( );
 			},
-			getGeoDeviceStatust(){
-				this.$u.api.geoDeviceStatust().then(res=>{
+			getLockDeviceStatust(){
+				this.$u.api.lockDeviceStatust().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] )}
+						if(item.dictLabel=='低电量'){
+							that.lowBattery = Number( item.dictValue.split('_')[0] );
+							that.tabList[2].status= item.dictValue;
+						}
+						if(item.dictLabel=='有故障'){
+							// that.lowSignal = Number( item.dictValue.split('_')[0] );
+							that.tabList[3].status= item.dictValue;
+						}
 					});
 					console.log('this.lowBattery',this.lowBattery);
 				}).catch(()=>{
@@ -191,12 +204,21 @@
 					this.mescroll.endErr();
 				})
 			},
-			deviceStatusSelectConfirm(e){
-				this.deviceStatus =e[0].value;
-				this.tabList[1].name = e[0].label;
-				this.breakStatus = '';
-				this.refresh();
-			}
+			getDeviceLockStatus(){
+				this.$u.api.deviceLockStatus().then(res=>{
+					let that = this;
+					res.data.data.map(function(currentValue){
+					    that.deviceStatusList.push({value:currentValue.dictValue,label:currentValue.dictLabel})
+					    // console.log('currentValue',currentValue);
+					});
+					console.log('getDeviceLockStatus',res);
+					console.log('that.deviceStatusList',that.deviceStatusList);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
 			
 		}
 	}

uview-ui/components/u-tabs/u-tabs.vue

@@ -247,7 +247,7 @@
 			// 点击某一个tab菜单
 			clickTab(index) {
 				// 点击当前活动tab，不触发事件
-				if(index == this.currentIndex) return ;
+				// if(index == this.currentIndex) return ;
 				// 发送事件给父组件
 				this.$emit('change', index);
 			},