From 5eccf7914f844961d5d0a63071d1c89c0b5b32f1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 11 十月 2018 15:34:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/set-match-group.jsp | 90 ++++++++++--
gx_tieta/WebRoot/iframe/set-match-group.html | 287 +++++++++++++++++++++++++++++-----------
gx_tieta/WebRoot/ele-match-group.jsp | 2
gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java | 2
4 files changed, 286 insertions(+), 95 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 461c9c3..86ac658 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -233,7 +233,7 @@
if(rs.code == 1) {
var data = rs.data;
var num = 0;
- console.log(data);
+ //console.log(data);
var rsData = formaterTblData(data);
// 璁剧疆琛ㄦ牸鐨勬暟鎹�
num = rsData.length;
diff --git a/gx_tieta/WebRoot/iframe/set-match-group.html b/gx_tieta/WebRoot/iframe/set-match-group.html
index 1d85e59..e61b55b 100644
--- a/gx_tieta/WebRoot/iframe/set-match-group.html
+++ b/gx_tieta/WebRoot/iframe/set-match-group.html
@@ -58,7 +58,7 @@
</div>
</div>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="search"><i class="fa fa-search"></i> 鏌ヨ</button>
- <button class="layui-btn layui-btn-sm layui-btn-normal" id="replace"><i class="fa fa-reply"></i> 鏇存崲</button>
+ <button class="layui-btn layui-btn-sm layui-btn-normal" id="matchGroup"><i class="fa fa-reply"></i> 閰嶇粍</button>
</div>
</div>
@@ -73,84 +73,203 @@
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
+ <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
,table = layui.table // 鑾峰彇table妯″潡
- ,form = layui.form
- ,laytpl = layui.laytpl
- ,element = layui.element;
- // 琛ㄦ牸鏁版嵁閰嶇疆椤�
- var tOptions = {
- elem: '#groupTbl'
- ,toolbar: true
- ,defaultToolbar: ['exports', 'filter']
- ,cellMinWidth: 80
- ,cols: [[
- {type: 'radio', fixed: 'left'}
- ,{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
- ,{field:'groupname', title:'鐢垫睜缁勫悕绉�', align:'center'}
- ,{field:'monnum', title:'鍗曚綋缂栧彿', align:'center'}
- ,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'}
- ,{field:'nominalcap', title:'鏍囩О瀹归噺', align:'center'}
- ,{field:'monvol', title:'鏍囩О鐢靛帇锛圴锛�', align:'center'}
- ]]
- ,data:[]
- ,page: {
- layout:['count', 'prev', 'page', 'next']
- }
- ,height: 'full-0'
- };
-
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.render(tOptions);
+ ,form = layui.form;
+ var parentData = parent.$('#setMatchGroupData').data('data'); // 鐖跺鍣ㄥ瓨鍌ㄧ殑鍊�
+ // 琛ㄦ牸鏁版嵁閰嶇疆椤�
+ var tOptions = {
+ elem: '#groupTbl'
+ ,toolbar: true
+ ,defaultToolbar: ['exports', 'filter']
+ ,cellMinWidth: 80
+ ,cols: [[
+ {type: 'radio', fixed: 'left'}
+ ,{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
+ ,{field:'groupname', title:'鐢垫睜缁勫悕绉�', align:'center'}
+ ,{field:'monnum', title:'鍗曚綋缂栧彿', align:'center'}
+ ,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'}
+ ,{field:'nominalcap', title:'鏍囩О瀹归噺', align:'center'}
+ ,{field:'monvol', title:'鏍囩О鐢靛帇锛圴锛�', align:'center'}
+ ]]
+ ,data:[]
+ ,page: {
+ layout:['count', 'prev', 'page', 'next']
+ }
+ ,height: 'full-0'
+ };
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
- // 鐐瑰嚮鏌ヨ鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勭殑鍗曚綋鍒楄〃
- $('#search').click(function() {
- var data = [{stationname: 'xxx'},{stationname: 'enen'}];
- var num = data.length;
- tOptions.data = data;
- // 璁剧疆鍒嗛〉淇℃伅
- // tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞�
- tOptions.page.limit = num;
- tOptions.page.limits = [num]
- // 閲嶆柊缁樺埗琛ㄦ牸
- table.reload('groupTbl', tOptions);
- });
-
- // 鍒囨崲绛涢�夋潯浠舵ā鍧�
- form.on('select(group)', function(data) {
- var dom = data.elem;
- var $dom = $(dom);
- console.log($dom.find('option:selected').data());
- });
-
-
- // 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹�
- table.on('tool(groupTbl)', function(obj) {
- var event = obj.event;
- switch(event) {
- case 'replace':
- console.log(obj);
- showReplacePanel();
- break;
+ // 鐐瑰嚮鏌ヨ鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勭殑鍗曚綋鍒楄〃
+ $('#search').click(function() {
+ var groupData = $('#group').find('option:selected').data('data');
+ // 鍒ゆ柇鏄惁宸茬粡閫変腑鐢垫睜缁�
+ if(groupData) {
+ searchData(groupData);
+ }else {
+ tOptions.data = [];
+ table.render(tOptions);
+ layer.msg('璇烽�夋嫨涓�缁勭數姹�');
+ }
+ });
+
+ // 鏌ヨ鐢垫睜缁勪笅鎵�鏈夌殑鍗曚綋
+ function searchData(obj) {
+ // 娣诲姞绛夊緟妗�
+ var loading = layer.load(0, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+ var structData = structSearchData(obj);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url:'BattInfAction!serchGroupByInfor',
+ data: 'json='+JSON.stringify(structData),
+ dataType: 'json',
+ success: function(result) {
+ layer.close(loading); // 鍏抽棴绛夊緟妗�
+ var rs = JSON.parse(result.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ var num = 0;
+ var rsData = formaterTblData(data);
+ num = rsData.length;
+ tOptions.data = rsData;
+ // 璁剧疆鍒嗛〉淇℃伅
+ tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞�
+ tOptions.page.limit= num;
+ tOptions.page.limits = [num];
+ }
+ // 閲嶆柊缁樺埗琛ㄦ牸鍐呭
+ table.reload('groupTbl', tOptions);
}
});
+ }
+
+ // 鏋勯�犳煡璇㈠璞�
+ function structSearchData(data) {
+ var obj = {};
+ obj.StationName1 = '';
+ obj.StationName2 = '';
+ obj.StationName3 = '';
+ obj.BattGroupName = '';
+ obj.BattGroupId = data.BattGroupId;
+ return obj;
+ }
+
+ // 鏋勯�犵敓鎴愯〃鏍兼暟鎹殑鏂规硶
+ function formaterTblData(data) {
+ var rs = []; // 缁撴灉闆�
+
+ // 閬嶅巻鏌ヨ鐨勭粨鏋滄牴鎹煡璇㈢粨鏋滅敓鎴愭寚瀹氱殑鏍煎紡
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var obj = {};
+ obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О
+ obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
+ obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇
+ obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺
+ obj.monnum = '#'+_data.MonNum; // 鍗曚綋缂栧彿
+ obj.brandname = _data.BattProducer; // 鍝佺墝
+ // 涓嶆樉绀哄唴瀹�
+ obj.num = _data.MonNum; // 鍗曚綋缂栧彿涓嶅姞#
+ obj.battgroupid = _data.BattGroupId; // 鐢垫睜缁刬d
+ obj.stationid = _data.StationId; // 鏈烘埧id
+ rs.push(obj);
+ }
+
+ return rs; // 杩斿洖缁撴灉闆�
+ }
- // 鑾峰彇妯℃澘
- var index = parent.layer.getFrameIndex(window.name); //鑾峰彇绐楀彛绱㈠紩
+ // 鑾峰彇妯℃澘
+ var index = parent.layer.getFrameIndex(window.name); //鑾峰彇绐楀彛绱㈠紩
- // 鐐瑰嚮鏇挎崲
- $('#replace').click(function() {
- var checkStatus = table.checkStatus('groupTbl'); //test鍗充负鍩虹鍙傛暟id瀵瑰簲鐨勫��
- console.log(checkStatus);
- var data = parent.$('#setMatchGroupData').data();
- console.log(data);
- //parent.layer.close(index);
+ // 鐐瑰嚮閰嶇粍
+ $('#matchGroup').click(function() {
+ var checkStatus = table.checkStatus('groupTbl'); //test鍗充负鍩虹鍙傛暟id瀵瑰簲鐨勫��
+ var data = checkStatus.data;
+ //console.log(checkStatus.data);
+ if(data.length == 0) {
+ layer.msg('璇烽�夋嫨琛ㄦ牸涓殑鐢垫睜鍗曚綋锛�');
+ }else {
+ var _data = data[0];
+ console.log(_data);
+ console.log(parentData);
+ matchGroup(_data, parentData);
+ }
+ });
+
+ // 鏍规嵁鏋勯�犵粨鏋滆繘琛岄厤缁�
+ function matchGroup(oData, nData) {
+ var old_cap = oData.nominalcap;
+ var old_vol = oData.monvol;
+ var new_cap = nData.nominalcap;
+ var new_vol = nData.monvol;
+ var isTrue = (old_cap==new_cap && old_vol==new_vol);
+ if(!isTrue) {
+ layer.msg('<span style="font-weight: bold; color: orange">鏍囩О瀹归噺鎴栨爣绉扮數鍘嬩笉涓�鑷�,鏃犳硶閰嶇粍锛�</span>');
+ return;
+ }
+
+ // 绗﹀悎閰嶇粍鐨勫熀鏈姹�
+ parent.layer.confirm('鏄惁纭閰嶇粍锛�',{
+ btn: ['纭','鍙栨秷'] //鎸夐挳
+ }, function(){
+ enMatchGroup(oData, nData);
+ }, function(){
+
});
+ }
+
+ // 纭閰嶇粍
+ function enMatchGroup(oData, nData) {
+ var matchGroupData = structMatchGroupData(oData, nData);
+ // 鏇村叿鏋勯�犲弬鏁拌繘琛岄厤缁�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInf_RebuildAction!add',
+ data: 'json='+JSON.stringify(matchGroupData),
+ dataType: 'json',
+ success:function(result) {
+ console.log(result);
+ }
+ });
+ parent.layer.close(parent.layer.index);
+ }
+
+ // 鏋勯�犺繘琛岄厤缁勭殑鍙傛暟
+ function structMatchGroupData(oData, nData) {
+ var obj = {}; // 缁撴灉瀵硅薄
+ var nowTime = new Date().format('yyyy-MM-dd hh:mm:ss'); // 褰撳墠鏃堕棿
+ // 褰撳墠鐢垫睜鍗曚綋鐨勪俊鎭�
+ obj.old_stationname = oData.stationname; // 鏈烘埧鍚嶇О
+ obj.old_battgroupname = oData.groupname; // 鐢垫睜缁勫悕绉�
+ obj.old_battproducer = oData.brandname; // 鍗曚綋鐨勫搧鐗�
+ obj.old_stationid = oData.stationid; // 鏈烘埧id
+ obj.old_battgroupid = oData.battgroupid; // 鐢垫睜缁刬d
+ obj.old_monnum = oData.num; // 鍗曚綋缂栧彿
+ // 琚厤缁勫崟浣撶殑淇℃伅
+ obj.new_stationname = nData.stationname; // 鏈烘埧鍚嶇О
+ obj.new_battgroupname = nData.groupname; // 鐢垫睜缁勫悕绉�
+ obj.new_battproducer = nData.brandname; // 鍗曚綋鐨勫搧鐗�
+ obj.new_stationid = nData.stationid; // 鏈烘埧id
+ obj.new_battgroupid = nData.battgroupid; // 鐢垫睜缁刬d
+ obj.new_monnum = nData.num; // 鍗曚綋缂栧彿
- // 鏌ヨ鐪佷笅鎷夋
+ // 鍏叡淇℃伅
+ obj.rebuild_time = nowTime;
+ obj.rebuild_address = '';
+ obj.rebuild_clear_type = 1;
+ console.info(obj);
+ return obj;
+ }
+
+ // 鏌ヨ鐪佷笅鎷夋
searchProvince();
// 鏌ヨ鐪�
function searchProvince() {
@@ -256,6 +375,7 @@
data: "json = "+JSON.stringify(tmp),
success: function(result) {
var rs = JSON.parse(result.result);
+ var stationid = parentData.stationid; // 鑾峰彇鐖跺厓绱犻�変腑鏈烘埧鐨刬d锛岀敤鎴峰墧闄ゅ凡缁忛�変腑鐨勬満鎴�
var list = []; // option缁撴灉闆�
var ele = $('#home'); // 鐩爣select
if(rs.code == 1) {
@@ -264,11 +384,14 @@
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
- var _attr = {
- StationId: _data.StationId
- };
- var _tmp = getLayuiSelect(_data.StationName3, _data.StationName, _attr, _data);
- list.push(_tmp);
+ // 娌℃湁涓庣埗鏈烘埧閲嶅
+ if(_data.StationId != stationid) {
+ var _attr = {
+ StationId: _data.StationId
+ };
+ var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
+ list.push(_tmp);
+ }
}
}else {
list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
@@ -310,20 +433,24 @@
var rs = JSON.parse(result.result);
var list = []; // option缁撴灉闆�
var ele = $('#group'); // 鐩爣select
+ var stationid = parentData.stationid; // 鑾峰彇鐖跺厓绱犻�変腑鏈烘埧鐨刬d锛岀敤鎴峰墧闄ゅ凡缁忛�変腑鐨勬満鎴�
if(rs.code == 1) {
var data = rs.data;
list.push(getLayuiSelect('璇烽�夋嫨鐢垫睜缁�', '', {}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
- var _attr = {
- stationname: _data.StationName,
- dev_id: _data.FBSDeviceId,
- batt_num: _data.GroupIndexInFBSDevice+1
- };
- var txt = _data.BattGroupName+'(鍏�'+_data.MonCount+'鑺�)';
- var _tmp = getLayuiSelect(txt, _data.BattGroupId, _attr, _data);
- list.push(_tmp);
+ // 娌℃湁涓庣埗鏈烘埧閲嶅
+ if(_data.StationId != stationid) {
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'(鍏�'+_data.MonCount+'鑺�)';
+ var _tmp = getLayuiSelect(txt, _data.BattGroupId, _attr, _data);
+ list.push(_tmp);
+ }
}
}else {
list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index 34b0406..36e8c4b 100644
--- a/gx_tieta/WebRoot/set-match-group.jsp
+++ b/gx_tieta/WebRoot/set-match-group.jsp
@@ -97,15 +97,13 @@
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="pages/js/mylayui.js"></script>
<script type="text/html" id="toolBar">
- <a class="layui-btn layui-btn-xs" lay-event="replace">鏇存崲</a>
+ <a class="layui-btn layui-btn-xs" lay-event="matchGroup">閰嶇粍</a>
</script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
,table = layui.table // 鑾峰彇table妯″潡
- ,form = layui.form
- ,laytpl = layui.laytpl
- ,element = layui.element;
+ ,form = layui.form;
// 琛ㄦ牸鏁版嵁閰嶇疆椤�
var tOptions = {
elem: '#groupTbl'
@@ -136,35 +134,99 @@
var groupData = $('#group').find('option:selected').data('data');
// 鍒ゆ柇鏄惁宸茬粡閫変腑鐢垫睜缁�
if(groupData) {
- $('#setMatchGroupData')
- console.log(groupData);
- tOptions.data = [{}];
- table.render(tOptions);
+ searchData(groupData);
}else {
tOptions.data = [];
table.render(tOptions);
layer.msg('璇烽�夋嫨涓�缁勭數姹�');
}
});
+
+ // 鏌ヨ鐢垫睜缁勪笅鎵�鏈夌殑鍗曚綋
+ function searchData(obj) {
+ // 娣诲姞绛夊緟妗�
+ var loading = layer.load(0, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+ var structData = structSearchData(obj);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url:'BattInfAction!serchGroupByInfor',
+ data: 'json='+JSON.stringify(structData),
+ dataType: 'json',
+ success: function(result) {
+ layer.close(loading); // 鍏抽棴绛夊緟妗�
+ var rs = JSON.parse(result.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ var num = 0;
+ var rsData = formaterTblData(data);
+ num = rsData.length;
+ tOptions.data = rsData;
+ // 璁剧疆鍒嗛〉淇℃伅
+ tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞�
+ tOptions.page.limit= num;
+ tOptions.page.limits = [num];
+ }
+ // 閲嶆柊缁樺埗琛ㄦ牸鍐呭
+ table.reload('groupTbl', tOptions);
+ }
+ });
+ }
+
+ // 鏋勯�犳煡璇㈠璞�
+ function structSearchData(data) {
+ var obj = {};
+ obj.StationName1 = '';
+ obj.StationName2 = '';
+ obj.StationName3 = '';
+ obj.BattGroupName = '';
+ obj.BattGroupId = data.BattGroupId;
+ return obj;
+ }
+
+ // 鏋勯�犵敓鎴愯〃鏍兼暟鎹殑鏂规硶
+ function formaterTblData(data) {
+ var rs = []; // 缁撴灉闆�
+ console.log(data);
+ // 閬嶅巻鏌ヨ鐨勭粨鏋滄牴鎹煡璇㈢粨鏋滅敓鎴愭寚瀹氱殑鏍煎紡
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var obj = {};
+ obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О
+ obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
+ obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇
+ obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺
+ obj.monnum = '#'+_data.MonNum; // 鍗曚綋缂栧彿
+ obj.brandname = _data.BattProducer; // 鍝佺墝
+ // 涓嶆樉绀哄唴瀹�
+ obj.num = _data.MonNum; // 鍗曚綋缂栧彿涓嶅姞#
+ obj.battgroupid = _data.BattGroupId; // 鐢垫睜缁刬d
+ obj.stationid = _data.StationId; // 鏈烘埧id
+ rs.push(obj);
+ }
+
+ return rs; // 杩斿洖缁撴灉闆�
+ }
// 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹�
table.on('tool(groupTbl)', function(obj) {
var event = obj.event;
switch(event) {
- case 'replace':
- showReplacePanel(obj.data);
+ case 'matchGroup':
+ showMatchGroupPanel(obj.data);
break;
}
});
// 鏄剧ず鏇存崲鐢垫睜鍗曚綋闈㈡澘
- function showReplacePanel(obj) {
+ function showMatchGroupPanel(obj) {
$('#setMatchGroupData').data('data', obj);
-
+ // 璁剧疆寮瑰嚭妗嗙殑title鐨勫��
+ var txt = obj.stationname+'-'+obj.groupname+'-'+obj.monnum+'('+obj.brandname+')';
// 鏄剧ず闈㈡澘
layer.open({
type: 2,
- title: '鏇存崲鐢垫睜',
+ title: '<span style="font-weight:bold">閰嶇粍锛�</span>'+txt,
area: ['1200px', '500px'],
fixed: false, //涓嶅浐瀹�
maxmin: true,
@@ -289,7 +351,7 @@
var _attr = {
StationId: _data.StationId
};
- var _tmp = getLayuiSelect(_data.StationName3, _data.StationName, _attr, _data);
+ var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
list.push(_tmp);
}
}else {
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index 60ba796..e5d19c0 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -9,6 +9,7 @@
import com.fgkj.dao.impl.BattDischarge_planImpl;
import com.fgkj.dao.impl.BattInfAgainImpl;
import com.fgkj.dao.impl.BattInfImpl;
+import com.fgkj.dao.impl.BattInf_RebuildImpl;
import com.fgkj.dao.impl.BattMap_informationImpl;
import com.fgkj.dao.impl.BattPower_offImpl;
import com.fgkj.dao.impl.BattTest_ResImpl;
@@ -184,6 +185,7 @@
case 85:return new Battalarm_data_historyImpl();
case 86:return new Batt_devalarm_data_historyImpl();
case 87:return new Batt_enduranceImpl();
+ case 88:return new BattInf_RebuildImpl();
default :return null;
}
}
--
Gitblit v1.9.1