init

pages/center/Piabodata/Customerportrait/Receivedetailabout.vue

@@ -1706,7 +1706,7 @@
 }
 .followingpop-up{
 	width: 100%;
-	height: 700rpx;
+	height: 75vh;
 	background: #FFFFFF;
 	position: fixed;
 	background: #FFFFFF;
@@ -1715,7 +1715,7 @@
 	z-index: 1000;
 	display:flex;
 	flex-direction:column;
-	position: relative;
+	// position: relative;
 	.calibration{
 		width: 90rpx;
 		height: 90rpx;
@@ -1766,7 +1766,7 @@
 			.jianbox-cen{
 				width: 100%;
 				height: 78rpx;
-				border-bottom: 1px solid #E0E0E0;
+				// border-bottom: 1px solid #E0E0E0;
 				display: flex;
 				.jianboxtext{
 					flex: 1;

pages/center/records/index.vue

@@ -47,7 +47,8 @@
 				
 				<view class="right" v-if="item.recording!=0">
 					<view v-if="methodsisshow==true">
-						<text  v-if="item.taboo==1">违禁接待 |</text>
+						<text  style="color: red;" v-if="item.taboo==1">违禁接待</text>
+						<text v-if="item.taboo==1"> |</text>
 					</view>
 					<!-- <view class="point"></view> -->
 					<view v-if="item.markAdvisor==0" class="">未标记</view>

pages/center/records/recordSearch.vue

@@ -15,7 +15,8 @@
 				
 				<view class="right" v-if="item.recording!=0">
 					<view v-if="methodsisshow==true">
-						<text  v-if="item.taboo==1">违禁接待 |</text>
+						<text style="color: red;"  v-if="item.taboo==1">违禁接待</text>
+						<text v-if="item.taboo==1"> |</text>
 					</view>
 					<!-- <view class="point"></view> -->
 					<view v-if="item.markAdvisor==0" class="">未标记</view>

pages/index/index.vue

@@ -60,20 +60,20 @@
 		</view>
 
 		<view class="title" v-if="equipmentisshow">设备</view>
-		<view class="shebenbox" v-if="equipmentisshow" @click="tapjumpequipment()">
-			<view class="shebenche">
+		<view class="shebenbox" v-if="equipmentisshow" >
+			<view class="shebenche" @click="tapjumpequipment(0)">
 				<view class="shebenchenum">{{equipmentobj.totalNum || 0}}</view>
 				<view class="shebenchetext">设备总数</view>
 			</view>
-			<view class="shebenche">
+			<view class="shebenche" @click="tapjumpequipment(1)">
 				<view class="shebenchenum">{{equipmentobj.onlineNum || 0}}</view>
 				<view class="shebenchetext">在线</view>
 			</view>
-			<view class="shebenche">
+			<view class="shebenche" @click="tapjumpequipment(3)">
 				<view class="shebenchenum">{{equipmentobj.activeNum || 0}}</view>
 				<view class="shebenchetext">活跃</view>
 			</view>
-			<view class="shebenche">
+			<view class="shebenche" @click="tapjumpequipment(2)">
 				<view class="shebenchenum" style="color: red;">{{equipmentobj.lowPowerNum || 0}}</view>
 				<view class="shebenchetext">急需充电</view>
 			</view>
@@ -403,11 +403,11 @@
 			cancel() {
 				this.Showhiddenunits = false;
 			},
-			tapjumpequipment(){
+			tapjumpequipment(i){
 				this.Menulist.forEach(item=>{
 					if(item.name=='设备管理'){
 						uni.navigateTo({
-							url: '/pages/mine/equipment/index'
+							url: '/pages/mine/equipment/index?active='+i
 						});
 					}
 				})

pages/mine/details2.vue

@@ -1757,7 +1757,7 @@
 }
 .followingpop-up{
 	width: 100%;
-	height: 700rpx;
+	height: 75vh;
 	background: #FFFFFF;
 	position: fixed;
 	background: #FFFFFF;
@@ -1766,7 +1766,7 @@
 	z-index: 1000;
 	display:flex;
 	flex-direction:column;
-	position: relative;
+	// position: absolute;
 	.calibration{
 		width: 90rpx;
 		height: 90rpx;
@@ -1817,7 +1817,7 @@
 			.jianbox-cen{
 				width: 100%;
 				height: 78rpx;
-				border-bottom: 1px solid #E0E0E0;
+				// border-bottom: 1px solid #E0E0E0;
 				display: flex;
 				.jianboxtext{
 					flex: 1;

pages/mine/equipment/index.vue

@@ -1,22 +1,22 @@
 <template>
 	<view class="cented">
-		<!-- <view class="infoinputbox">
-			<input type="text" v-model="imei" placeholder="请输入设备编号或领用人进行搜索" class="infoinput" />
-			<view class="dingweiinfo" @click="shecs()">
-				<image class="sehoimg" src="../../../static/images/newimg/search.png" mode=""></image>
-			</view>
-		</view> -->
 		<view style="width: 690rpx;margin: 0 auto;margin-top: 20rpx;">
 			<u-search  @search='shecs()' :show-action='false' placeholder="请输入设备编号或领用人进行搜索" v-model="imei"></u-search>
 		</view>
+		
 		<view class="tab-box">
-			<view class="tab-item-wrap">
+			<!-- <view class="tab-item-wrap">
 				<view v-for="(item, index) in tablist" :key="index" :class="activeClass == index ? 'bottom' : ''" @tap="clocktab(index)">
 					{{item.names}}( {{item.num}} )
 					<view class="bottomLine" v-if="activeClass == index"></view>
 				</view>
-			</view>
+			</view> -->
+			<u-tabs-swiper ref="tabs" font-size="30" :bold="true" swiper-width="700" :current="activeClass" @change="clocktab()"
+			 inactive-color="#b1b1b1" active-color="#008ef2" :list="tablist" :is-scroll="true">
+			</u-tabs-swiper>
 		</view>
+		
+		
 		<view class="infoet">
 			<view class="infoviewbox" v-for="(item,index) in newListdata" :key="index">
 				<view class="infobox1">
@@ -83,17 +83,21 @@
 	export default {
 		data() {
 			return {
-				tablist: [{
-						names: "在线数量",
-						num: "0"
+				tablist: [
+					{
+						name: "全部(0)",
+					},
+					{
+						name: "在线(0)",
+					},
+					{
+						name: "低电量(0)",
 					},
 					{
-						names: "离线数量",
-						num: "0"
+						name: "今日活跃(0)",
 					},
 					{
-						names: "低电量设备",
-						num: "0"
+						name: "离线(0)",
 					}
 				],
 				activeClass: 0,
@@ -101,10 +105,8 @@
 				pageSize:20,
 				imei:"",
 				orgcode:"",
-				onLine:1,
 				newListdata:[],
 				buildingID:'',
-				electricity:'',
 				jump:''
 			};
 		},
@@ -113,11 +115,14 @@
 			this.init()
 		},
 		onLoad(options) {
-			this.jump=options.jump;
-			if(this.jump=="jump"){
-				this.activeClass=2;
-				this.electricity=20;
+			if(options.active){
+				this.activeClass=options.active
+			}else{
+				this.activeClass=0
 			}
+			this.newListdata=[]
+			this.pageNum=1;
+			this.pageSize=5;
 			 this.init() 
 		},
 		filters: {
@@ -161,20 +166,10 @@
 			},
 			// tab
 			clocktab(index) {
+				this.activeClass=index;
 				this.newListdata=[]
 				this.pageNum=1;
 				this.pageSize=5;
-				this.activeClass = index;
-				if(this.activeClass==0){
-					this.onLine=1;
-					this.electricity='';
-				}else if(this.activeClass==1){
-					this.onLine=0;
-					this.electricity='';
-				}else{
-					this.onLine=1;
-					this.electricity=20;
-				}
 				this.init()
 			},
 			init(){
@@ -184,16 +179,20 @@
 					pageSize: this.pageSize,
 					query:{
 						imei:this.imei,
-						onLine:this.onLine,	
+						onLine:this.activeClass,	
 						propertyId:this.buildingID,
-						electricity:this.electricity,
 						orderType:1
 					}
 				}
+				if(this.activeClass==0){
+					parames.query.onLine=null
+				}
 				this.$u.post("/equipment/apiFindByPage", parames).then(res => {
-					this.tablist[0].num=res.eqOnLineCount
-					this.tablist[1].num=res.eqOffLineCount
-					this.tablist[2].num=res.lowElectricityCount
+					this.tablist[0].name="全部("+res.allCount+")";
+					this.tablist[1].name="在线("+res.eqOnLineCount+")";
+					this.tablist[2].name="低电量("+res.lowElectricityCount+")";
+					this.tablist[3].name="今日活跃("+res.activeCount+")";
+					this.tablist[4].name="离线("+res.eqOffLineCount+")";
 					if(res.obj.list.results==null){
 						if (this.pageNum == 1){
 							return
@@ -205,13 +204,10 @@
 						}
 					}else{
 						res.obj.list.results.forEach(item=>{
-							
-							
 							if(this.activeClass==1){
 								item.signalDevice=0
 							}
 							
-							
 							if(item.electricity==''){
 								item.electricity=0
 							}