预计显示

apis/pagejs/energyManage.js

@@ -11,6 +11,16 @@ export function deviceStatus(data) {
 }
 
 
+export function platformRevenue(data) {
+	var url='mobile/energyManage/platformRevenue';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
 export function findMeterList(data) {
 	var url='/mobile/employee/findMeterList';
 	return request({

components/tree/tree-body.vue

@@ -5,7 +5,7 @@
     <tree-node  v-for="(item,i) in meterList"
 	  :ref="'tree-node'+i" @switchBtn="switchBtn"
 	   @query="query" :role="role" :level="meterList.length==1?0:1" :showPark="showPark"
-	 :key="i" :node="item" ></tree-node>
+	 :key="i" :node="item" :rootnode="item" ></tree-node>
 	  </view>
   </view>
 </template>

components/tree/tree-node.vue

@@ -28,7 +28,7 @@
 			  </view>
 		  </view>
 		  <view class="sum3" v-if="level==0&&showPark">
-			  <template >
+			  <template v-if="rootnode.supplyType=='1'" >
 					<view class="meter-state" v-if="node.online">
 											在线
 					 </view>
@@ -36,11 +36,14 @@
 											离线
 					</view>
 			  </template>
-			  <view class="meter-state meter-state2" v-if="node.id=='1d462ffc-b8ae-4018-bab7-9a80b0a20674'">
+			  <view class="meter-state  supplyType1" v-if="rootnode.supplyType=='1'">
 			  			转供电
 			   </view>
+			   <view class="meter-state  supplyType2" v-if="rootnode.supplyType=='2'">
+			   			直供电
+			    </view>
 		  </view>
-		 <view class="sum2" v-if="node.level==0&& node.childMeterList && node.childMeterList.length > 0&&showPark" >
+		 <view class="sum2" v-if="rootnode.supplyType=='1'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0&&showPark" >
 			<view class="title">
 				一级表计电量
 			</view>
@@ -49,6 +52,17 @@
 					
 			</view>
 		 </view>
+		 <view class="sum2" v-if="rootnode.supplyType=='2'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0&&showPark" >
+		 			<view class="title">
+		 				代缴费用户合计电量
+
+		 			</view>
+		 			<view class="value" >
+		 				{{node.replaceKwh}}度
+		 					
+		 			</view>
+		 </view>
+		 
 		<view class="tags" v-if="level!=0">
 			<view class="tagsList">
 				<view class="meter-state" v-if="node.online">
@@ -57,6 +71,9 @@
 				<view class="meter-state meter-state2" v-else>
 								离线
 				</view>
+				<view class="meter-state " v-if="rootnode.supplyType=='2'"
+				 :class="'paymentMode'+node.paymentMode" >{{node.paymentMode==1?'代缴费':''}}{{node.paymentMode==2?'自缴费':''}}</view>
+				
 				<view class="meter-state"
 				 :style="{
 					 borderColor:colorList[node.type%7],
@@ -108,7 +125,7 @@
       <tree-node @query="query" :role="role"
         v-for="(child, index) in node.childMeterList"
         :key="index" @switchBtn="switchBtn" :level="level+1"
-        :node="child"
+        :node="child" :rootnode="rootnode"
       ></tree-node>
     </view>
   </view>
@@ -122,6 +139,7 @@ export default {
 	role:false,
 	level:0,
 	showPark:false,
+	 rootnode: Object, //根节点
 	
   },
   data() {
@@ -246,7 +264,23 @@ export default {
 				border: 1px solid rgba(255, 123, 0, 1);
 				color: rgba(255, 123, 0, 1);
 			}
-
+			.paymentMode1{
+				color: rgba(255,255,255,1);
+				background-color:  rgba(22,119,255,1);
+				border: 1px solid  rgba(22,119,255,1);
+			}
+			.paymentMode2{
+				color: rgba(255,255,255,1);
+				background-color: rgba(129,97,255,1);
+				border: 1px solid rgba(129,97,255,1);
+			}
+			.supplyType1{
+				border: 1px solid rgba(255, 123, 0, 1);
+				color: rgba(255, 123, 0, 1);
+			}
+			.supplyType2{
+				
+			}
 			.meter-number {
 				margin-left: auto;
 				color: rgba(51, 51, 51, 1);

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
 	

pages/statistics/statistics.vue

@@ -207,7 +207,7 @@
 				</view>
 			</view>
 			
-			<view class=""  v-show="companyId==''&&companyList.length>1&&0&&datacompanyInfo.type=='2'">
+			<view class=""  v-show="companyId==''&&companyList.length>1&&datacompanyInfo.type=='2'">
 				<!-- 电表运行情况 -->
 				<view class="statistics-1 statistics statistics-3" >
 					<view class="title">
@@ -219,26 +219,21 @@
 						</view>
 					
 					</view>
-					<view class=" contractList">
-						<view class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=1')">
-							<view class="contractListClass1">
-								<view class="class1">荆鹏软件园</view>
-								<view class="class2">6月预计收入</view>
-							</view>
-							<view  class="contractListClass2">
-								231231<u-icon name="arrow-right" style="margin-left: 12rpx;" size="24" color="#838383"></u-icon>
-							</view>
-						</view>
-						<view class="contractListClass" @click="gotoUrl('/pages/tenantList/contractList?query=1')">
+					<view class=" contractList" >
+						<!-- @click="gotoUrl('/pages/tenantList/contractList?query=1')" -->
+						<view class="contractListClass"  v-for="(item,i) in platformRevenueList" :key="i"
+						>
 							<view class="contractListClass1">
-								<view class="class1">荆鹏软件园</view>
-								<view class="class2">6月预计收入</view>
+								<view class="class1">{{item.name}}</view>
+								<view class="class2">{{month}}月预计收入</view>
 							</view>
 							<view  class="contractListClass2">
-								2312313<u-icon name="arrow-right" style="margin-left: 12rpx;" size="24" color="#838383"></u-icon>
+								{{item.incomeFee}}
+								<u-icon name="arrow-right" v-if="0" style="margin-left: 12rpx;" size="24" color="#838383"></u-icon>
 							</view>
 						</view>
 						
+						
 					</view>
 				</view>
 			</view>
@@ -373,32 +368,45 @@
 							</view>
 					</view>
 					<view class="incomeExpenditureClass" v-show="companyType!=4&&homePageManageObj.showPark" >
-						<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">
-								{{incomeExpenditureObj.expenditureFee}}
-								<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 class="incomeRow" >
+							<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">
+									{{incomeExpenditureObj.expenditureFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
+						</view>
+						<view class="incomeRow" >
+							<view class="income1">
+								<view  class="income11">
+									收支情况 (元)
+								</view>
+								<view   class="income12" :style="incomeExpenditureObj.differenceFee>=0?'color:red':'color:#52b8aa'">
+									{{incomeExpenditureObj.differenceFee>0?'+':''}}{{incomeExpenditureObj.differenceFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
+							<view class="income1">
+								<view  class="income11">
+									节约电费 (元)
+								</view>
+								<view   class="income12" style="color:#52b8aa">
+									{{incomeExpenditureObj.saveFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
 						</view>
 					
 					</view>
@@ -735,14 +743,16 @@
 				tenantListNum3:0,
 				childList:[],
 				childInfo:{},
-				companyInfo:{},
+				companyInfo:{},
+				month:0,
+				platformRevenueList:[],
 			}
 		},
 		onLoad() {
 			var date = new Date();
 			var year = date.getFullYear();
 			var month = date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
-			 
+			 this.month=date.getMonth() + 1
 			this.endYear = new Date().getFullYear();
 			this.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
 		 
@@ -1144,7 +1154,7 @@
 				}else{
 					this.kWhList=[]
 					this.getDeviceStatus()
-					
+					this.getPlatformRevenue()
 					
 				}
 				
@@ -1472,7 +1482,25 @@
 					})
 				})
 			},
-
+			getPlatformRevenue(){
+				if(this.companyId==''&&this.companyList.length>1&&this.datacompanyInfo.type=='2'){
+					
+				}else{
+					
+					return
+				}
+				var queryDate =parseUnixTime(new Date(), '{y}-{m}-1');
+				API.platformRevenue({
+					queryDate:queryDate
+				}).then((response) => {
+					this.platformRevenueList=response.data.companyInfoList
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			// 累计报警
 			getDeviceStatus() {
 				 
@@ -1636,10 +1664,13 @@
 
 <style lang="scss" scoped>
 	.incomeExpenditureClass{
-		    display: flex;
-		    justify-content: space-evenly;
+		   
 		    width: 100%;
-			padding:16rpx 0;
+			padding:16rpx 0;
+			.incomeRow{
+				display: flex;
+				justify-content: space-evenly;
+			}
 			.income1:last-child{
 				.income11,.income12{
 					    border-right: 1px solid #c5c3c3;
@@ -1652,7 +1683,7 @@
 				font-size: 24rpx;
 					color:#c5c3c3;
 			}
-			    width: 33.33%;
+			    width: 50%;
 			 text-align: center;
 			.income11{
 				padding:12rpx 0;