部分水表无视 “不管是否离线”

components/treeWater/tree-node.vue

@@ -31,7 +31,7 @@
 		  </view>
 		  <view class="sum3" v-if="level==0">
 			  <template v-if="1" >
-					<view class="meter-state" v-if="node.online">
+					<view class="meter-state" v-if="node.online||node.transportType == 2">
 											在线
 					 </view>
 					 <view class="meter-state meter-state2" v-else>
@@ -51,7 +51,7 @@
 		<view class="tags" v-if="level!=0">
 			<view class="tagsList">
 				<template  v-if="1" >
-					<view class="meter-state" v-if="node.online">
+					<view class="meter-state" v-if="node.online||node.transportType == 2">
 									在线
 					</view>
 					<view class="meter-state meter-state2" v-else>

config/.env.dev.js

@@ -20,7 +20,7 @@ const UNI_APP = {
 	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //wky
 	
-	openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//杨所
+	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//杨所
 	
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//fjj
 	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq

pages/equipmentDataMonitoring/equipmentElectricityWater.vue

@@ -76,13 +76,14 @@
 							{{item.installationAddressSimple}}
 						</view>
 
-						<view class="state" v-if="!item.online">
-							<view class="dot off-line"></view>
-							<view class="text">离线</view>
-						</view>
-						<view class="state state2" v-else>
+						
+						<view class="state state2"  v-if="item.online||item.transportType == 2" >
 							<view class="dot on-line"></view>
 							<view class="text">在线</view>
+						</view>
+						<view class="state" v-else>
+							<view class="dot off-line"></view>
+							<view class="text">离线</view>
 						</view>
 					</view>
 					<view class="electricity">

pages/equipmentInformation/equipmentConditionMonitoring.vue

@@ -80,11 +80,11 @@
 						</view>
 						
 						<view class="item-state">
-							<view class="dot" :class="item.online ? 'on-line' : 'off-line'">
+							<view class="dot" :class="item.online ||item.transportType == 2 ? 'on-line' : 'off-line'">
 
 							</view>
 							<view class="text">
-								{{item.online ? '在线' : '离线'}}
+								{{item.online ||item.transportType == 2 ? '在线' : '离线'}}
 							</view>
 							<view class="more">
 								<u-icon name="arrow-right" size="24" color="#acacac"></u-icon>

pages/statistics/statistics.vue

@@ -910,15 +910,16 @@
 			
 			
 			
-									<view class="state" v-if="!item.online">
-										<!-- <view class="dot off-line"></view> -->
-										<view class="text">离线</view>
-									</view>
+									
 			
-									<view class="state state2" v-else>
+									<view class="state state2" v-if="item.online||item.transportType == 2">
 										<!-- <view class="dot on-line"></view> -->
 										<view class="text">在线</view>
 									</view>
+									<view class="state" v-else>
+										<!-- <view class="dot off-line"></view> -->
+										<view class="text">离线</view>
+									</view>
 			
 								</view>
 								<view class="electricity">