zhengkaixin 1 år sedan
förälder
incheckning
b08eb9c6a1
3 ändrade filer med 41 tillägg och 12 borttagningar
  1. 11 1
      apis/pagejs/energyManage.js
  2. 9 3
      components/tree/tree-body.vue
  3. 21 8
      components/tree/tree-node.vue

+ 11 - 1
apis/pagejs/energyManage.js

@@ -87,4 +87,14 @@ export function homePageManageChildMeter(data) {
 		data: data,
 		url: url
 	})
-}
+}
+
+
+export function remoteSwitch(data) {
+	var url='/mobile/energyManage/remoteSwitch';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

+ 9 - 3
components/tree/tree-body.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="meter-statistic"  >
     <tree-node  v-for="(item,i) in meterList"
-	  :ref="'tree-node'+i"
-	   @query="query"
+	  :ref="'tree-node'+i" @switchBtn="switchBtn"
+	   @query="query" :role="role"
 	 :key="i" :node="item" ></tree-node>
   </view>
 </template>
@@ -21,9 +21,15 @@ export default {
 				return [];
 			}
 	},
-  	elderStatus: false
+  	elderStatus: false,
+	role:false,
   },
   methods:{
+	  switchBtn(node,key){
+			
+				this.$emit('switchBtn',node,key)
+				
+	},
 	  toggle(){
 		  // for(var i in this.meterList){
 			 // this.$nextTick(()=>{

+ 21 - 8
components/tree/tree-node.vue

@@ -6,8 +6,14 @@
 		    	<u-icon name="arrow-down" color="#333333"  v-show="!isOpen" size="24"></u-icon>
 		    	
 		    </view>
-		    <view class="icon" v-if="node.level!=0" >
-		    	<img src="@/assets/img/switchIcon.png" alt="" />
+		    <view class="icon icon2" v-if="node.level!=0&&role" >
+		    	<img src="@/assets/img/switchIcon.png"
+				 @click="switchBtn(node,0)"
+				 v-if="node.switchStatus" alt="" />
+				<img src="@/assets/img/switchClose.png" 
+				 @click="switchBtn(node,1)"
+				v-else alt="" />
+				
 		    </view>
 		  <view class="meter-name"  >{{ node.name }}</view>
 		  <view class="meter-state" v-if="node.online">
@@ -31,9 +37,9 @@
 	 </view>
 	
     <view class="sum first-level"  v-if="isOpen && node.childMeterList && node.childMeterList.length > 0">
-      <tree-node @query="query"
+      <tree-node @query="query" :role="role"
         v-for="(child, index) in node.childMeterList"
-        :key="index"
+        :key="index" @switchBtn="switchBtn"
         :node="child"
       ></tree-node>
     </view>
@@ -45,6 +51,7 @@ export default {
   name: 'TreeNode',
   props: {
     node: Object,
+	role:false,
 	
   },
   data() {
@@ -60,6 +67,9 @@ export default {
 	}
   },
   methods: {
+	  switchBtn(node,key){
+		  this.$emit('switchBtn',node,key)
+	  },
 	  toElectronicMonitoring(item) {
 	  	uni.navigateTo({
 	  		url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item
@@ -97,20 +107,23 @@ export default {
 			.meter-name {
 				color: rgba(51, 51, 51, 1);
 				font-size: 32rpx;
-				margin-left: 8rpx;
+				
 				font-weight: bold;
 			}
 
 			.icon {
-				margin-right: 8rpx;
-
+				margin-right: 16rpx;
+				
 				img {
 					width: 40rpx;
 					height: 40rpx;
 					vertical-align: middle;
 				}
 			}
-
+			.icon2 {
+				margin-right: 8rpx;
+				
+			}
 			.meter-state {
 				margin-left: 8rpx;
 				width: 64rpx;