From 6db4de77bb9f1554854e50778fda8d9b479d6781 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 07 十二月 2018 13:53:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/common.js | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 235 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index d9071ea..fe0877c 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -465,6 +465,11 @@
gl.CMD.gprs.param = 145;
gl.CMD.gprs.signal = "CSQ";
gl.CMD.gprs.threadinfo = 0x17;
+
+ // CMD涓媌att
+ gl.namespace('CMD.batt');
+ gl.CMD.batt.get = 0x36; // 鑾峰彇鐢垫睜鍙傛暟
+ gl.CMD.batt.set = 0x37; // 璁剧疆鐢垫睜鍙傛暟
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
@@ -482,6 +487,236 @@
})(jQuery, window, document, GLOBAL);
+// 鏂囨湰妗嗘暟鎹殑楠岃瘉
+;(function($, window, document, gl, undefined) {
+ // 瀹氫箟testVal鐨勫懡鍚嶇┖闂�
+ gl.namespace('testVal');
+ // 楠岃瘉鏁版嵁
+ function check(ele, ptn, callback) {
+ var val = ele.val();
+ var isGood = regVal(val, ptn);
+ setStyle(ele, isGood, ptn, callback);
+ }
+
+ // 灏嗘暟鎹粦瀹氬埌GLOBAL.testVal涓�
+ gl.testVal.check = check;
+
+ // 妫�娴嬫暟鎹殑鏈夋晥鎬�
+ function regVal(val, ptn) {
+ var flag = true;
+ var _val = val;
+
+ // 妫�楠屾暟鎹牸寮忔槸鍚︽湁鏁�
+ if(!ptn.pattern.test(_val)) {
+ flag = false;
+ }
+
+ // 妫�楠屾暟鎹槸鍚﹀湪鍙栧�煎尯闂�(鍓嶆彁鏄暟鎹牸寮忔纭笖鏈夊尯闂�)
+ if(flag && ptn.regVal) {
+ // val鍊间笉鍦ㄥ彇鍊艰寖鍥�
+ if(val<ptn.min || val>ptn.max) {
+ flag = false;
+ }
+ }
+
+ return flag;
+ }
+
+ // 璁剧疆鏂囨湰妗嗙殑鏍峰紡
+ function setStyle(ele, isGood, ptn, callback) {
+ if(isGood) {
+ ele.next('i').removeClass('error-data');
+ ele.myTooltip('hide');
+ ele.removeClass('error-data');
+ }else {
+ ele.next('i').addClass('error-data');
+ ele.myTooltip({
+ position: ptn.position,
+ thing: 'show',
+ update: ptn.update,
+ content: '<span style="color:#FF0000">'+ptn.msg+'</span>'
+ });
+ ele.addClass('error-data');
+ }
+ // 鏄惁鍥炶皟鍑芥暟
+ //console.log(callback);
+ if(isFunction(callback)) {
+ callback();
+ }
+ }
+})(jQuery, window, document, GLOBAL);
+
+// 瀵煎嚭鎶ヨ〃
+;(function($, window, document, gl, undefined) {
+ // 瀹氫箟testVal鐨勫懡鍚嶇┖闂�
+ gl.namespace('Table');
+ var ExpExcel = function() {
+ this.thead = ''; // 琛ㄦ牸鐨勫ご閮�
+ this.tbody = ''; // 琛ㄦ牸鐨勫唴瀹�
+ this.normal = 1; // 鏄惁涓洪�氱敤鐨勫鍑�
+ this.dataBreak = ''; // 鏁版嵁鍒嗗壊绗�
+ this.pageNames = ''; // 宸ヤ綔绨垮悕绉�
+ this.pageBreak = ''; // 宸ヤ綔绨垮垎闅旂
+ this.form = '';
+ this.form = this.initForm();
+ };
+ var prop = ExpExcel.prototype;
+
+ // 鍒濆鍖�
+ prop._init = function(obj) {
+ var defaults = {
+ thead: [],
+ tbody: [],
+ normal: 1,
+ dataBreak: '&',
+ pageNames: ['鏁版嵁琛ㄦ牸'],
+ pageBreak: '$'
+ };
+
+ // 鍚堝苟瀵硅薄
+ var opts = $.extend({}, defaults, obj | {});
+
+ this._setThead(obj.thead, opts.pageBreak, opts.dataBreak);
+ this._setTbody(obj.tbody, opts.pageBreak, opts.dataBreak);
+ this._setPageNames(opts.pageNames, opts.pageBreak);
+
+ this.dataBreak = opts.dataBreak;
+ this.pageBreak = opts.pageBreak;
+ this.normal = opts.normal;
+
+ this.form = this.initForm();
+ this._setForm();
+ };
+
+ // 璁剧疆椤甸潰涓殑鍏冪礌
+ prop._setForm = function() {
+ var ele = $('#exp_container');
+ // 鍒涘缓瀹瑰櫒
+ if(ele.length == 0) {
+ $('body').append($('<div id="exp_container"></div>'));
+ }
+ ele = $('#exp_container');
+ console.log(ele.length);
+ // 鏇存柊鍐呭
+ ele.text('');
+
+ var form = $('<form id="exp_excel" action="ExportTable.servlet" method="post"></form>');
+
+ var thead = $('<input type="hidden" id="exp_thead" name="exp_thead" value=""/>');
+ var tbody = $('<input type="hidden" id="exp_tbody" name="exp_tbody" value=""/>');
+ var normal = $('<input type="hidden" id="exp_normal" name="exp_normal" value=""/>');
+ var dataBreak = $('<input type="hidden" id="exp_data_break" name="exp_data_break" value=""/>');
+ var pageNames = $('<input type="hidden" id="exp_page_names" name="exp_page_names" value=""/>');
+ var pageBreak = $('<input type="hidden" id="exp_page_break" name="exp_page_break" value=""/>');
+
+ thead.val(this.thead);
+ tbody.val(this.tbody);
+ normal.val(this.normal);
+ dataBreak.val(this.dataBreak);
+ pageNames.val(this.pageNames);
+ pageBreak.val(this.pageBreak);
+
+ form.append(thead);
+ form.append(tbody);
+ form.append(normal);
+ form.append(dataBreak);
+ form.append(pageNames);
+ form.append(pageBreak);
+
+ ele.append(form);
+ this.form = form;
+ };
+
+ // 璁剧疆琛ㄦ牸澶撮儴鐨勫��
+ prop._setThead = function(thead, pageBreak, dataBreak) {
+ var arr = [];
+ // 鏁版嵁鍒嗗壊
+ for(var i=0; i<thead.length; i++) {
+ var _arr = thead[i].join(dataBreak);
+ arr.push(_arr)
+ }
+ // 宸ヤ綔绨垮垎鍓�
+ var str = arr.join(pageBreak);
+ this.thead = str;
+ };
+
+ // 璁剧疆琛ㄦ牸鍐呭
+ prop._setTbody = function(tbody, pageBreak, dataBreak) {
+ var arr = [];
+ // 鏁版嵁鍒嗗壊
+ for(var i=0; i<tbody.length; i++) {
+ var _arr = tbody[i].join(dataBreak);
+ arr.push(_arr)
+ }
+ // 宸ヤ綔绨垮垎鍓�
+ var str = arr.join(pageBreak);
+ this.tbody = str;
+ };
+
+ // 璁剧疆宸ヤ綔绨垮唴瀹�
+ prop._setPageNames = function(pageNames, pageBreak) {
+ var str = pageNames.join(pageBreak);
+ this.pageNames = str;
+ };
+
+ // 鍒濆鍖杅orm
+ prop.initForm = function() {
+ this.form = '12345';
+ };
+
+ // 瀵煎嚭琛ㄦ牸
+ prop.xls = function(obj) {
+
+ this._init(obj); // 鍒濆鍖栧唴瀹�
+ // 瀵煎嚭鍐呭
+ if(this.form == '12345') {
+ alert('娌℃湁妫�娴嬪埌form琛ㄥ崟')
+ }else {
+ this.form.submit();
+ }
+ };
+
+
+ var expExcel = new ExpExcel();
+ //console.log(expExcel);
+ // 缁戝畾瀵煎嚭鏁版嵁瀵硅薄
+ GLOBAL.Table.expExcel = expExcel;
+
+
+ //鏋勯�犲鍑鸿〃鏍煎璞�
+ function createTableData(tOptions){
+ var thead_arr = new Array(); //琛ㄥご鏁版嵁鏁扮粍
+ var thody_arr = new Array(); //琛ㄦ牸鏁版嵁鏁扮粍
+ var proname_arr = new Array(); //灞炴�у悕鏁扮粍
+ //console.info(tOptions);
+ if(tOptions != undefined){
+ //鏋勯�犺〃澶存暟缁�
+ for(var i = 0;i< tOptions.cols.length;i++){
+ var _th = tOptions.cols[i];
+ for(var k=0;k<_th.length;k++){
+ if(_th[k].field != undefined){
+ proname_arr.push(_th[k].field);
+ thead_arr.push(_th[k].title);
+ }
+ }
+ }
+ //鏋勯�犺〃鏍煎唴閮ㄦ暟鎹暟缁�
+ for(var j = 0;j < tOptions.data.length;j++){
+ var _data = tOptions.data[j];
+ for(var k=0;k<proname_arr.length;k++){
+ thody_arr.push(_data[proname_arr[k]]);
+ }
+ }
+ }
+ return {
+ thead: [thead_arr],
+ tbody:[thody_arr]
+ };
+ }
+
+ // 缁戝畾瀵煎嚭鏁版嵁瀵硅薄
+ GLOBAL.Table.cTblData = createTableData;
+})(jQuery, window, document, GLOBAL);
// 鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
function create_ali_font(cla, color, data) {
--
Gitblit v1.9.1