From 6a6e86ca875924879bda26aced13061cc053f10b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.29>
Date: 星期五, 19 十月 2018 11:51:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/common.js | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 47b449f..e072489 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -310,6 +310,29 @@
, '搴旀�ヤ緵鐢靛崟浣撲笅闄愬埌', '甯傜數鎭㈠鍋滄搴旀�ヤ緵鐢�', '鍋滄鑷姩搴旀�ヤ緵鐢�', '鏃犳硶鍚姩鏍稿娴嬭瘯', '妯″潡鏁呴殰', '鐢垫睜寮�璺晠闅�'];
})(jQuery, window, document, GLOBAL);
+// 鍩虹珯淇℃伅
+;(function($, window, document, gl, undefined) {
+ // 鍩虹珯寮傚父绫诲瀷
+ gl.namespace('BaseStation.Abnormal');
+ //1:鍩虹珯鍋滅數 2:鍩虹珯缁埅 3:鍩虹珯鍙戠數 4:鍩虹珯寮�闂� 5:鍩虹珯鎺夌珯 6:鍩虹珯娓╁害涓婇檺 7:鍩虹珯娓╁害涓嬮檺 8:鍩虹珯婀垮害涓婇檺 9:鍩虹珯婀垮害涓嬮檺
+ var abnormal = ['鍏ㄩ儴锛堝紓甯革級', '鍩虹珯鍋滅數', '鍩虹珯缁埅', '鍩虹珯鍙戠數', '鍩虹珯寮�闂�', '鍩虹珯鎺夌珯', '鍩虹珯娓╁害涓婇檺', '鍩虹珯娓╁害涓嬮檺', '鍩虹珯婀垮害涓婇檺', '鍩虹珯婀垮害涓嬮檺'];
+ gl.BaseStation.Abnormal = abnormal;
+
+
+ // 鏍规嵁涓嬫爣鑾峰彇鍩虹珯寮傚父绫诲瀷鐨勬枃鏈��
+ function getAbnormalTxt(num) {
+ var rs = abnormal[num];
+ if(rs == undefined) {
+ alert('鍩虹珯寮傚父绫诲瀷'+num+'涓嶅瓨鍦�');
+ rs = abnormal[0];
+ }
+ return rs;
+ }
+ // 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.BaseStation
+ gl.BaseStation.getAbnormalTxt = getAbnormalTxt;
+
+})(jQuery, window, document, GLOBAL);
+
//椤甸潰涓鏃跺櫒鐨勪娇鐢�
;(function($, gl) {
gl.namespace('Timer');
@@ -440,3 +463,18 @@
var outerHTML = i[0].outerHTML;
return outerHTML;
}
+//鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
+function create_fa_font(cla, color, data) {
+ var i = $('<i class="fa"></i>');
+ i.addClass(cla);
+ i.css({
+ 'color': color
+ });
+ Object.keys(data).forEach(function(key) {
+ var attr = 'data-'+key
+ i.attr(attr, data[key]);
+ });
+ // 鑾峰彇瀛楃涓�
+ var outerHTML = i[0].outerHTML;
+ return outerHTML;
+}
--
Gitblit v1.9.1