zc

App.vue

@@ -162,7 +162,7 @@
                 // 收到消息
                 this.client.on('message', (topic, message) => {
                     let data = JSON.parse(message)
-					console.log('消息message',data);
+					// console.log('消息message',data);
 					if(data){
 						if(topic == 'lab/exit/line'){
 							// console.log("应急",data);

pages/manageWorkbench.vue

@@ -117,6 +117,14 @@
           <img src="@/images/icon_14.png">
           <view>{{item.subAddrrStr}}</view>
         </view>
+		<view class="text-box" v-if="item.sensorFunctionList[0]">
+			<view class="min-box" v-for="(minItem,index2) in item.sensorFunctionList" :key="index2">
+				<view class="min-min-box">
+					<img v-show="minItem.hasWarn" src="@/images/icon_15.png">
+					<view :class="{'colorA':minItem.hasWarn}">{{minItem.funcName}}：{{minItem.formatVal?minItem.formatVal:'-'}}</view>
+				</view>
+			</view>
+		</view>
       </view>
     </view>
     <tab-bar></tab-bar>
@@ -175,8 +183,9 @@ export default {
     this.getGrading();
     //监听报警信息
     getApp().watch(this.getSafeWarnList,'mqttAlarmData');
+		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
     //监听传感器信息
-    getApp().watch(this.getMqttSensorData,'mqttSensorData');
+    // getApp().watch(this.getMqttSensorData,'mqttSensorData');
   },
   methods: {
     //跳转选择器
@@ -351,9 +360,6 @@ export default {
 			type:"lab/function/data",
 			idList:[],
 		}
-		let objOne = {
-			type:"lab/bigview",
-		}
 		for(let i=0;i<self.dataList.length;i++){
 			let num = 0;
 			for(let o=0;o<obj.idList.length;o++){
@@ -365,8 +371,8 @@ export default {
 				obj.idList.push(self.dataList[i].id)
 			}
 		}
-		list.push(obj);
-		list.push(objOne);
+		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
+		// list.push(obj);
 		list.push({type:"lab/bigview",});
 		list.push({type:"lab/exit/line",});
 		getApp().appMqttOn(1,list);
@@ -913,7 +919,7 @@ export default {
       .text-box{
         /*border-top:1rpx dashed #e0e0e0;*/
         border-top:1rpx solid #E0E0E0;
-        padding:0 20rpx;
+        padding:20rpx 20rpx 0;
         /*
                   overflow-x:scroll;
                   overflow-y:hidden;
@@ -922,7 +928,7 @@ export default {
         .min-box{
           display inline-block
           /*padding:0 30rpx 0 10rpx;*/
-          width:355rpx;
+          width:335rpx;
           .min-min-box{
             display: flex
             img{

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -21,7 +21,7 @@
         <view class="min-box" v-for="(minItem,index2) in itemData.sensorFunctionList" :key="index2">
           <view class="min-min-box">
             <img v-show="minItem.hasWarn" src="@/images/icon_15.png">
-            <view :class="{'colorA':minItem.hasWarn}">{{minItem.describe}}：{{minItem.formatVal?minItem.formatVal:'-'}}</view>
+            <view :class="{'colorA':minItem.hasWarn}">{{minItem.funcName}}：{{minItem.formatVal?minItem.formatVal:'-'}}</view>
           </view>
         </view>
       </view>
@@ -219,8 +219,25 @@ export default {
       // //监听设备信息
       getApp().watch(this.getMqttDeviceData,'mqttDeviceData')
     }
+	this.mqttInfo()
   },
   methods: {
+	//详情页面MQTT
+	mqttInfo(){
+		let list = [];
+		let obj = {
+			type:"lab/function/data",
+			idList:[this.itemData.id],
+		}
+		let objOne = {
+			type:"lab/hardware/data",
+			idList:[this.itemData.id],
+		}
+		list.push(obj);
+		list.push(objOne);
+		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
+		getApp().appMqttOn(1,list);
+	},
     //查询详情
     async laboratoryInfo(){
       let self = this;

pages_manage/workbench/laboratory/meLaboratory.vue

@@ -40,6 +40,14 @@
                     <img src="@/images/icon_14.png">
                     <view>{{item.subAddrrStr}}</view>
                 </view>
+				<view class="text-box" v-if="item.sensorFunctionList[0]">
+					<view class="min-box" v-for="(minItem,index2) in item.sensorFunctionList" :key="index2">
+						<view class="min-min-box">
+							<img v-show="minItem.hasWarn" src="@/images/icon_15.png">
+							<view :class="{'colorA':minItem.hasWarn}">{{minItem.funcName}}：{{minItem.formatVal?minItem.formatVal:'-'}}</view>
+						</view>
+					</view>
+				</view>
             </view>
         </view>
     </view>
@@ -83,8 +91,9 @@
         onShow(){
             this.listDepartments();
             this.subject_class();
+		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
             //监听传感器信息
-            getApp().watch(this.getMqttSensorData,'mqttSensorData')
+            // getApp().watch(this.getMqttSensorData,'mqttSensorData')
         },
         methods: {
             //监听传感器信息
@@ -265,8 +274,8 @@
 					list.push(obj);
 					list.push(objOne);
 					this.$set(self,'mqttIdList',list);
-					getApp().appMqttOn(1,list);
-					// self.subscriptionMQTT();
+					// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
+					// getApp().appMqttOn(1,list);
                 }
             },
         },
@@ -424,7 +433,7 @@
                 .text-box{
                     /*border-top:1rpx dashed #e0e0e0;*/
                     border-top:1rpx solid #E0E0E0;
-                    padding:0 20rpx;
+                    padding:20rpx 20rpx;
                     /*
                     overflow-x:scroll;
                     overflow-y:hidden;
@@ -433,7 +442,7 @@
                     .min-box{
                         display inline-block
                         /*padding:0 30rpx 0 10rpx;*/
-                        width:355rpx;
+                        width:335rpx;
                         .min-min-box{
                             display: flex
                             img{