From f86d079dcafc190e634f248d1dcc7007b7cf1028 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期二, 30 十月 2018 10:25:55 +0800
Subject: [PATCH] 屏蔽页面输出
---
gx_tieta/WebRoot/js/VoiceUtil.js | 4 +-
gx_tieta/WebRoot/Top.jsp | 58 +++++++++++++++--------------
2 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index b733db6..22a3b2e 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -620,6 +620,35 @@
});
}
+ //鏌ヨ鏈�杩�30鍐呯殑璁惧鍜岀數姹犲憡璀﹀苟鎾姤璇煶
+ function searchRecentlyAlarm(){
+ $.ajax({
+ type: "post",
+ url: "Battalarm_dataAction!serchIn30",
+ async:true,
+ dataType:'json',
+ data:null,
+ success: function(data){
+ //console.info(data);
+ var model = eval("("+data.result+")");
+ //console.info(model);
+ if(model.code == 1){
+ var alarm_str = "";
+ for(var i=0;i<model.data.length;i++){
+ var obj = model.data[i];
+ alarm_str += obj.note+";";
+ }
+ voice.play(alarm_str,searchRecentlyAlarm);
+ }else{
+ setTimeout(searchRecentlyAlarm, 5000);
+ }
+ },
+ error:function() {
+ setTimeout(searchRecentlyAlarm, 5000);
+ }
+ });
+ }
+
// 鏍稿娴嬭瘯妯″潡
$(function() {
var arrTh = ['鏈烘埧鍚嶇О', '璁惧ID', '璁惧鍚嶇О','璁惧鐘舵��', '鍦ㄧ嚎鐢靛帇锛圴锛�', '缁勭鐢靛帇锛圴锛�', '缁勭鐢垫祦锛坢A锛�','璁惧娓╁害锛堚剝锛�', '宸叉祴瀹归噺锛圓H锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
@@ -689,34 +718,7 @@
- //鏌ヨ鏈�杩�30鍐呯殑璁惧鍜岀數姹犲憡璀﹀苟鎾姤璇煶
- function searchRecentlyAlarm(){
- $.ajax({
- type: "post",
- url: "Battalarm_dataAction!serchIn30",
- async:true,
- dataType:'json',
- data:null,
- success: function(data){
- console.info(data);
- var model = eval("("+data.result+")");
- console.info(model);
- if(model.code == 1){
- var alarm_str = "";
- for(var i=0;i<model.data.length;i++){
- var obj = model.data[i];
- alarm_str += obj.note+";";
- }
- voice.play(alarm_str,searchRecentlyAlarm);
- }else{
- setTimeout(searchRecentlyAlarm, 5000);
- }
- },
- error:function() {
- setTimeout(searchRecentlyAlarm, 5000);
- }
- });
- }
+
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
diff --git a/gx_tieta/WebRoot/js/VoiceUtil.js b/gx_tieta/WebRoot/js/VoiceUtil.js
index cfc0f6a..c952f14 100644
--- a/gx_tieta/WebRoot/js/VoiceUtil.js
+++ b/gx_tieta/WebRoot/js/VoiceUtil.js
@@ -28,7 +28,7 @@
var to_speak = new SpeechSynthesisUtterance(txt);
to_speak.voice = this.voice; // 璁惧畾涓枃鎾姤
to_speak.rate = this.rate;
- console.info(to_speak);
+ //console.info(to_speak);
this.speak.speak(to_speak);
var starttime = new Date();
@@ -37,7 +37,7 @@
if(callback && typeof callback == 'function'){
var endtime = new Date();
var timelong = (endtime.getTime()-starttime.getTime())/1000;
- console.info(parseInt(_timeInterval)+"==="+parseInt(timelong));
+ //console.info(parseInt(_timeInterval)+"==="+parseInt(timelong));
if(timelong > this.timeInterval){
callback();
}else{
--
Gitblit v1.9.1