From f3cf0e8391ff2b0967700c087d6b2c9e1cc48ec9 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.4>
Date: 星期一, 24 十二月 2018 09:41:59 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/css/web-status-outline.css | 17 ++++++++
gx_tieta/WebRoot/js/VoiceUtil.js | 32 +++++++++++++++
gx_tieta/WebRoot/batt-fault-manage.jsp | 16 +++++++
gx_tieta/WebRoot/Top.jsp | 4 ++
4 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 51ebf9e..89ac546 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -130,6 +130,10 @@
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
</div>
+ <div class="cell-list voice">
+ <i class="fa fa-bell"></i>
+ <i class="fa fa-bell-slash"></i>
+ </div>
<div class="cell-list server-time" style="white-space: nowrap">
2018-11-26 00:00:00
</div>
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 1c398f4..3db4193 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -45,7 +45,8 @@
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
<th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
- <th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
+ <th><s:text name="Computer_site"/></th>
+ <th>闂绫诲瀷</th> <!-- 鏈烘埧绔欑偣 -->
</tr>
<tr>
<td>
@@ -60,6 +61,19 @@
<td>
<select name="" id="station_name3"></select>
</td>
+ <td>
+ <select name="" id="question_name">
+ <option value="0">鐢垫睜闂</option>
+ <option value="1">鐢垫簮闂</option>
+ <option value="2">绌鸿皟闂</option>
+ <option value="3">婕忔按闂</option>
+ <option value="4">BTS璁惧闂</option>
+ <option value="5">GPRS妯″潡闂</option>
+ <option value="6">鏂藉伐瀹夎闂</option>
+ <option value="7">閾侀攤鐢垫睜闂</option>
+ <option value="8">鍏朵粬闂</option>
+ </select>
+ </td>
</tr>
</tbody>
</table>
diff --git a/gx_tieta/WebRoot/css/web-status-outline.css b/gx_tieta/WebRoot/css/web-status-outline.css
index 776a281..2f43017 100644
--- a/gx_tieta/WebRoot/css/web-status-outline.css
+++ b/gx_tieta/WebRoot/css/web-status-outline.css
@@ -11,6 +11,23 @@
vertical-align: middle;
padding: 3px 5px;
}
+.web-status .cell-list.voice {
+ font-size: 18px;
+ color: #1995DA;
+}
+.web-status .cell-list.voice .fa-bell-slash {
+ display: none;
+}
+
+.web-status .cell-list.voice.close-voice .fa-bell-slash {
+ display: inline-block;
+}
+.web-status .cell-list.voice.close-voice .fa-bell {
+ display: none;
+}
+.web-status .cell-list.voice.close-voice {
+ color: #C8C8C8;
+}
.web-status .progressbar {
width: 60px;
}
diff --git a/gx_tieta/WebRoot/js/VoiceUtil.js b/gx_tieta/WebRoot/js/VoiceUtil.js
index 6bf489e..08e3a96 100644
--- a/gx_tieta/WebRoot/js/VoiceUtil.js
+++ b/gx_tieta/WebRoot/js/VoiceUtil.js
@@ -52,6 +52,16 @@
};
+// 寮�鍚�/鍏抽棴褰撳墠璇煶鎾姤 锛堜緷璧栦笌base.js瀵煎叆鐨凜ookie鏂规硶锛�
+Voice.prototype.changeSpeak = function(bool) {
+ this.speak_enable = bool;
+ setCookie('voice', bool);
+ // 閫�鍑哄綋鍓嶆挱鎶�
+ if(!bool) {
+ this.cancel();
+ }
+};
+
// 閫�鍑哄綋鍓嶆挱鎶�
Voice.prototype.cancel = function() {
this.speak.cancel();
@@ -83,4 +93,24 @@
var voice = new Voice();
-voice.cancel();
\ No newline at end of file
+var voiceStatus = getCookie('voice');
+// 璁剧疆鍒濆璇煶鎾姤鐘舵��
+voiceStatus = voiceStatus=='false'?false:true;
+voice.changeSpeak(voiceStatus);
+voice.cancel();
+
+// 璁剧疆鍒濆鍖栬闊虫挱鎶ュ浘鏍�
+if(!voiceStatus) {
+ $('.web-status .cell-list.voice').addClass('close-voice');
+}
+
+// 鐐瑰嚮澹伴煶鐨勫浘鏍�
+$('.web-status .cell-list.voice').click(function() {
+ $(this).toggleClass('close-voice');
+ // 鍒ゆ柇鏄惁鍏抽棴澹伴煶
+ if($(this).hasClass('close-voice')) {
+ voice.changeSpeak(false);
+ }else {
+ voice.changeSpeak(true);
+ }
+});
\ No newline at end of file
--
Gitblit v1.9.1