Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-manage

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" :rootnode="item" ></tree-node>
+	 :key="i" :node="item" :childInfo="childInfo" :rootnode="item" ></tree-node>
 	  </view>
   </view>
 </template>
@@ -24,6 +24,7 @@ export default {
 				return [];
 			}
 	},
+	childInfo: Object, //公司属性
   	elderStatus: false,
 	role:false,
 	showPark:false,

components/tree/tree-node.vue

@@ -19,10 +19,12 @@
 			   @click="toggle" >{{replaceLastTwoWords( node.name )}}</view>
 			 
 			
-			  <view class="meter-number" v-if="(node.level==0&&showPark)||node.level!=0" @click="toElectronicMonitoring(node)">
+			  <view class="meter-number" v-if="(node.level==0&&showPark)||node.level!=0"
+			   :style="node.type==6?'padding-right: 36rpx;':''"
+			   @click="toElectronicMonitoring(node)">
 				{{node.kwh}}度
-				<u-icon name="arrow-right" color="#fcfafa"  v-if="node.type==6" size="24"></u-icon>
-				<u-icon name="arrow-right" v-else
+				
+				<u-icon name="arrow-right" v-if="node.type!=6"
 				color="#d4d4d4" size="24"></u-icon>
 				
 			  </view>
@@ -43,7 +45,7 @@
 			   			直供电
 			    </view>
 		  </view>
-		 <view class="sum2" v-if="rootnode.supplyType=='1'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0" >
+		 <view class="sum2" v-if="childInfo.styleTemplate=='1'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0" >
 			<view class="title">
 				一级表计电量
 			</view>
@@ -52,7 +54,7 @@
 					
 			</view>
 		 </view>
-		 <view class="sum2" v-if="rootnode.supplyType=='2'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0" >
+		 <view class="sum2" v-if="childInfo.styleTemplate=='2'&&node.level==0&& node.childMeterList && node.childMeterList.length > 0" >
 		 			<view class="title">
 		 				代缴费用户合计电量
 
@@ -71,7 +73,7 @@
 				<view class="meter-state meter-state2" v-else>
 								离线
 				</view>
-				<view class="meter-state " v-if="rootnode.supplyType=='2'"
+				<view class="meter-state " v-if="childInfo.styleTemplate=='2'"
 				 :class="'paymentMode'+node.paymentMode" >{{node.paymentMode==1?'代缴费':''}}{{node.paymentMode==2?'自缴费':''}}</view>
 				
 				<view class="meter-state"
@@ -100,15 +102,9 @@
 					
 					
 				</view>
-				<view v-if="node.type==6&&!node.tag" class="meter-state"
-				 :style="{
-					  borderColor:colorList[node.manyType%7],
-				 	background:colorList[node.manyType%7],
-				 	color:'#fff',
-				 }">
-					{{node.manyTypeN}}
-				</view>
-				<view v-if="node.tag" class="meter-state" v-for="(item ,i)	in  getTags(node.tag)"
+				
+				<view v-if="node.tag" class="meter-state" v-for="(item ,i)	in  getTags(node.tag)"
+				 :key="i"
 				 :style="{
 					  borderColor:item.color,
 				 	background:item.color,
@@ -133,7 +129,7 @@
       <tree-node @query="query" :role="role"
         v-for="(child, index) in node.childMeterList"
         :key="index" @switchBtn="switchBtn" :level="level+1"
-        :node="child" :rootnode="rootnode"
+        :node="child" :rootnode="rootnode" :childInfo="childInfo"
       ></tree-node>
     </view>
   </view>
@@ -148,6 +144,7 @@ export default {
 	level:0,
 	showPark:false,
 	 rootnode: Object, //根节点
+	  childInfo: Object, //公司属性
 	
   },
   data() {
@@ -427,6 +424,8 @@ export default {
 			.meter-name,.meter-number,/deep/.u-iconfont,.title,.value{
 				color:#fff !important;
 			}
+			
+			
 		}
 		.first-level-node0{
 			padding-left: 16rpx;

pages/statistics/statistics.vue

@@ -396,7 +396,7 @@
 								指定时间：{{tabsFrom.show2Text}}
 							</view>
 					</view>
-					<view class="incomeExpenditureClass" v-show="childInfo.type!=4" >
+					<view class="incomeExpenditureClass" v-show="incomeExpenditureBl" >
 						<view class="incomeRow" >
 							<view class="income1">
 								<view  class="income11">
@@ -439,7 +439,7 @@
 						</view>
 					
 					</view>
-					<view class="chat-box" id="barEcharts-statistics" v-show="childInfo.type!=4">
+					<view class="chat-box" id="barEcharts-statistics" v-show="incomeExpenditureBl">
 
 					</view>
 				</view>
@@ -459,7 +459,8 @@
 				
 				<!-- 电表统计 -->
 				<Tree-Body :meterList="meterList" ref="mytree"
-				:showPark="homePageManageObj.showPark"
+				:showPark="homePageManageObj.showPark"
+				:childInfo="childInfo"
 				 @query="getHomePageManageChildMeter"
 				 v-if="getHomePageManageReady"
 				 :role="codes&&codes.indexOf('switch')!=-1"
@@ -819,6 +820,9 @@
 			}
 		},
 		computed:{
+			incomeExpenditureBl(){
+				return this.childInfo.type!=4&&(this.childInfo.styleTemplate==1)
+			},
 			childListName(){
 				return this.childInfo.name;
 			},
@@ -1423,7 +1427,7 @@
 					//console.log(this.meterList)
 					this.homePageManageObj = response.data;
 					//this.$forceUpdate()
-					if(this.childInfo.type!=4){
+					if(this.incomeExpenditureBl){
 						//&&this.homePageManageObj.showPark
 						this.myBarChart=null;
 						this.$nextTick(()=>{