页面增加筛选， 花溪谷显示调整

README.md

@@ -1 +1,3 @@
-[](https://modao.cc/proto/s1QFMhkss7n1emgHHRAr0E/sharing?view_mode=read_only)
+[](https://modao.cc/proto/s1QFMhkss7n1emgHHRAr0E/sharing?view_mode=read_only)
+
+[](https://dgj.hbjp.com.cn/charging-prod/jp-housekeep-manage-test/#/)

config/.env.dev.js

@@ -3,7 +3,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
 	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
-	//BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
+	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
 	
@@ -11,10 +11,10 @@ const UNI_APP = {
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	 openId:"1234",//开发人员2
 	// openId:"55555",//测试人员 开发环境
-	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
+	openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	
 	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //wky

package.json

@@ -19,7 +19,7 @@
 		"babel-eslint": "^10.0.3",
 		"eslint": "^5.16.0",
 		"eslint-plugin-vue": "^5.0.0",
-		"node-sass": "^5.0.0",
+		"node-sass": "^9.0.0",
 		"sass-loader": "^11.0.1",
 		"uni-crazy-router": "0.0.31",
 		"vue-template-compiler": "^2.6.10"

pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -9,7 +9,12 @@
 				<image class="img" src="@/assets/img/refresh-line.svg" @click="getList(true)"></image>
 			</view>
 
-		</view>
+		</view>
+		<u-select title="" v-model="tabsFrom.show1" :defaultValue="[current2]"
+		 :list="childList" value-name="id" label-name="name"
+			@confirm="selector1confirm"  >
+		</u-select>
+		
 		<u-picker-select title="日期选择" v-model="tabsFrom.show2" :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			mode="time" :params="params" :noselect="false" @confirm="selector2confirm" @cancel="selector2cancel"
 			@reset="selector2reset"></u-picker-select>
@@ -44,11 +49,23 @@
 			</view>
 		</u-popup>
 
-		
+		<view class="electronicMonitoring-title"
+		 @click="titleCk"
+		 v-if="childList&&childList.length>0" >
+			<view>
+				{{childListName}}
+			</view>
+			<view v-show="childList.length>1">
+				<u-icon name="arrow-down" color="#fff"></u-icon>
+			</view>
+		</view>
 
 		<!-- 全部标签 -->
-		<view class="main"   v-show="current==0" >
-			<view class="item" v-for="(item, index) in kWhListHome" :key="item.index" v-if="current==0"
+		<view class="main"    >
+			
+			
+			
+			<view class="item" v-for="(item, index) in kWhList" :key="item.index" 
 			@click="toElectronicMonitoring(item)">
 				<view class="item-content">
 					<view class="equipment">
@@ -101,110 +118,9 @@
 			</view>
 			
 		</view>
-		<u-divider v-show="current==0" :isnone="kWhListHome.length==0" nonetext="暂无数据" border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider  :isnone="kWhList.length==0" nonetext="暂无数据" border-color="#CFD2D5">已经到底了</u-divider>
 		
-		<view class="content" v-show="kWhList.length==1" style="padding: 0;">
-			
-			<electronicMonitoring v-show="kWhList.length" :ref="'refMyEm'+companyId"></electronicMonitoring>
-			
-			<u-divider  :isnone="kWhList.length==0" nonetext="暂无数据" border-color="#CFD2D5">已经到底了</u-divider>
-			
-		</view>
 		
-		<view  v-show="kWhList.length!=1">
-			<!-- 子项标签 -->
-			<view class="content" 
-			v-if="!getHomePageManageshowLoading&&current!=0">
-				
-				<div class="uni-toast" style="display: flex;font-size: 60rpx;    color: rgb(192, 196, 204);" >
-					<i class="uni-icon_toast uni-loading"
-				style="
-					width: 80rpx;
-					height: 80rpx;
-					
-				"
-				></i><p class="uni-toast__content">  </p>加载中...</div>
-				
-			</view>
-			
-			<view class="content" v-else-if="getHomePageManageshowLoading&&meterList.length == 0&&current!=0">
-				<u-divider :isnone="true"  nonetext="无记录"
-					border-color="#fff"></u-divider>
-			</view>
-			<view class="statistics-manage" v-show="current!=0&&getHomePageManageshowLoading" >
-				
-
-				<!-- 图表 -->
-				<view class="chart">
-					<view class="u-subsection">
-						<u-subsection :list="list"   :current="homePageManageType" @change="sectionChange" font-size="24"></u-subsection>
-					</view>
-					<view class="incomeExpenditureClass" v-show="companyType!=4&&homePageManageObj.showPark" >
-						<view class="income1">
-							<view  class="income11">
-								电费支出 (元)
-							</view>
-							<view   class="income12">
-								{{incomeExpenditureObj.expenditureFee}}
-								<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
-								
-							</view>
-						</view>
-						<view class="income1">
-							<view  class="income11">
-								电费收入 (元)
-							</view>
-							<view   class="income12">
-								{{incomeExpenditureObj.incomeFee}}
-								<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
-								
-							</view>
-						</view>
-						<view class="income1">
-							<view  class="income11">
-								收支情况 (元)
-							</view>
-							<view   class="income12" :style="incomeExpenditureObj.differenceFee>=0?'color:red':'color:#52b8aa'">
-								{{incomeExpenditureObj.differenceFee}}
-								<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
-								
-							</view>
-						</view>
-					
-					</view>
-					<view class="chat-box" id="barEcharts-statistics"  v-show="companyType!=4&&homePageManageObj.showPark">
-					
-					</view>
-				</view>
-
-				<view class="search" v-if="0">
-					<view class="switch">
-						<u-switch v-model="checked" size="40"></u-switch><text>只看离线表</text>
-					</view>
-					<view class="search-box" >
-						<input type="text" placeholder="请输入电表查询" />
-						<view class="icon">
-							<img src="@/assets/img/riLine-search-line 1.svg" alt="" />
-						</view>
-					</view>
-
-				</view>
-				
-				<!-- 电表统计 -->
-				<Tree-Body :meterList="meterList" ref="mytree"
-				 @query="getHomePageManageChildMeter"
-				  :showPark="homePageManageObj.showPark"
-				 v-if="getHomePageManageReady"
-				 :role="codes&&codes.indexOf('switch')!=-1"
-				 @switchBtn="switchBtnApi"
-				 ></Tree-Body>
-				
-
-			</view>
-			
-			<u-divider   nonetext="无记录"  v-show="current!=0&&getHomePageManageshowLoading"
-				border-color="#CFD2D5">已经到底了</u-divider>
-		</view>
 	</view>
 </template>
 
@@ -249,7 +165,7 @@
 				meterListShow:{},
 				queryDate: '',
 				kWhList: [], //设备
-				kWhListHome: [], //设备
+				 
 				companyId: '',
 				popShow: false,
 				current: 0,
@@ -307,13 +223,26 @@
 				utabsone:true,
 				companyType:0,
 				incomeExpenditureObj:{},
-				opCompanyId: '',
+				opCompanyId: '',
+				childList:[],
+				companyListMain:[],
+				current2:0,
+				childInfo:{},
+				companyInfo:{}
 			}
 		},
 		onReady() {
 		
 			
 			
+		},
+		computed:{
+			childListName(){
+				return this.childInfo.name;
+			},
+			companyType(){
+				return this.companyInfo.type;
+			}
 		},
 		onLoad(op) {
 			this.endYear = new Date().getFullYear();
@@ -325,19 +254,38 @@
 				this.companyId=op.companyId
 				
 			} 
-			// else{
-			// 	this.getCompanyInfoList();
-			// }
+			else{
+				this.getCompanyInfoList();
+			}
 			this.getList();
 			
 		},
 		onReachBottom() {
-			if (this.current==0&&this.kWhListHome.length < this.recordsTotal) {
+			if (this.kWhList.length < this.recordsTotal) {
 				this.myLoadmore();
 			}
 		},
 	
-		methods: {
+		methods: {
+			titleCk() {
+				if(this.childList.length>1){
+					this.tabsFrom.show1 = true
+				}
+				
+			},
+			selector1confirm(e) {
+				//this.getHomePageKwh()
+				
+				console.log(e)
+				this.companyId=e[0].value
+			
+				this.current2=e[0].i
+				
+				this.childInfo=this.childList[this.current2];
+				uni.showLoading()
+				
+				this.merchantChangeApi()
+			},
 			companyIdSet(val,item){
 				
 				this.companyType= 0
@@ -395,11 +343,12 @@
 				console.log(node,key)
 			},
 			refreshList() {
-				if (this.current != 0) {
-					this.getList(true);
-				} else {
-					this.getCompanyInfoList();
-				}
+				// if (this.current != 0) {
+					
+				// } else {
+				// 	this.getCompanyInfoList();
+				// }
+				this.getList(true);
 			},
 			companyChange(item, index) {
 				this.current = index + 1;
@@ -412,9 +361,15 @@
 				this.companyKwhList = [];
 
 				API.deviceCompanyList().then((response) => {
-					var list = response.data.companyInfoList;
+					var list = response.data.companyInfoList;
+					this.companyListMain=response.data.companyInfoList;
+					if(list.length==1&&list[0].childList&&list[0].childList.length){
+						list=list[0].childList
+						
+					}
+					
 					this.companyList = list;
-
+					
 					var mList1 = [];
 					var mList2 = [];
 					mList1.push({
@@ -435,8 +390,8 @@
 					this.merchantList1 = mList1;
 					this.merchantList2 = mList2;
 					this.companyId = mList1[0].id;
-					this.companyIdSet(this.companyId)
-					this.getList();
+					//this.companyIdSet(this.companyId)
+					//this.getList();
 
 				}).catch(error => {
 					uni.showToast({
@@ -456,7 +411,7 @@
 					mask: true,
 				})
 				if (bl) {
-					this.kWhListHome = [];
+					this.kWhList = [];
 					this.pageIndex = 1;
 				}
 				var data = {
@@ -466,8 +421,8 @@
 				};
 				API.homePageKwh(data).then((res) => {
 					uni.hideLoading();
-					this.kWhListHome = [
-						...this.kWhListHome,
+					this.kWhList = [
+						...this.kWhList,
 						...res.data.data
 					];
 					this.recordsTotal = res.data.recordsTotal;
@@ -480,59 +435,39 @@
 			},
 			getHomePageKwh(companyId) {
 				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
 				
-				var data = {
-					pageIndex: this.pageIndex,
-					pageSize: 20,
-					companyId: companyId
-				};
-				API.homePageKwh(data).then((res) => {
-					uni.hideLoading();
-					this.kWhList =res.data.data;
-					//this.recordsTotal = res.data.recordsTotal;
-					if(this.kWhList.length==1){
-						
-						var item=this.kWhList[0];
-						this.$refs['refMyEm'+companyId].init({
-							id:item.id,
-							name:item.name,
-							companyId:item.companyId,
-							ref:1,
-						})
-					}else{
-						this.getHomePageManage(1)
-						//this.getDeviceStatus()
-						//this.getAbnormalAlarmRecord();
-					}
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
 			},
 			merchantChange(item, index) {
-				if(this.current==0){
-					this.current=1;
-				}
-				this.utabsone=false
-				var m = item;
-				var n = this.merchantList1[this.current];
-				this.merchantList1[this.current] = m;
-				this.merchantList2[index] = n;
-				this.companyId = item.id;
-				this.companyIdSet(this.companyId)
+				if(this.current==0){
+					this.current=1;
+				}
+				var m = company;
+				var n = this.merchantList1[this.current];
+				this.merchantList1[this.current] = m;
+				this.merchantList2[index] = n;
+				//this.$forceUpdate()
+				this.utabsone=false
+				this.companyId = company.id;
+				
+				this.companyInfo=company
+				
+				
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}	
+				}else{
+					this.companyId =''	
+				}
+				
+				this.merchantChangeApi()
 				this.popShow = false;
-				this.$nextTick(()=>{
-					this.utabsone=true
-				})
-				//this.getList(true);
-				this.merchantChangeApi()
 				
 			},
 			
@@ -856,22 +791,33 @@
 			merchantChangeApi() {
 			
 				this.popShow=false
-				if (this.companyId) {
-					
-					this.getHomePageKwh(this.companyId)
-					
-					
-				}else{
-					this.kWhList=[]
-				
-					
-				}
+				
+				this.getList(true)
 				
 			},
 			change(index) {
-				this.current = index;
-				this.companyId = this.merchantList1[index].id;
-				this.companyIdSet(this.companyId)
+				this.current = index;
+				this.current2=0;
+				this.childList=[]
+				var company= this.merchantList1[index]
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}
+					
+					
+				}else{
+					this.companyId =''
+					
+				}
+				this.companyInfo=company;
+				
 				this.merchantChangeApi()
 			},
 			backStatistics() {
@@ -1394,5 +1340,17 @@
 				margin-top: 24rpx;
 			}
 		}
+	}
+	.electronicMonitoring-title{
+		display: flex;
+		    align-items: center;
+		padding: 0px 32rpx;
+		    justify-content: space-between;
+			height: 120rpx;
+			font-size: 36rpx;
+background-color: rgba(22,119,255,1);
+color:#fff;
+
+
 	}
 </style>

pages/equipmentInformation/equipmentConditionMonitoring.vue

@@ -1,10 +1,16 @@
 <template>
 	<view>
 		<u-navbar title="设备状态监测" title-color="#101010"></u-navbar>
-
-		<view class="dropdown">
+		<u-select title="" v-model="tabsFrom.show1" :defaultValue="[current2]"
+		 :list="childList" value-name="id" label-name="name"
+			@confirm="selector1confirm"  >
+		</u-select>
+		<view class="dropdownMain" >
+			<view class="dropdown" >
+				
+			
 			<view class="dropdown-item" @click="show1=true">
-
+		
 				<view class="text">
 					{{device}}
 				</view>
@@ -23,6 +29,49 @@
 				</view>
 			</view>
 		</view>
+		<!-- 标签 -->
+		<view class="tabs-box" >
+			
+			<view class="tabs" :class="'tabs-len-'+merchantList1.length"  v-show="companyList.length>1"
+			 :style="{width: companyList.length>3 ? '' : '100%'}">
+				<u-tabs-one  v-if="utabsone"
+				:list="merchantList1" :is-scroll="false" inactive-color="#999999" active-color="#666666"
+				 :current="current" @change="change"></u-tabs-one>
+			</view>
+			<view class="more" @click="popShow=true" v-if="companyList.length >= 4">
+				<u-icon name="arrow-down" color="#fff" size="40"></u-icon>
+			</view>
+		</view>
+		<!-- 标签弹出层 -->
+		<u-popup v-model="popShow" duration="10" mode="top" :negative-top="88" border-radius="16">
+			<view class="popup-tabs">
+				<view class="tabs">
+					<u-tabs :list="merchantList1" :is-scroll="false" :current="current" @change="change"></u-tabs>
+				</view>
+				<view class="more">
+					<u-icon name="arrow-up" color="#777777" size="40" @click="popShow=false"></u-icon>
+				</view>
+			</view>
+			<view class="tabs-options">
+				<view class="item" v-for="(item, index) in merchantList2" :key="index"
+					@click="merchantChange(item,index)">
+					{{item.name}}
+				</view>
+			</view>
+		</u-popup>
+		
+		<view class="electronicMonitoring-title"
+		 @click="titleCk"
+		 v-if="childList&&childList.length>0" >
+			<view>
+				{{childListName}}
+			</view>
+			<view v-show="childList.length>1">
+				<u-icon name="arrow-down" color="#fff"></u-icon>
+			</view>
+		</view>
+		</view>
+		
 		<u-select v-model="show1" mode="single-column" :list="deviceTypeList" @confirm="deviceChange"></u-select>
 
 		<u-select v-model="show2" mode="single-column" :list="statusList" @confirm="statusChange"></u-select>
@@ -40,9 +89,10 @@
 						<view class="name1">
 							{{replaceLastTwoWords(item.name)}}
 						</view>
-						<view class="name2">
-							{{item.installationAddressSimple}}
-						</view>
+						
+					</view>
+					<view class="content3">
+						{{item.installationAddressSimple}}
 					</view>
 					<view class="content2">
 						<view class="text">
@@ -113,6 +163,10 @@
 	export default {
 		data() {
 			return {
+				companyList: [], // 商户
+				merchantList1: [],
+				merchantList2: [],
+				
 				deviceList: [],
 				show1: false,
 				show2: false,
@@ -140,17 +194,45 @@
 						label: '设备异常'
 					}
 				],
+				tabsFrom: {
+					show1: false,
+					show1Index: 0,
+					show2Index: '',
+					show2: false,
+					show1Text: "全部类型",
+					show2Text: "全部时间",
+					
+				},
 				status: '',
 				deviceType: '',
 				companyId:"",
 				pageIndex: 1,
 				recordsTotal:0,
+				utabsone:true,
+				companyType:0,
+				incomeExpenditureObj:{},
+				opCompanyId: '',
+				childList:[],
+				companyListMain:[],
+				current2:0,
+				childInfo:{},
+				companyInfo:{},
+				popShow: false,
+				current: 0,
 			}
 		},
+		computed:{
+			childListName(){
+				return this.childInfo.name;
+			},
+			
+		},
 		onLoad(op) {
 			if(op.companyId){
 				this.companyId=op.companyId
-			}	
+			}else{
+				this.getCompanyInfoList();
+			}
 			this.getDeviceStatusMonitoring();
 		},
 		onReady() {
@@ -163,6 +245,134 @@
 			}
 		},
 		methods: {
+			merchantChangeApi() {
+			
+				this.popShow=false
+				
+				//this.getList(true)
+				
+				this.getDeviceStatusMonitoring(1);
+				
+			},
+			titleCk() {
+				if(this.childList.length>1){
+					this.tabsFrom.show1 = true
+				}
+				
+			},
+			selector1confirm(e) {
+				//this.getHomePageKwh()
+				
+				console.log(e)
+				this.companyId=e[0].value
+			
+				this.current2=e[0].i
+				
+				this.childInfo=this.childList[this.current2];
+				uni.showLoading()
+				
+				this.merchantChangeApi()
+			},
+			change(index) {
+				this.current = index;
+				this.current2=0;
+				this.childList=[]
+				var company= this.merchantList1[index]
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}
+					
+					
+				}else{
+					this.companyId =''
+					
+				}
+				this.companyInfo=company;
+				
+				this.merchantChangeApi()
+			},
+			merchantChange(item, index) {
+				if(this.current==0){
+					this.current=1;
+				}
+				var m = company;
+				var n = this.merchantList1[this.current];
+				this.merchantList1[this.current] = m;
+				this.merchantList2[index] = n;
+				//this.$forceUpdate()
+				this.utabsone=false
+				this.companyId = company.id;
+				
+				this.companyInfo=company
+				
+				
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}	
+				}else{
+					this.companyId =''	
+				}
+				
+				this.merchantChangeApi()
+				this.popShow = false;
+				
+			},
+			getCompanyInfoList() {
+				this.companyKwhList = [];
+			
+				API.deviceCompanyList().then((response) => {
+					var list = response.data.companyInfoList;
+					this.companyListMain=response.data.companyInfoList;
+					if(list.length==1&&list[0].childList&&list[0].childList.length){
+						list=list[0].childList
+						
+					}
+					
+					this.companyList = list;
+					
+					var mList1 = [];
+					var mList2 = [];
+					mList1.push({
+						id: '',
+						name: '全部'
+					});
+			
+					for (var i = 0; i < list.length; i++) {
+						if (i >= 3) {
+							mList2.push(list[i]);
+						} else {
+							mList1.push(list[i]);
+						}
+			
+						
+					}
+			
+					this.merchantList1 = mList1;
+					this.merchantList2 = mList2;
+					this.companyId = mList1[0].id;
+					
+			
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			myLoadmore() {
 				this.pageIndex += 1;
 				this.getDeviceStatusMonitoring();
@@ -259,11 +469,17 @@
 	page{
 		//padding-bottom: 100px;
 	}
-	.dropdown {
-		background-color: #fff;
+	.dropdownMain {
 		position: sticky;
 		top: 88rpx;
+		background-color: #fff;
 		z-index: 999;
+	}
+	.dropdown {
+		
+		
+		
+		
 		padding: 18rpx 46rpx;
 		display: flex;
 		border-bottom: 1px solid rgba(245, 245, 245, 1);
@@ -318,7 +534,11 @@
 			.item-content {
 				flex: 1;
 				margin-left: 16rpx;
-
+				.content3 {
+					color: rgba(119, 119, 119, 1);
+					font-size: 24rpx;
+				}
+				
 				.content1 {
 					display: flex;
 					align-items: center;
@@ -326,7 +546,7 @@
 					.name1 {
 						color: rgba(51, 51, 51, 1);
 						font-weight: bold;
-						max-width: 50%;
+					
 						white-space: nowrap;
 						overflow: hidden;
 						text-overflow: ellipsis;
@@ -409,4 +629,89 @@
 			}
 		}
 	}
+	
+	.tabs-box {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		
+		padding-right: 32rpx;
+		justify-content: space-between;
+		border-bottom: 1px solid rgba(232, 232, 232, 1);
+	
+		.tabs {
+			width: 97%;
+		}
+		.more{
+			padding-right: 12rpx;
+		}
+	
+		.icon {
+			margin-left: auto;
+			margin-right: 24rpx;
+		}
+	}
+	.tabs-len-1{
+		
+	}
+	.tabs-len-2{
+		/deep/.u-tab-item {
+			// max-width: 39% !important;
+			// flex: none !important;
+		}
+	}
+	.tabs-len-3{
+		/deep/.u-tab-item {
+			max-width: 39% !important;
+			flex: none !important;
+		}
+	}
+	.tabs-len-4{
+		/deep/.u-tab-item {
+			max-width: 26% !important;
+			flex: none !important;
+		}
+	}
+	/deep/.u-tab-item:first-child {
+		width: 20% !important;
+		flex: none !important;
+	}
+	
+	.popup-tabs {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 32rpx;
+		color: rgba(51, 51, 51, 1);
+		font-size: 32rpx;
+		padding-top: 32rpx;
+	
+		.tabs {
+			width: 88%;
+		}
+	}
+	
+	.tabs-options {
+		display: flex;
+		padding: 64rpx 32rpx 0;
+		flex-wrap: wrap;
+	
+		.item {
+			width: 25%;
+			margin-bottom: 40rpx;
+		}
+	}
+	.electronicMonitoring-title{
+			display: flex;
+			    align-items: center;
+			padding: 0px 32rpx;
+			    justify-content: space-between;
+				height: 120rpx;
+				font-size: 36rpx;
+	background-color: rgba(22,119,255,1);
+	color:#fff;
+	
+	
+		}
 </style>

pages/equipmentInformation/equipmentInformation.vue

@@ -2,28 +2,52 @@
 	<view>
 		<u-navbar title="设备管理" title-color="#101010"></u-navbar>
 		<!-- 下拉框 -->
-		<view class="dropdown" v-if="0&&companyList.length>2" >
-			<view class="dropdown-item" @click="show1=true">
-				
-				<view class="text">
-					{{device}} 
+		
+		<u-select title="" v-model="tabsFrom.show1" :defaultValue="[current2]"
+		 :list="childList" value-name="id" label-name="name"
+			@confirm="selector1confirm"  >
+		</u-select>
+		<!-- 标签 -->
+		<view class="tabs-box" >
+			
+			<view class="tabs" :class="'tabs-len-'+merchantList1.length"  v-show="companyList.length>1"
+			 :style="{width: companyList.length>3 ? '' : '100%'}">
+				<u-tabs-one  v-if="utabsone"
+				:list="merchantList1" :is-scroll="false" inactive-color="#999999" active-color="#666666"
+				 :current="current" @change="change"></u-tabs-one>
+			</view>
+			<view class="more" @click="popShow=true" v-if="companyList.length >= 4">
+				<u-icon name="arrow-down" color="#fff" size="40"></u-icon>
+			</view>
+		</view>
+		<!-- 标签弹出层 -->
+		<u-popup v-model="popShow" duration="10" mode="top" :negative-top="88" border-radius="16">
+			<view class="popup-tabs">
+				<view class="tabs">
+					<u-tabs :list="merchantList1" :is-scroll="false" :current="current" @change="change"></u-tabs>
 				</view>
-				<view class="item-icon">
-					<u-icon name="arrow-down" color="#999999" v-if="show1==false"></u-icon>
-					<u-icon name="arrow-up" color="#999999" v-else></u-icon>
+				<view class="more">
+					<u-icon name="arrow-up" color="#777777" size="40" @click="popShow=false"></u-icon>
 				</view>
 			</view>
-			<view class="dropdown-item" @click="show2=true">
-				<view class="text">
-					{{company}} 
-				</view>
-				<view class="icon">
-					<u-icon name="arrow-down" color="#999999" v-if="show2==false"></u-icon>
-					<u-icon name="arrow-up" color="#999999" v-else></u-icon>
+			<view class="tabs-options">
+				<view class="item" v-for="(item, index) in merchantList2" :key="index"
+					@click="merchantChange(item,index)">
+					{{item.name}}
 				</view>
 			</view>
+		</u-popup>
+		
+		<view class="electronicMonitoring-title"
+		 @click="titleCk"
+		 v-if="childList&&childList.length>0" >
+			<view>
+				{{childListName}}
+			</view>
+			<view v-show="childList.length>1">
+				<u-icon name="arrow-down" color="#fff"></u-icon>
+			</view>
 		</view>
-
 		<u-select v-model="show1" mode="single-column" :list="deviceList" @confirm="deviceChange"></u-select>
 
 		<u-select v-model="show2" mode="single-column" :list="companyList" @confirm="companyChange"></u-select>
@@ -84,15 +108,44 @@
 				show2: false, // 状态选择
 				deviceList: [],
 				companyList: [],
-				isRefresh: false
+				isRefresh: false,
+				
+				utabsone:true,
+				companyType:0,
+				incomeExpenditureObj:{},
+				opCompanyId: '',
+				childList:[],
+				companyListMain:[],
+				current2:0,
+				childInfo:{},
+				companyInfo:{},
+				popShow: false,
+				current: 0,
+				tabsFrom: {
+					show1: false,
+					show1Index: 0,
+					show2Index: '',
+					show2: false,
+					show1Text: "全部类型",
+					show2Text: "全部时间",
+					
+				},
+				merchantList1: [],
+				merchantList2: [],
 			}
 		},
 		onLoad() {
-			WxJsApi.getWxConfig([ 'scanQRCode']).then((res) => {
-				// //(res)
-			}).catch(error => {
-				//(res)
-			})
+			// WxJsApi.getWxConfig([ 'scanQRCode']).then((res) => {
+			// 	// //(res)
+			// }).catch(error => {
+			// 	//(res)
+			// })
+			
+		},
+		computed:{
+			childListName(){
+				return this.childInfo.name;
+			},
 			
 		},
 		onReady() {
@@ -107,6 +160,90 @@
 			}
 		},
 		methods: {
+			merchantChangeApi() {
+			
+				this.popShow=false
+				
+				this.getMaterList(1);
+				
+			},
+			titleCk() {
+				if(this.childList.length>1){
+					this.tabsFrom.show1 = true
+				}
+				
+			},
+			selector1confirm(e) {
+				//this.getHomePageKwh()
+				
+				console.log(e)
+				this.companyId=e[0].value
+			
+				this.current2=e[0].i
+				
+				this.childInfo=this.childList[this.current2];
+				uni.showLoading()
+				
+				this.merchantChangeApi()
+			},
+			change(index) {
+				this.current = index;
+				this.current2=0;
+				this.childList=[]
+				var company= this.merchantList1[index]
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}
+					
+					
+				}else{
+					this.companyId =''
+					
+				}
+				this.companyInfo=company;
+				
+				this.merchantChangeApi()
+			},
+			merchantChange(item, index) {
+				if(this.current==0){
+					this.current=1;
+				}
+				var m = company;
+				var n = this.merchantList1[this.current];
+				this.merchantList1[this.current] = m;
+				this.merchantList2[index] = n;
+				//this.$forceUpdate()
+				this.utabsone=false
+				this.companyId = company.id;
+				
+				this.companyInfo=company
+				
+				
+				if(company.id!=''){
+					this.childList=company.childList;
+					if(this.childList&&this.childList.length){
+						this.companyId = this.childList[0].id;
+						this.childInfo=this.childList[0]
+					}else{
+						this.childList=[]
+						this.companyId =company.id
+						this.childInfo=company
+					}	
+				}else{
+					this.companyId =''	
+				}
+				
+				this.merchantChangeApi()
+				this.popShow = false;
+				
+			},
 			//扫码识别
 			getScanCode() {
 				this.getScanCode1()
@@ -158,7 +295,46 @@
 			},
 			//查询公司list
 			getCompanyInfoList() {
-				
+				this.companyKwhList = [];
+							
+				API.deviceCompanyList().then((response) => {
+					var list = response.data.companyInfoList;
+					this.companyListMain=response.data.companyInfoList;
+					if(list.length==1&&list[0].childList&&list[0].childList.length){
+						list=list[0].childList
+						
+					}
+					
+					this.companyList = list;
+					
+					var mList1 = [];
+					var mList2 = [];
+					mList1.push({
+						id: '',
+						name: '全部'
+					});
+							
+					for (var i = 0; i < list.length; i++) {
+						if (i >= 3) {
+							mList2.push(list[i]);
+						} else {
+							mList1.push(list[i]);
+						}
+							
+						
+					}
+							
+					this.merchantList1 = mList1;
+					this.merchantList2 = mList2;
+					this.companyId = mList1[0].id;
+					
+							
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			//查询设备list
 			getDeviceList() {
@@ -347,4 +523,90 @@
 			}
 		}
 	}
+	
+	
+	.tabs-box {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		
+		padding-right: 32rpx;
+		justify-content: space-between;
+		border-bottom: 1px solid rgba(232, 232, 232, 1);
+	
+		.tabs {
+			width: 97%;
+		}
+		.more{
+			padding-right: 12rpx;
+		}
+	
+		.icon {
+			margin-left: auto;
+			margin-right: 24rpx;
+		}
+	}
+	.tabs-len-1{
+		
+	}
+	.tabs-len-2{
+		/deep/.u-tab-item {
+			// max-width: 39% !important;
+			// flex: none !important;
+		}
+	}
+	.tabs-len-3{
+		/deep/.u-tab-item {
+			max-width: 39% !important;
+			flex: none !important;
+		}
+	}
+	.tabs-len-4{
+		/deep/.u-tab-item {
+			max-width: 26% !important;
+			flex: none !important;
+		}
+	}
+	/deep/.u-tab-item:first-child {
+		width: 20% !important;
+		flex: none !important;
+	}
+	
+	.popup-tabs {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 32rpx;
+		color: rgba(51, 51, 51, 1);
+		font-size: 32rpx;
+		padding-top: 32rpx;
+	
+		.tabs {
+			width: 88%;
+		}
+	}
+	
+	.tabs-options {
+		display: flex;
+		padding: 64rpx 32rpx 0;
+		flex-wrap: wrap;
+	
+		.item {
+			width: 25%;
+			margin-bottom: 40rpx;
+		}
+	}
+	.electronicMonitoring-title{
+			display: flex;
+			    align-items: center;
+			padding: 0px 32rpx;
+			    justify-content: space-between;
+				height: 120rpx;
+				font-size: 36rpx;
+	background-color: rgba(22,119,255,1);
+	color:#fff;
+	
+	
+		}
 </style>

pages/statistics/statistics.vue

@@ -31,7 +31,8 @@
 						{{kWhList[0].name}}
 					</template>
 					<template v-else>
-						{{childList.length==1?companyInfo.name : childInfo.name}}
+					<!-- 	{{childList.length==1? : childInfo.name}} -->
+						{{companyInfo.name}}
 					</template>
 				</span>
 				<span style="padding-left: 4px;" v-if="companyList.length==1">
@@ -96,9 +97,20 @@
 		
 		<view class="main  electronicMonitoring-123" v-show="kWhList.length==1" style="padding:32rpx 0;">
 			
+			<view class="electronicMonitoring-title3"
+			v-if="companyType==5"
+			 v-show="childList&&childList.length>1" >
+			 <view style="padding:0 32rpx;">
+				 <u-tabs-one height="60"  v-if="utabsone&&childList&&childList.length"
+				  :currentIndexBl="true" bg-color="#f2f4f6"  key="B"  :showBar="false" 
+				  :list="childList" :is-scroll="false" :current="current2" @change="change2"></u-tabs-one>
+				 			
+			 </view>
+				
+			</view>
 			<view class="electronicMonitoring-title"
 			 @click="titleCk"
-			 v-if="childList&&childList.length>0" >
+			 v-else-if="childList&&childList.length>0" >
 				<view>
 					{{childListName}}
 				</view>
@@ -128,8 +140,9 @@
 			<view class="electronicMonitoring-title2"
 			v-else
 			 v-show="childList&&childList.length>1" >
-				<u-tabs-one height="60"  v-if="childList&&childList.length"
-				 :currentIndexBl="true" bg-color="#f2f4f6" 
+			 
+				<u-tabs-one height="60" :showBar="false"  v-if="utabsone&&childList&&childList.length"
+				 :currentIndexBl="true" bg-color="#f2f4f6"  key="A"
 				 :list="childList" :is-scroll="false" :current="current2" @change="change2"></u-tabs-one>
 
 			</view>
@@ -207,7 +220,7 @@
 				</view>
 			</view>
 			
-			<view class=""  v-show="companyId==''&&companyList.length>1&&datacompanyInfo.type=='2'">
+			<view class=""  v-show="getPlatformRevenueBl()">
 				<!-- 电表运行情况 -->
 				<view class="statistics-1 statistics statistics-3" >
 					<view class="title">
@@ -220,6 +233,20 @@
 					
 					</view>
 					<view class=" contractList" >
+						<view class="content"
+						 style="display: flex;justify-content: center;margin: 40px 0;"
+						v-if="!getPlatformRevenueReady">
+							
+							<div class="uni-toast" style="display: flex;font-size: 60rpx;    color: rgb(192, 196, 204);" >
+								<i class="uni-icon_toast uni-loading"
+							style="
+							    width: 80rpx;
+							    height: 80rpx;
+								
+							"
+							></i><p class="uni-toast__content">  </p>加载中...</div>
+							
+						</view>
 						<!-- @click="gotoUrl('/pages/tenantList/contractList?query=1')" -->
 						<view class="contractListClass"  v-for="(item,i) in platformRevenueList" :key="i"
 						>
@@ -251,7 +278,7 @@
 					
 					</view>
 					<view class=" contractList">
-						<view class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=1')">
+						<view class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=1&companyId='+companyId)">
 							<view class="contractListClass1">
 								<image class="img" src="@/assets/img/riLine-wallet-2-line.svg"></image>
 								账户余额不足 <span class="tenantListNum">{{tenantListNum1}}</span> 家
@@ -261,7 +288,7 @@
 								<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 							</view>
 						</view>
-						<view  class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=2')">
+						<view  class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=2&companyId='+companyId)">
 							<view class="contractListClass1">
 								<!-- <image class="img" src="@/assets/img/riLine-time-line2.svg"></image> -->
 								<u-icon name="warning" class="img" size="32" color="#ef8132"></u-icon>
@@ -272,7 +299,7 @@
 								<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 							</view>
 						</view>
-						<view  class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=3')">
+						<view  class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=3&companyId='+companyId)">
 							<view class="contractListClass1">
 								<image class="img" src="@/assets/img/riLine-time-line2.svg"></image>
 								租赁费催缴提醒 <span  class="tenantListNum">{{tenantListNum3}}</span> 家<span>（已到期）</span>
@@ -367,7 +394,7 @@
 								指定时间：{{tabsFrom.show2Text}}
 							</view>
 					</view>
-					<view class="incomeExpenditureClass" v-show="companyType!=4&&homePageManageObj.showPark" >
+					<view class="incomeExpenditureClass" v-show="childInfo.type!=4" >
 						<view class="incomeRow" >
 							<view class="income1">
 								<view  class="income11">
@@ -410,7 +437,7 @@
 						</view>
 					
 					</view>
-					<view class="chat-box" id="barEcharts-statistics" v-show="companyType!=4&&homePageManageObj.showPark">
+					<view class="chat-box" id="barEcharts-statistics" v-show="childInfo.type!=4">
 
 					</view>
 				</view>
@@ -648,7 +675,8 @@
 				kWhListHome: [],
 				codes: '', // 判断：reading用电量 detector设备数据检测
 				merchantList1: [], // 商户
-				merchantList2: [],
+				merchantList2: [],
+				companyListMain: [],
 				companyList: [],
 				datacompanyInfo:{},
 				companyInfotypeCurrent:1,
@@ -745,7 +773,8 @@
 				childInfo:{},
 				companyInfo:{},
 				month:0,
-				platformRevenueList:[],
+				platformRevenueList:[],
+				getPlatformRevenueReady:false,
 			}
 		},
 		onLoad() {
@@ -792,6 +821,8 @@
 				return this.childInfo.name;
 			},
 			companyType(){
+				
+				
 				return this.companyInfo.type;
 			}
 		},
@@ -873,7 +904,10 @@
 				// uni.showLoading({
 				// 	title: "加载中",
 				// 	mask: true,
-				// })
+				// })
+				this.tenantListNum1=0
+				this.tenantListNum2=0
+				this.tenantListNum3=0
 				API_tenantList.tenantContractList({
 					companyId:this.companyId
 				}).then((response) => {
@@ -1153,11 +1187,11 @@
 					
 				}else{
 					this.kWhList=[]
-					this.getDeviceStatus()
+					
 					this.getPlatformRevenue()
 					
 				}
-				
+				this.getDeviceStatus()
 			},
 			companyInfotypeChange(index){
 				if(index!=this.companyInfotypeCurrent){
@@ -1254,6 +1288,11 @@
 				API.deviceCompanyList().then((response) => {
 					//uni.hideLoading();
 					var list = response.data.companyInfoList;
+					this.companyListMain=response.data.companyInfoList;
+					if(list.length==1&&list[0].childList&&list[0].childList.length){
+						list=list[0].childList
+						
+					}
 					
 					var mList1 = [];
 					var mList2 = [];
@@ -1368,8 +1407,8 @@
 					//console.log(this.meterList)
 					this.homePageManageObj = response.data;
 					//this.$forceUpdate()
-					if(this.companyType!=4&&this.homePageManageObj.showPark){
-						
+					if(this.childInfo.type!=4){
+						//&&this.homePageManageObj.showPark
 						this.myBarChart=null;
 						this.$nextTick(()=>{
 								this.getBarCharts()
@@ -1451,7 +1490,7 @@
 						this.kWhList = response.data.data;
 						
 						if(this.kWhList.length==1){
-							this.utabsone=true
+							
 							var item=this.kWhList[0];
 							this.$refs['refMyEm'+companyId].init({
 								id:item.id,
@@ -1459,20 +1498,31 @@
 								companyId:item.companyId,
 								
 								ref:1,
-							})
+							})
+							setTimeout(()=>{
+								this.$nextTick(()=>{
+									this.utabsone=true
+								})
+							},200)
+							
 						}else{
 							this.getHomePageManage(1)
-							this.getDeviceStatus()
+							
 							this.getAbnormalAlarmRecord();
 						}
 					}else{
-						this.utabsone=true
+						
 						this.kWhListHome= response.data.data;
 						if (!interval) {
 							this.startInterval(); // 组件挂载后开始间隔  
 						}else{
 							this.intervalReady=true
-						}
+						}
+						setTimeout(()=>{
+							this.$nextTick(()=>{
+								this.utabsone=true
+							})
+						},200)
 					}
 					
 				}).catch(error => {
@@ -1481,18 +1531,24 @@
 						icon: "none"
 					})
 				})
+			},
+			getPlatformRevenueBl(){
+				console.log("getPlatformRevenueBl",this.datacompanyInfo)
+				return  this.companyId==''&&this.companyList.length>1&&this.datacompanyInfo.type=='2'
 			},
 			getPlatformRevenue(){
-				if(this.companyId==''&&this.companyList.length>1&&this.datacompanyInfo.type=='2'){
+				if(this.getPlatformRevenueBl()){
 					
 				}else{
 					
 					return
 				}
+				this.getPlatformRevenueReady=false
 				var queryDate =parseUnixTime(new Date(), '{y}-{m}-1');
 				API.platformRevenue({
 					queryDate:queryDate
 				}).then((response) => {
+					this.getPlatformRevenueReady=true
 					this.platformRevenueList=response.data.companyInfoList
 				}).catch(error => {
 					uni.showToast({
@@ -1507,7 +1563,12 @@
 				API.deviceStatus({
 					companyId: this.companyId
 				}).then((response) => {
-					 this.utabsone=true
+					 
+					 setTimeout(()=>{
+					 	this.$nextTick(()=>{
+					 		this.utabsone=true
+					 	})
+					 },200)
 					this.alarmsForm = response.data;
 					if (this.alarmsForm.okNum != 0) {
 						this.alarmsPercent = this.alarmsForm.okNum / (this.alarmsForm.okNum + this.alarmsForm
@@ -1758,7 +1819,8 @@
 			/deep/.u-tab-item:first-child {
 				width: 20% !important;
 				flex: none !important;
-			}
+			}
+			
 		}
 	}
 	// /deep/.u-tab-item2 {
@@ -1812,7 +1874,7 @@
 	// 标签
 	.tabs-box {
 		padding: 32rpx 0;
-		margin-top: 88rpx;
+		margin-top: 66rpx;
 		padding-right: 32rpx;
 		background-color: rgba(22, 119, 255, 1);
 		display: flex;
@@ -2501,6 +2563,9 @@
 	}
 	.electronicMonitoring-title2{
 		margin-bottom: 16rpx;
+	}
+	.electronicMonitoring-title3{
+		
 	}
 	.electronicMonitoring-title{
 		display: flex;

pages/tenantList/contractList.vue

@@ -136,6 +136,7 @@
 				num2:0,
 				num3:0,
 				num4:0,
+				companyId:"",
 				listType: [{
 									name: '全部'
 								}, {
@@ -153,6 +154,9 @@
 			if(op.query){
 				this.selectType=op.query;
 			}
+			if(op.companyId){
+				this.companyId=op.companyId
+			}
 		},
 		onReady() {
 			
@@ -261,7 +265,9 @@
 					title: "加载中",
 					mask: true,
 				})
-				API.tenantContractList().then((response) => {
+				API.tenantContractList({
+					companyId:this.companyId
+				}).then((response) => {
 					uni.hideLoading();
 					this.getTenantListReady=true
 					this.tenantList=response.data.tenantInfoList;

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

@@ -10,8 +10,10 @@
 					 :style="[tabItemStyle(index)]">
 						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
 						{{ item[name] || item['name']}}
+						
+						<view  class="u-tab-bar" :style="[tabBarStyle(index)]"></view>
 					</view>
-					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+					
 				</view>
 			</scroll-view>
 		</view>
@@ -199,31 +201,49 @@
 		computed: {
 			// 移动bar的样式
 			tabBarStyle() {
+			return (i) => {
 				let tabInfo = this.tabQueryInfo[this.currentIndex];
 				var tabWidth =this.barWidth + 'rpx';
 				if (tabInfo&&(this.currentIndex!=0||this.currentIndexBl)) {
 					 tabWidth = (tabInfo.width*2-30)+"rpx";
 					
 				}
+				
 				var scrollBarLeft=this.scrollBarLeft
 				if(this.currentIndexBl){
+					this.$nextTick(() => {
+						
+						this.scrollByIndex();
+					});
+					
 					scrollBarLeft=scrollBarLeft-15
+					if(scrollBarLeft<0){
+						scrollBarLeft=this.scrollBarLeft
+					}
 				}
 				
 				
 				let style = {
-					width: tabWidth,
-					transform: `translate(${scrollBarLeft}px, -100%)`,
+					
+					transform: `translate(0px, -100%)`,
 					// 滑块在页面渲染后第一次滑动时，无需动画效果
 					'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration }s`,
-					'background-color': this.activeColor,
+					
 					height: this.barHeight + 'rpx',
 					opacity: this.barFirstTimeMove ? 0 : 1,
 					// 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现
 					'border-radius': `${this.barHeight / 2}px`
 				};
+				if(i==this.currentIndex){
+					style.backgroundColor= this.activeColor
+					
+				}else{
+					style.backgroundColor= this.bgColor
+				}
 				Object.assign(style, this.barStyle);
 				return style;
+			}
+				
 			},
 			// tab的样式
 			tabItemStyle() {
@@ -387,7 +407,7 @@
 	}
 
 	.u-tab-bar {
-		position: absolute;
+		//position: absolute;
 		bottom: 0;
 	}