超时报警修改

index1.html

@@ -157,7 +157,7 @@
 						username: 'ulocClient',
 						password: "QcoY2JE0yxDvOadKWeDHKmTXm2LFl1zEcBu0mzMy8UHnHCB5LRMJFG9oY3zfUii0ACIN6uSaHyltCyYk5v1SUs505dtWkq0P/+XRE/Lq6xGrcfAHjWjySU3cLhvjZw3lUB4KtuvJY8UaOrx4+v9+FFQ6CUr2Zh+oz2m4bljoZdE="
 					};
-					fetch('http://127.0.0.1:8180/stage-api/auth/login',
+					fetch('http://192.168.0.114:8180/stage-api/auth/login',
 							{method: 'POST',
 								headers: {
 									'Content-Type': 'application/json' // 指定发送的数据类型
@@ -178,7 +178,7 @@
 						username: 'ulocClient',
 						password: "QcoY2JE0yxDvOadKWeDHKmTXm2LFl1zEcBu0mzMy8UHnHCB5LRMJFG9oY3zfUii0ACIN6uSaHyltCyYk5v1SUs505dtWkq0P/+XRE/Lq6xGrcfAHjWjySU3cLhvjZw3lUB4KtuvJY8UaOrx4+v9+FFQ6CUr2Zh+oz2m4bljoZdE="
 					};*/
-					fetch('http://127.0.0.1:8180/stage-api/auth/refresh',
+					fetch('http://192.168.0.114:8180/stage-api/auth/refresh',
 							{method: 'POST'})
 							.then(response => response.json())
 							.then(data => {
@@ -188,7 +188,7 @@
 							.catch(error => console.error('Error:', error));
 				},
 				getSite(){
-					fetch('http://127.0.0.1:8180/stage-api/base/site/selectListSite',
+					fetch('http://192.168.0.114:8180/stage-api/base/site/selectListSite',
 							{method: 'GET', headers: {'Authorization': 'Bearer_'+localStorage.getItem("_token")}})
 							.then(response => response.json())
 							.then(data => {
@@ -206,17 +206,18 @@
 					function initUlocWebsocketFunc() {
 						// 生产工位websocket
 						// 初始化
-						const ws = new WebSocket('ws://127.0.0.1:10001/order/ulocScreen/' + codeDianshi);
+						const ws = new WebSocket('ws://192.168.0.114:10001/order/ulocScreen/' + codeDianshi);
             //站点id传给凿检屏
             var _siteId={
               type:'siteId',
               siteId: codeDianshi
             }
             iframe3.postMessage(JSON.stringify(_siteId), '*');
+            iframe2.postMessage(JSON.stringify(_siteId), '*');
 						//监听是否连接成功
 						ws.onopen = function () {
 							wsState = ws.readyState
-							// console.log('ws连接状态：' + ws.readyState);
+							console.log('ws连接状态：' + ws.readyState);
 							var _json1={
 								type:'conStatusChange',
 								newStatus:false
@@ -227,7 +228,7 @@
 						}
 						// 接听服务器发回的信息并处理展示
 						ws.onmessage = function (option = {}) {
-							// console.log('ws收到消息');
+							console.log('ws收到消息');
 							// console.log('ws连接状态：' + ws.readyState);
 							wsState = ws.readyState
 
@@ -242,7 +243,7 @@
 						ws.onclose = function () {
 							wsState = ws.readyState
 							// 监听整个过程中websocket的状态
-							// console.log('ws连接关闭状态：' + ws.readyState);
+							console.log('ws连接关闭状态：' + ws.readyState);
 							var _json1={
 								type:'conStatusChange',
 								newStatus:true
@@ -253,6 +254,7 @@
 						}
 						// 监听并处理error事件
 						ws.onerror = function (error) {
+							console.log('ws连接报错状态：' +error);
 							wsState = ws.readyState
 							var _json1={
 								type:'conStatusChange',
@@ -268,7 +270,7 @@
 					function initBroadcastWebsocketFunc() {
 						// 公告消息websocket
 						// 初始化
-						const broadcastWs = new WebSocket('ws://127.0.0.1:10001/base/ulocBroadcastWebsocket/' + codeDianshi);
+						const broadcastWs = new WebSocket('ws://192.168.0.114:10001/base/ulocBroadcastWebsocket/' + codeDianshi);
 						//监听是否连接成功
 						broadcastWs.onopen = function () {
 							bwsState = broadcastWs.readyState;
@@ -449,11 +451,11 @@
 				}
 			}
 		})
-		$(document).ready(function() {
+		/*$(document).ready(function() {
 
 
 
-		});
+		});*/
 
 	</script>
 

js/page2.js

@@ -143,15 +143,15 @@
 
 
 // 小时产量
-function EchartsB5(){
+function EchartsB5(tmBasSiteId){
     var myChart = echarts.init(document.getElementById('echart_b5'));
-	var siteId="333333";
+	var siteId=tmBasSiteId;
 	var data1=['8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:00','20:00','21:00','22:00','23:00','24:00','1:00','2:00','3:00','4:00','5:00','6:00','7:00']; // x轴
 	var data2=[15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15];  // 柱状图数据
 	var data4=[10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10];  // 折线
 
 	$.ajax({
-		url: 'http://127.0.0.1:8180/stage-api/order/orderSn/siteHourReport/'+siteId,
+		url: 'http://192.168.0.114:8180/stage-api/order/orderSn/siteHourReport/'+siteId,
 		type: 'GET',
 		headers: {
 			'Authorization': 'Bearer_'+localStorage.getItem("_token")
@@ -258,7 +258,7 @@ function EchartsB5(){
 						// 	return value + ' ml';
 						//   }
 						// },
-						label:{ show: true, position: "top", distance: -35, fontSize: 22, color: '#fff', lineHeight: 22, fontFamily: 'DIN-Medium',
+						label:{ show: true, position: "top", distance: 5, fontSize: 22, color: '#fff', lineHeight: 22, fontFamily: 'DIN-Medium',
 							// formatter: function(value){
 							//     return value.data +'%'
 							// },
@@ -279,7 +279,7 @@ function EchartsB5(){
 						// 	return value + ' ml';
 						//   }
 						// },
-						label:{ show: true, position: "top", distance: -35, fontSize: 22, color: '#fff', lineHeight: 22, fontFamily: 'DIN-Medium',
+						label:{ show: true, position: "top", distance: 5, fontSize: 22, color: '#fff', lineHeight: 22, fontFamily: 'DIN-Medium',
 							// formatter: function(value){
 							//     return value.data +'%'
 							// },

page1.html

@@ -97,12 +97,23 @@
 						<span class="box-tittle-text">计时</span>
 					</div>
 					<div class="ibox_m" id="is-null-text-4">
+						<div id="warningNode" style="display:none;"><!-- 自定义音频控件 -->
+<!--							<button class="alarm-bell" id="alarmBell"></button>-->
+							<!-- 自定义按钮 -->
+							<button class="button" onclick="handPlayAudio()">超时</button>
+							<button class="button" onclick="handPauseAudio()">暂停</button>
+							<audio id="myAudio" style="display:none;">
+								<source src="waring.mp3" type="audio/mp3">
+								Your browser does not support the audio element.
+							</audio>
+						</div>
 						<div class="text-33">
 							<span id="stopwatch"></span>
 							<b id="stopwatch_s"></b>
 						</div>
 					</div>
 
+
 				</div>
 
 				<div class="main_t ul-index2">
@@ -172,7 +183,21 @@
 
 <script>
   let timer = null;
+  let handStop = false;
+  // 获取audio元素和自定义控件
+  var audio = document.getElementById('myAudio');
+  // var alarmBell = document.getElementById('alarmBell');
+
   $(document).ready(function () {
+	  // 给自定义控件添加点击事件，触发播放
+	 /* alarmBell.addEventListener('click', function() {
+		  handPlayAudio();
+	  });*/
+	  // 获取audio元素
+	  audio.onended = function() {
+		  // 可以在这里添加代码，比如自动播放下一个音频等
+		  console.log("Audio has ended!");
+	  };
 
 	  window.addEventListener('message', function(event={}) {
 		  const _data=JSON.parse( (event.data||"{}") )
@@ -216,7 +241,7 @@
           $("#stopwatch_s").css("color", "white");
 				  // 定义计时器开始的时间
 				  var startTime = new Date().getTime();
-
+				  warnFlag=false;
 				  function updateStopwatch() {
 					  // 获取当前时间
 					  var currentTime = new Date().getTime();
@@ -234,6 +259,13 @@
 					  if (seconds >= _data.message.jph) {
 						  $("#stopwatch").css("color", "red");
 						  $("#stopwatch_s").css("color", "red");
+						  //播放超时报警声音
+						  if(!handStop){
+							  console.log('播放音频')
+							  playAudio();
+							  $("#warningNode").css("display", "block");
+						  }
+
 					  }
 				  }
 
@@ -282,7 +314,27 @@
 // 初始时关闭提示
 	  closeAlert();
   });
+  // 播放音频
+  function playAudio() {
 
+	  audio.play();
+  }
+  // 播放音频
+  function handPlayAudio() {
+	  handStop=false;
+	  audio.play();
+  }
+
+  // 暂停音频
+  function pauseAudio() {
+
+	  audio.pause();
+  }
+  // 暂停音频
+  function handPauseAudio() {
+	  handStop=true;
+	  audio.pause();
+  }
   var status = false; // 初始状态为 false
 
   function showAlert() {
@@ -316,6 +368,33 @@
 </script>
 </body>
 <style>
+	/* 隐藏默认的audio控件 */
+	#myAudio::-webkit-media-controls {
+		display:none !important;
+	}
+
+	/* 自定义报警铃样式 */
+	/*.alarm-bell {
+		width: 40px; !* 根据需要调整 *!
+		height: 40px; !* 根据需要调整 *!
+		background-image: url('./img/time2.svg'); !* 替换为你的报警铃图片路径 *!
+		background-size: cover;
+		cursor: pointer;
+	}*/
+
+	/* 按钮样式 */
+	.button {
+		padding: 10px 20px;
+		margin: 5px;
+		cursor: pointer;
+		font-size: 16px;
+		border: none;
+		border-radius: 5px;
+		color: white;
+		background-color: #007BFF;
+	}
+
+
   .main_b {
     position: relative;
     /* background: url(../img/logistics/box1.png) no-repeat;  */

page2.html

@@ -326,9 +326,7 @@
 
 <script>
 $(document).ready(function () {
-// 小时产量
-	EchartsB5()
-
+	let siteId = null;
 // 子页面  监听父页面消息
 	window.addEventListener('message', function(event={}) {
 		const _data=JSON.parse( (event.data||"{}") )
@@ -367,9 +365,25 @@ $(document).ready(function () {
 		}
 		if(_data.type=='info'){
 			if (_data.message.result){
-				if(_data.message.result.ALL){
-					$("#totalProductNum").text(_data.message.result.ALL);
+				if(_data.message.All){
+					$("#totalProductNum").text(_data.message.All.ALL);
+				}
+			}
+		}
+
+
+		if(_data.type==='siteId'){
+			if (_data.siteId){
+				siteId = _data.siteId;
+				// 小时产量
+				EchartsB5(siteId)
+				//清除interval定时器
+				if(window.IntervalEchartB5){
+					clearInterval(window.IntervalEchartB5)
 				}
+				window.IntervalEchartB5=setInterval(()=>{
+					this.showIMg=false
+				},1000*60*3)
 			}
 		}
 	}, false);