From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/WebRoot/ele-param1.jsp | 199 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 167 insertions(+), 32 deletions(-) diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp index 8949974..7d22d3c 100644 --- a/gx_tieta/WebRoot/ele-param1.jsp +++ b/gx_tieta/WebRoot/ele-param1.jsp @@ -90,7 +90,7 @@ <div class="layui-form" lay-filter="homeFilter"> <div class="layui-form-item"> <div class="layui-input-block"> - <select name="home" id="home" lay-filter="home"> + <select name="home" id="home" lay-filter="home" lay-search=""> <option value="">璇烽�夋嫨鏈烘埧</option> </select> </div> @@ -129,10 +129,19 @@ </div> <!-- 瀛樺偍iframe --> <div id="iframeEdit"></div> + <div id="iframeAddData"></div> <!-- 鍏抽棴椤甸潰涓璱frame寮瑰嚭灞� --> <div id="iframeClose"></div> + <!-- 鏌ヨ骞舵樉绀虹紪杈戦潰鏉� --> + <div id="iframeShowEidt"></div> <script type="text/html" id="battGrouptools"> <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> + </script> + <script type="text/html" id="battGrouptoolsEdit"> + <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a> + </script> + <script type="text/html" id="battGrouptoolsDel"> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> </script> <script type="text/html" id="produceTime"> @@ -155,6 +164,16 @@ <script type="text/javascript" src="src/layui.js"></script> <script type="text/javascript" src="pages/js/mylayui.js"></script> <script type="text/javascript"> + var permits; + <% Object obj=session.getAttribute("permits"); + if(obj!=null){ + String permits =obj.toString(); %> + permits=<%=permits%>; + //console.info(json); + <% } %> + + // console.log(permits); + layui.use(['form', 'table', 'layer', 'element'], function() { var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡 var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡 @@ -454,13 +473,22 @@ ,{field:'useDate', title:'鎶曞叆浣跨敤鏃ユ湡', templet: '#useTime', align:'center', width: 140} ,{field:'isInstall', title:'瀹夎鐘舵��', templet: '#isInstall', align:'center', width: 140} ,{field:'install_user', title:'璁惧瀹夎浜哄憳', align:'center', width: 260} - ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#battGrouptools', width:150} + ,{field: 'doThings', fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#battGrouptools', width:150} ]] ,data:[] ,limit: 10000 ,page: false ,height: 'full-290' }; + + // 鏍规嵁鏉冮檺淇敼鍐呭 + var myPermit = checkEditAndDel(permits); + + // 淇敼琛ㄦ牸鐨勯厤缃」 + changeTblOpts(myPermit, tOptions); + + // 淇敼-鏂板缓 + checkPermitAdd(permits); // 鐢熸垚琛ㄦ牸鏁版嵁 table.render(tOptions); @@ -487,6 +515,15 @@ searchHomeInfoByName(obj.data.StationName); } + // 鐐瑰嚮鏄剧ず缂栬緫闈㈡澘 + $('#iframeShowEidt').click(function() { + var sName = $(this).data('sName'); + if(sName) { + searchHomeInfoByName(sName); + } + }); + + // 鏍规嵁鏈烘埧鐨勫悕绉版煡璇㈡満鎴跨殑淇℃伅 function searchHomeInfoByName(homename) { var temp = { @@ -510,7 +547,6 @@ async:true, dataType:'json', data:"json="+JSON.stringify(temp), - success: function(res){ var rs = JSON.parse(res.result) if(rs.code == 1) { @@ -530,6 +566,16 @@ _tmp.BattGroupName = _data.BattGroupName; }else if(key == 'BattGroupId') { // 鐢垫睜缁処D _tmp.BattGroupId = _data.BattGroupId; + }else if(key == 'MonCount') { // 鍗曚綋鏁伴噺 + _tmp.MonCount = _data.MonCount; + }else if(key == 'MonCapStd') { // 鏍囩О瀹归噺 + _tmp.MonCapStd = _data.MonCapStd; + }else if(key == 'MonVolStd') { // 鍗曚綋鐢靛帇 + _tmp.MonVolStd = _data.MonVolStd; + }else if(key == 'BattProducer') { // 鐢垫睜鍝佺墝 + _tmp.BattProducer = _data.BattProducer; + }else if(key == 'BattModel') { // 鐢垫睜鍨嬪彿 + _tmp.BattModel = _data.BattModel; }else { tmp[key] = _data[key]; } @@ -653,37 +699,67 @@ if(len) { _rsData = tOptions.data[len-1]; } - - // 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁� - layer.open({ - type: 1 - ,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�' - ,content: addGroupContent - ,fixed: true - ,resize: false - ,btn:['纭畾', '鍙栨秷'] - ,yes: function(index) { - var groupNum = $('#addGroupnum').val(); - layer.close(index); - // 鐢熸垚鏁扮粍 - var _arr = []; - for(var i=0; i<groupNum; i++) { - _arr.push(i+1); + getMaxDevId(function(id) { + // 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁� + layer.open({ + type: 1 + ,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�' + ,content: addGroupContent + ,fixed: true + ,resize: false + ,btn:['纭畾', '鍙栨秷'] + ,yes: function(index) { + var groupNum = $('#addGroupnum').val(); + layer.close(index); + // 鐢熸垚鏁扮粍 + var _arr = []; + for(var i=0; i<groupNum; i++) { + _arr.push(i+1); + } + + _rsData.addGroupNum = _arr; + _rsData.FBSDeviceId = id; + $('#iframeEdit').data('data', _rsData); + + iframePopup = layer.open({ + type: 2 + ,title: '鏂板缓鐢垫睜缁�' + ,area:['1200px', '520px'] + ,resize: false + ,content: 'iframe/batt-info-add.html' + }); } - - _rsData.addGroupNum = _arr; - $('#iframeEdit').data('data', _rsData); - - iframePopup = layer.open({ - type: 2 - ,title: '鏂板缓鐢垫睜缁�' - ,area:['1200px', '520px'] - ,resize: false - ,content: 'iframe/batt-info-add.html' - }); - } - }); + }); + }); + }); + + // 鑾峰彇鏈�澶ц澶噄d + function getMaxDevId(callback) { + var load = layer.load(1); + // 鏌ヨ鍚庡彴 + $.ajax({ + type: 'post' + ,async: true + ,url: 'BattInfAction!searchmaxdev_id' + ,data:null + ,dataType: 'json' + ,success:function(res) { + var rs = JSON.parse(res.result); + if(rs.data.length != 0) { + if(isFunction(callback)) { + callback(rs.data); + } + }else { + layer.msg('璁$畻璁惧id澶辫触锛�') + } + } + ,complete: function() { + layer.close(load); + } + + }); + } // 鏌ヨ鐢垫睜缁勪俊鎭� @@ -835,6 +911,65 @@ $('#number').val(page.size); } + // 妫�娴嬪綋鍓嶉〉闈㈡槸鍚﹀叿鏈夌紪杈戝拰鍒犻櫎鐨勫姛鑳�(0:涓嶅叿澶囦换浣曞姛鑳�, 1:鍏峰缂栬緫鍔熻兘锛� 2: 鍏峰鍒犻櫎鍔熻兘锛� 3鍏峰鍏ㄩ儴鍔熻兘) + function checkEditAndDel(permits) { + var rs = 0; + var isCanEdit = false; + var isCanDel = false; + + // 妫�娴嬫槸鍚﹀叿澶囩紪杈戠殑鍔熻兘 + isCanEdit = isHasPermit('battcfg_modify_permit', permits)?true:false; + + // 妫�娴嬫槸鍚﹀叿澶囧垹闄ょ殑鍔熻兘 + isCanDel = isHasPermit('battcfg_del_permit', permits)?true:false; + + + if(isCanEdit && isCanDel) { + rs = 3; // 鍏峰缂栬緫鍜屽垹闄ょ殑鍔熻兘 + }else if(isCanEdit) { + rs = 1 // 鍏峰缂栬緫鐨勫姛鑳� + }else if(isCanDel){ + rs = 2; // 鍏峰鍒犻櫎鐨勫姛鑳� + } + + return rs; + } + + // 淇敼琛ㄦ牸閰嶇疆閫夐」 + function changeTblOpts(num, opts) { + var col = opts.cols[0]; + var doThings = col[col.length-1]; + + console.log(doThings); + switch(num) { + case 1: + doThings.width = 100; + doThings.toolbar = '#battGrouptoolsEdit'; + break; + case 2: + doThings.width = 100; + doThings.toolbar = '#battGrouptoolsDel'; + break; + case 3: + doThings.toolbar = '#battGrouptools'; + break; + default: + col.length = col.length-1; + break; + + } + } + + // 妫�娴嬫坊鍔犳潈闄愬苟鍒ゆ柇鏄惁鏄剧ず鏂板缓 + function checkPermitAdd(permits) { + var isCanAdd = false; + // 妫�娴嬫槸鍚﹀叿澶囩紪杈戠殑鍔熻兘 + isCanAdd = isHasPermit('battcfg_add_permit', permits)?true:false; + + if(!isCanAdd) { + $('#paging .new-item').remove(); + } + } }); </script> </body> -- Gitblit v1.9.1