From 22ae9f2be193c5783ebfbeeb09f3b675923dbb28 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 30 十月 2018 15:07:55 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/VoiceUtil.js | 23 +++++++++++------------
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3 ++-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/js/VoiceUtil.js b/gx_tieta/WebRoot/js/VoiceUtil.js
index c952f14..6bf489e 100644
--- a/gx_tieta/WebRoot/js/VoiceUtil.js
+++ b/gx_tieta/WebRoot/js/VoiceUtil.js
@@ -1,11 +1,12 @@
// 璁剧疆璇煶鎾姤瀵硅薄
var Voice = function() {
this.speak = window.speechSynthesis;
+ this.tospeak = new SpeechSynthesisUtterance('');
this.voice = '';
this.zh_CN = false;
this.rate = 1.5;
this._setLang(); // 鑾峰彇骞舵娴嬫槸鍚︽湁涓枃鐨勭幆澧�
- this.timeInterval = 28; //寰幆闂撮殧(绉�)
+ this.timeInterval = 27; //寰幆闂撮殧(绉�)
this.speak_enable = true; //ture:寮�鍚闊虫挱鎶� false:鍋滄璇煶鎾姤
};
@@ -15,7 +16,7 @@
console.info('浣犵殑鐢佃剳涓嶆敮鎸佷腑鏂囨挱鎶ワ紒');
}
_timeInterval = this.timeInterval;
- //console.info(this.zh_CN);
+ //console.info(this.speak_enable);
if(!this.speak_enable){ //璇嗗埆鏄惁寮�鍚０闊虫挱鎶�
if(callback && typeof callback == 'function'){
setTimeout(function(){
@@ -25,15 +26,15 @@
return;
}
this.cancel();
- var to_speak = new SpeechSynthesisUtterance(txt);
- to_speak.voice = this.voice; // 璁惧畾涓枃鎾姤
- to_speak.rate = this.rate;
+ this.tospeak.text = txt;
+ this.tospeak.voice = this.voice; // 璁惧畾涓枃鎾姤
+ this.tospeak.rate = this.rate;
//console.info(to_speak);
- this.speak.speak(to_speak);
-
var starttime = new Date();
- to_speak.onend = function(event) {
- //console.info(event);
+ this.speak.speak(this.tospeak);
+ //console.info(this.tospeak);
+ this.tospeak.onend = function(event) {
+ //console.info("鎾斁缁撴潫");
if(callback && typeof callback == 'function'){
var endtime = new Date();
var timelong = (endtime.getTime()-starttime.getTime())/1000;
@@ -48,9 +49,7 @@
}
};
- to_speak.onerror = function(event) {
- //console.info(event);
- };
+
};
// 閫�鍑哄綋鍓嶆挱鎶�
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index b8f1bb6..03770e3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3478,7 +3478,7 @@
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName,StationName1,StationName2,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationId,stationid_ex,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
"from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
@@ -3503,6 +3503,7 @@
batt.setStationName1(rs.getString("stationName1"));
batt.setStationName2(rs.getString("stationName2"));
batt.setStationId(rs.getString("StationId"));
+ batt.setStationId_ex(rs.getString("stationId_ex"));
batt.setStationIp(rs.getString("StationIP"));
batt.setBattGroupName(rs.getString("BattGroupName").trim());
batt.setBattGroupName1(rs.getString("BattGroupName1").trim());
--
Gitblit v1.9.1