From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
index 61ac26d..9bcc2e2 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
@@ -7,7 +7,6 @@
<!--地图-->
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
- <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->
<!-- 全局css -->
<link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
@@ -23,7 +22,6 @@
<link href="${ctxPath}/static/css/plugins/webuploader/webuploader.css" rel="stylesheet">
<link href="${ctxPath}/static/css/plugins/ztree/zTreeStyle.css" rel="stylesheet">
<link href="${ctxPath}/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" rel="stylesheet"/>
- <!-- <link href="${ctxPath}/static/css/plugins/ztree/demo.css" rel="stylesheet"> -->
<link href="${ctxPath}/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" rel="stylesheet">
<link href="${ctxPath}/static/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
<link href="${ctxPath}/static/layui/css/layui.css" rel="stylesheet">
@@ -182,10 +180,32 @@
return currentdate;
}
+
+ setInterval(function () {
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/queryOrderBroadcast", function (data) {
+ let newOrder = data.newOrder;
+ let cancelOrder = data.cancelOrder;
+ let lobbyOrder = data.lobbyOrder;
+ if(newOrder){
+ $('#newOrder')[0].play();
+ }
+ if(cancelOrder){
+ $('#cancelOrder')[0].play();
+ }
+ if(lobbyOrder){
+ $('#lobbyOrder')[0].play();
+ }
+ }, function (data) {
+ });
+ ajax.start();
+ }, 3000);
</script>
</head>
<body class="gray-bg">
+<audio id="newOrder"><source src="${ctxPath}/static/audio/newOrder.mp3" type="audio/mpeg"></audio>
+<audio id="cancelOrder"><source src="${ctxPath}/static/audio/cancelOrder.mp3" type="audio/mpeg"></audio>
+<audio id="lobbyOrder"><source src="${ctxPath}/static/audio/lobbyOrder.mp3" type="audio/mpeg"></audio>
<div class="wrapper wrapper-content">
${layoutContent}
</div>
--
Gitblit v1.7.1