heyang

api/request/config.js

@@ -14,18 +14,5 @@ const config = {
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
       // base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
-
-	//视频地址
-	video_url:'https://lab.sxitdlc.com',
-
-	//MQTT
-	//mqtt_url :'192.168.1.43:1883', //43MQTT
-	// mqtt_url: 'lab.sxitdlc.com/nhmqtt', //矿大MQTT
-	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //交大MQTT
-	   mqtt_url:'192.168.1.43:1883',
-	// mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
-	 //mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
-    username: 'mqtt',
-    password: 'mqtt@zd1883',
 }
 export { config }

pages/alarmInfo/alarmInfo.vue

@@ -63,7 +63,7 @@
 				</view>
 				<view class="broadcast_m">
 					<view class="broadcast_m_t" :class="liveType?'broadcast_m_t_back_a':'broadcast_m_t_back_b'" @longpress.stop="recordButton" @touchmove.stop="cancelButton"  @touchend.stop="sendButton">
-						
+
 						{{liveType?'松开发送':'按住说话'}}
 					</view>
 					<view class="broadcast_m_b" v-if="!liveType">按住说话，录入广播内容</view>
@@ -71,9 +71,9 @@
 				</view>
 			</view>
 		</view>
-		
+
 	</view>
-	
+
 </template>
 
 <script>
@@ -83,7 +83,7 @@
         data() {
             return {
 				form:{
-				
+
 				},
 				broadcastType:false,
 				//喇叭数据
@@ -100,7 +100,7 @@
 			this.getDeviceList()
         },
         onShow(){
-			
+
         },
 		methods:{
 			MonitorBtn(){
@@ -129,6 +129,16 @@
 			//点击选择喇叭
 			trumpetClick(index){
 				this.trumpetList[index].type = !this.trumpetList[index].type
+        let _this=this;
+        if(_this.trumpetList[index].type==true){
+          _this.trumpetList.forEach(function(item2) {
+            if(item2.deviceSn==_this.trumpetList[index].deviceSn){
+              item2.type=true
+            }else{
+              item2.type=false
+            }
+          })
+        }
 			},
 			//录制
 			recordButton(e){
@@ -213,7 +223,7 @@
 				let num = 0;
 				for(let i=0;i<self.trumpetList.length;i++){
 					if(self.trumpetList[i].type){
-			
+
 						num++
 					}
 				}
@@ -265,9 +275,9 @@
 					});
 				}
 			},
-			
+
 		}
-        
+
 	}
 </script>
 
@@ -309,7 +319,7 @@
 					line-height: 28rpx;
 				}
 			}
-			.alarm_t_b{ 
+			.alarm_t_b{
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -368,7 +378,7 @@
 					}
 				}
 			}
-			
+
 		}
 		.alarm_b{
 			width: 650rpx;
@@ -388,14 +398,14 @@
 				height: 100rpx;
 				background: linear-gradient(-45deg, #FA9901, #F28E26);
 				border-radius: 50rpx 0px 0px 50rpx;
-				
+
 			}
 			.alarm_b_r{
 				width: 325rpx;
 				height: 100rpx;
 				background: linear-gradient(-35deg, #309CFF, #0183FA);
 				border-radius: 0px 50rpx 50rpx 0px;
-				
+
 			}
 		}
 		.shade-max-big-box{
@@ -461,7 +471,7 @@
 								margin :12rpx 20rpx 0 25rpx;
 							}
 						}
-		
+
 						.trumpet-color-a{
 							border:1px solid #0183FA;
 							color:#0183FA;
@@ -487,7 +497,7 @@
 								width: 142rpx;
 								height: 142rpx;
 								position :absolute;
-		
+
 							}
 							>label{
 								width :100%;
@@ -544,9 +554,9 @@
 					}
 				}
 			}
-				
+
 	}
-	
+
 	/deep/.input-value-border{
 		display :none !important;
 	}

pages/emergencyEvacuationBig.vue

@@ -465,6 +465,16 @@
 			//点击选择喇叭
 			trumpetClick(index){
 				this.trumpetList[index].type = !this.trumpetList[index].type
+        let _this=this;
+        if(_this.trumpetList[index].type==true){
+          _this.trumpetList.forEach(function(item2) {
+            if(item2.deviceSn==_this.trumpetList[index].deviceSn){
+              item2.type=true
+            }else{
+              item2.type=false
+            }
+          })
+        }
 			},
 			//录制
 			recordButton(e){

pages_manage/gasApply/awaitStorage.vue

@@ -34,7 +34,7 @@
 			<view class="register_li_min">
 				<view>*</view>
 				<view>气表压力：</view>
-				<input v-model="form.gasPressure"   type="text" placeholder-style="color:#999;" placeholder="请输入气表压力">
+				<input v-model="form.gasPressure" maxlength="4"  type="text" placeholder-style="color:#999;" placeholder="请输入气表压力">
 			</view>
 			<!-- 检验有效期 -->
 			<view class="register_li_min2">

pages_manage/workbench/laboratory/monitor.vue

@@ -42,7 +42,7 @@
         </view>
         <view class="broadcast_m">
           <view class="broadcast_m_t" :class="liveType?'broadcast_m_t_back_a':'broadcast_m_t_back_b'" @longpress.stop="recordButton" @touchmove.stop="cancelButton"  @touchend.stop="sendButton">
-        
+
             {{liveType?'松开发送':'按住说话'}}
           </view>
           <view class="broadcast_m_b" v-if="!liveType">按住说话，录入广播内容</view>
@@ -155,6 +155,16 @@ export default {
     //点击选择喇叭
     trumpetClick(index){
       this.trumpetList[index].type = !this.trumpetList[index].type
+      let _this=this;
+      if(_this.trumpetList[index].type==true){
+        _this.trumpetList.forEach(function(item2) {
+          if(item2.deviceSn==_this.trumpetList[index].deviceSn){
+            item2.type=true
+          }else{
+            item2.type=false
+          }
+        })
+	    }
     },
     //录制
     recordButton(e){

pages_student/gasApply/awaitStorage.vue

@@ -34,7 +34,7 @@
 			<view class="register_li_min">
 				<view>*</view>
 				<view>气表压力：</view>
-				<input v-model="form.gasPressure"   type="text" placeholder-style="color:#999;" placeholder="请输入气表压力">
+				<input v-model="form.gasPressure" maxlength="4"  type="text" placeholder-style="color:#999;" placeholder="请输入气表压力">
 			</view>
 			<!-- 检验有效期 -->
 			<view class="register_li_min2">