From 339f905b431d73e2223bd81dd05db5054daad212 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:58:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-match-group.jsp | 90 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index ae55089..4c6d8d9 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -23,7 +23,13 @@
<link rel="stylesheet" type="text/css" href="css/basic.css" />
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" href="pages/css/common.css">
+ <link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
+ #main {
+ position: absolute;
+ top: 124px;
+ bottom: 32px;
+ }
#sideBar {
height: 100%;
}
@@ -50,7 +56,7 @@
<div class="side-bar" id="sideBar"></div>
</div>
</div>
- <div class="abs abs-right left360" id="inforCont">
+ <div class="abs abs-left360" id="inforCont">
<div class="tbl-container">
<table class="" id="groupTbl" lay-filter="groupTbl"></table>
</div>
@@ -60,13 +66,14 @@
<script type="text/html" id="groupTblTools">
<div class="layui-btn-container" id="tblToolsBtn">
<input type="checkbox" id="brandAgreement" name="" lay-skin="primary" title="鍝佺墝涓�鑷�" {{ d.brandAgreement }}>
- <input type="radio" data-max="100" data-min="0" id="cap100" name="perCap" lay-skin="primary" title="鍏ㄩ儴" {{ d.cap100 }}>
- <input type="radio" data-max="100" data-min="90" id="cap90" name="perCap" lay-skin="primary" title="90%浠ヤ笂" {{ d.cap90 }}>
+ <input type="radio" data-max="1000" data-min="0" id="cap100" name="perCap" lay-skin="primary" title="鍏ㄩ儴" {{ d.cap100 }}>
+ <input type="radio" data-max="1000" data-min="90" id="cap90" name="perCap" lay-skin="primary" title="90%浠ヤ笂" {{ d.cap90 }}>
<input type="radio" data-max="90" data-min="80" id="cap80" name="perCap" lay-skin="primary" title="80%~90%" {{ d.cap80 }}>
<input type="radio" data-max="80" data-min="70" id="cap70" name="perCap" lay-skin="primary" title="70%~80%" {{ d.cap70 }}>
<input type="radio" data-max="70" data-min="60" id="cap60" name="perCap" lay-skin="primary" title="60%~70%" {{ d.cap60 }}>
<input type="radio" data-max="60" data-min="0" id="cap0" name="perCap" lay-skin="primary" title="60%浠ヤ笅" {{ d.cap0 }}>
- <button class="layui-btn layui-btn-sm" lay-event="startMatchGroup">鍚姩閰嶇粍</button>
+ <button class="layui-btn layui-btn-sm" lay-event="startMatchGroup">鍒嗙粍/鎺掑簭</button>
+ <button class="layui-btn layui-btn-sm" lay-event="matchRecord">閰嶇粍璁板綍</button>
</div>
</script>
@@ -84,7 +91,7 @@
var treeView = new TreeView($('#sideBar'));
// 璁剧疆宸﹀彸缂╂斁
- $('#resizeCont .side-bar-container').resizable({
+ /* $('#resizeCont .side-bar-container').resizable({
handles: 'e',
maxWidth: 520,
minWidth: 240,
@@ -93,7 +100,7 @@
treeView.setContainer();
$('#inforCont').css('left', ui.size.width+'px');
}
- });
+ }); */
// 鐢熸垚涓�绾у鑸�-鐪�
first(treeView, treeView.container);
@@ -104,12 +111,12 @@
second(treeView, $(this).parent(), province);
});
- // 甯�->鏈烘埧
+ // 甯�->鍖�/鍘�
treeView.ele.on('click', '.city', function() {
var city = $(this).data('attr');
- third(treeView, $(this).parent(), city);
var radio = $(this).children('.treeview-txt').find('input');
radio.prop('checked', true);
+ third(treeView, $(this).parent(), city);
// 鏈閫変腑
if(!$(this).hasClass('acCity')) {
@@ -130,7 +137,7 @@
,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
,cols: [[
- {field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
+ {field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
,{field:'groupname', title:'鐢垫睜缁勫悕绉�', align:'center'}
,{field:'monnum', title:'鍗曚綋缂栧彿', align:'center'}
,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'}
@@ -143,7 +150,7 @@
]
,page: {}
- ,height: 'full-170'
+ ,height: 'full-165'
};
var toolBarTpl = groupTblTools.innerHTML;
@@ -210,7 +217,7 @@
function searchData() {
var temp = getSearchParams(); // 鑾峰彇鏌ヨ鏉′欢
// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏈烘埧淇℃伅
- var loading = layer.load(0, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+ var loading = layer.load(1, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
$.ajax({
type: 'post',
url: 'BattInfAction!serchMakeGroup',
@@ -226,6 +233,7 @@
if(rs.code == 1) {
var data = rs.data;
var num = 0;
+ //console.log(data);
var rsData = formaterTblData(data);
// 璁剧疆琛ㄦ牸鐨勬暟鎹�
num = rsData.length;
@@ -257,17 +265,21 @@
var obj = {};
obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О
obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
- obj.brandname = _data.BattProducer; // 鍝佺墝
obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇
- obj.nominalcap = _data.MonCapStd; // 鏍囩О瀹归噺
-
+ obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺
for(var k=0; k<_data.obj.length;k++) {
var _obj = $.extend({}, obj);
var __data = _data.obj[k];
+ // 璁剧疆鍗曚綋淇℃伅
_obj.monnum = '#'+__data.mon_num; // 鍗曚綋缂栧彿
- _obj.relcap = __data.test_cap.toFixed(0); // 瀹為檯瀹归噺
- _obj.percap = (__data.percent*100).toFixed(1); // 瀹归噺鐧惧垎姣�
- rs.push(_obj);
+ _obj.brandname = __data.note; // 鍝佺墝
+ _obj.relcap = Number(__data.test_cap.toFixed(1)); // 瀹為檯瀹归噺
+ _obj.percap = Number((__data.percent*100).toFixed(1)); // 瀹归噺鐧惧垎姣�
+
+ // 鍒ゆ柇鐢垫睜鍗曚綋涓嶅瓨鍦�
+ if(__data.mon_num != -1) {
+ rs.push(_obj);
+ }
}
}
@@ -285,6 +297,7 @@
// 绗﹀悎鏉′欢鍚敤鏋勯�犲璞�
var temp = {
StationName2: attr.StationName2,
+ StationName5: '',
BattProducer: 1
};
@@ -295,9 +308,19 @@
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(groupTbl)', function(obj){
var event = obj.event;
+ var checkStatus = table.checkStatus(obj.config.id);
+ // 鏍规嵁浜嬩欢鍚嶈皟鐢ㄥ搴旂殑鍑芥暟
switch(event){
case 'startMatchGroup':
- startMatchGroup(obj.config);
+ if(allGroup.length !=0) {
+ startMatchGroup(obj.config);
+ }else {
+ layer.msg('娌℃湁瑕佺粍鍚�/鎺掑簭鐨勫唴瀹�');
+ }
+
+ break;
+ case 'matchRecord':
+ console.info(checkStatus);
break;
}
@@ -307,7 +330,7 @@
var data= getDataByRange(allGroup, toolBarStatus.range);
var fData = toolBarStatus.brandAgreement.length>0?formaterData(data):formaterData2(data);
var rsData = decodeObj(fData);
-
+ console.log(rsData);
// 璁剧疆琛ㄦ牸鐨勬暟鎹�
num = rsData.length;
tOptions.data = rsData;
@@ -396,11 +419,12 @@
// 瑙ｇ爜瀵硅薄
function decodeObj(obj) {
var rs = [];
+ // 閬嶅巻褰撳墠瀵硅薄鐨勫睘鎬�
Object.keys(obj).forEach(function(key){
- decodeObjRec(rs, obj[key]);
+ decodeObjRec(rs, obj[key]); // 鑾峰彇鎺掑簭鍚庣殑缁撴灉闆嗭紙鍒╃敤鏁扮粍鐨勫紩鐢ㄤ紶閫掑姛鑳斤級
});
- //console.log(rs);
- return rs;
+
+ return rs; // 杩斿洖缁撴灉闆�
}
// 瑙ｇ爜閫掑綊鍑芥暟
@@ -408,21 +432,25 @@
if(obj instanceof Array) {
var tmp = [];
for(var i=0; i<obj.length; i++) {
- var cap = obj[i].relcap;
+ var cap = Number(obj[i].relcap); // 灏嗗瓧绗︿覆杞寲涓烘暣鏁�
var _index = tmp.length;
for(var k=0; k<tmp.length; k++) {
- if(tmp[k].relcap<cap) {
+ var _cap = Number(tmp[k].relcap); // 灏嗗瓧绗︿覆杞寲涓烘暣鏁�
+ // 姣旇緝瀹為檯瀹归噺鐨勫��(瀵规瘮鏃跺皢瀛楃涓茶浆鍖栦负鏁存暟鍨�)
+ if(_cap<cap) {
_index = k;
break;
}
}
-
+ // 灏嗗綋鍓嶆暟鎹彃鍏ュ埌_index浣嶇疆锛屽疄鐜版帓搴忓姛鑳�
tmp.splice(_index, 0, obj[i]);
}
+ // 閬嶅巻琚帓搴忓悗鐨勬暟缁勫皢鍊兼坊鍔犲埌缁撴灉闆嗕腑
for(var i=0; i<tmp.length; i++) {
rs.push(tmp[i]);
}
}else {
+ // 閫掑綊鍑芥暟
Object.keys(obj).forEach(function(key){
decodeObjRec(rs, obj[key]);
});
@@ -449,7 +477,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -482,7 +510,7 @@
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
var txt = '<input type="radio" name="city">'+ __data.StationName2;
- var tmp = treeView.getFolder(txt, 'city', __data);
+ var tmp = treeView.getFolder(txt, 'city', __data.StationName2,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -493,7 +521,7 @@
});
}
- // 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+ // 鐢熸垚 涓夌骇瀵艰埅-鍖�/鍘�
function third(treeView, container, data) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
@@ -502,7 +530,7 @@
treeView.addProgress(container);
$.ajax({
type: "post",
- url: "BattInfAction!serchStationName3",
+ url: "BattInfAction!serchStationName5",
async:true,
dataType:'json',
data:"json = "+JSON.stringify(data),
@@ -514,8 +542,8 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var txt = '<input type="checkbox" checked="checked" disabled name="home">'+ __data.StationName;
- var tmp = treeView.getFile(txt, 'home', __data.StationId,__data);
+ var txt = '<input type="checkbox" checked="checked" disabled name="county">'+ __data.StationName5;
+ var tmp = treeView.getFile(txt, 'county', __data.StationName5,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
--
Gitblit v1.9.1