From 7b8e271ed8344866c0dbe56942625ccedb5564c7 Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期五, 02 十一月 2018 17:31:00 +0800 Subject: [PATCH] 问题反馈 --- gx_tieta/WebRoot/iframe/batt-fault-manage-add.html | 79 ++++++- gx_tieta/WebRoot/pages/css/mylayui.css | 31 +++ gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 470 +++++++++++++++++++++++++++++++++++++++++++++++ gx_tieta/WebRoot/batt-fault-manage.jsp | 19 + 4 files changed, 576 insertions(+), 23 deletions(-) diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp index 19ece7e..f4e8130 100644 --- a/gx_tieta/WebRoot/batt-fault-manage.jsp +++ b/gx_tieta/WebRoot/batt-fault-manage.jsp @@ -86,6 +86,7 @@ <a href="javascript:" id="export_table" class="layui-btn layui-btn-normal outbtn"><s:text name="Export"/></a> <!-- 瀵煎嚭 --> </div> </div> + <div id="closeUploadBtn"></div> <div id="details"></div> <div id="detailsOpts"></div> <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script> @@ -149,9 +150,10 @@ $(document).on('click','.addbtn',function(){ searchStationHistRecord(); }); + var uploadIframe; function searchStationHistRecord(){ // 鏄剧ず闈㈡澘 - layer.open({ + uploadIframe = layer.open({ type: 2, title: '<span style="font-weight:bold">>>闂娣诲姞</span>', area: ['1200px', '600px'], @@ -161,7 +163,12 @@ content: 'iframe/batt-fault-manage-add1.html' }); - } + } + + // 鍏抽棴涓婁紶鍥剧墖鐨勯潰鏉� + $('#closeUploadBtn').click(function() { + layer.close(uploadIframe); + }); // 鐪�-甯�-鏈烘埧-鐢垫睜缁� $(document).ready(function() { @@ -325,11 +332,10 @@ StationName2:$('#city').val(), StationName5:"", page:{ - pageSize:10, - pageCurr:1, + pageSize: 10, + pageCurr:1 }, }; - console.info(temp); return temp; } @@ -363,9 +369,8 @@ }else { layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true}); } - //console.info(tOptions); + var pageNum = tOptions.data.length; - //console.info(pageNum); tOptions.limit = pageNum; // 璁剧疆鍒嗛〉淇℃伅 $('#total').text(pageNum); diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html index e9cb1f4..60b1953 100644 --- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html +++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html @@ -38,21 +38,24 @@ <table> <tbody> <tr> - <th>鐪�</th> - <!-- 鐪� --> - <th>甯�</th> - <!-- 甯� --> - <th>鏈烘埧鍚嶇О</th> - <!-- 鏈烘埧绔欑偣 --> + <th>鐪�</th> <!-- 鐪� --> + <th>甯�</th> <!-- 甯� --> + <th>鍖�/鍘�</th> <!-- 鍖�/鍘� --> + <th>鏈烘埧鍚嶇О</th> <!-- 鏈烘埧绔欑偣 --> </tr> <tr> - <td><select name="station_name1" id="station_name1" lay-verify=""> - - </select></td> - <td><select name="" id="city" lay-verify=""> - </select></td> - <td><select name="" id="station_name3" lay-verify=""> - </select></td> + <td> + <select name="station_name1" id="station_name1"></select>銆� + </td> + <td> + <select name="" id="city"></select> + </td> + <td> + <select name="" id="county"></select> + </td> + <td> + <select name="" id="station_name3" ></select> + </td> </tr> </tbody> </table> @@ -201,18 +204,64 @@ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>'); renderForm(); } - findStationNamebyStationname1(); + searchCounty(); } }); } + + // 鏌ヨ鍖�/鍘� + function searchCounty() { + // 鏋勯�犳煡璇㈡潯浠� + var tmp = { + StationName1: $("#province").val(), + StationName2: $("#city").val() + }; + // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹� + $.ajax({ + type: 'post', + async: true, + url: 'BattInfAction!serchStationName5', + dataType: 'json', + data: "json = "+JSON.stringify(tmp), + success: function(result) { + var rs = JSON.parse(result.result); + var list = []; // option缁撴灉闆� + var ele = $('#county'); // 鐩爣select + 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 _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data); + list.push(_tmp); + } + }else { + list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined)); + } + + // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃 + createLayuiSelect(ele, list); + form.render('select', 'countyFilter'); + + // 鏌ヨ鏈烘埧 + findCity(); + } + }); + } //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯� $('#station_name1').change(function() { findCity(); }); //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣 $('#city').change(function() { - findStationNamebyStationname1(); + searchCounty(); }); + // 鍒囨崲鍖�/鍘�-鏈烘埧 + form.on('select(county)', function(data) { + // 鏌ヨ鏈烘埧 + findCity(true); + }); //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐� function findStationNamebyStationname1() { diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html new file mode 100644 index 0000000..1346e26 --- /dev/null +++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html @@ -0,0 +1,470 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta http-equiv="X-UA-Compatible" content="ie=edge"> + <title>娣诲姞闂鍙嶉</title> + <link rel="stylesheet" type="text/css" href="../pages/css/base.css"> + <link rel="stylesheet" type="text/css" href="../jqueryui/jquery-ui.css"> + <link rel="stylesheet" type="text/css" href="../src/css/layui.css"> + <link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css"> + <style> + .bottom-btn { + position: absolute; + bottom: 10px; + right: 20px; + } + </style> +</head> +<body> + <div class="layui-page-container"> + <!-- 鏉′欢绛涢�� --> + <div class="layui-page-filter"> + <div class="page-filter-header layui-page-filter-fweight">闂鍙嶉</div> + <div class="page-filter-content"> + <table> + <tr class="layui-page-filter-tbl-header layui-page-filter-fweight"> + <td>鐪�</td> <!-- 鐪� --> + <td>甯�</td> <!-- 甯� --> + <td>鍖�/鍘�</td> <!-- 鍖�/鍘� --> + <td>鏈烘埧鍚嶇О</td> <!-- 鏈烘埧鍚嶇О --> + </tr> + <tr> + <td> + <div class="layui-form" lay-filter="provinceFilter"> + <div class="layui-form-item"> + <div class="layui-input-block"> + <select name="province" id="province" lay-filter="province"> + <option value="">璇烽�夋嫨鐪�</option> + </select> + </div> + </div> + </div> + </td> + <td> + <div class="layui-form" lay-filter="cityFilter"> + <div class="layui-form-item"> + <div class="layui-input-block"> + <select name="city" id="city" lay-filter="city"> + <option value="">璇烽�夋嫨甯�/鍖�</option> + </select> + </div> + </div> + </div> + </td> + <td> + <div class="layui-form" lay-filter="countyFilter"> + <div class="layui-form-item"> + <div class="layui-input-block"> + <select name="county" id="county" lay-filter="county"> + <option value="">璇烽�夋嫨鍖�/鍘�</option> + </select> + </div> + </div> + </div> + </td> + <td style="width: 530px"> + <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"> + <option value="">璇烽�夋嫨鏈烘埧</option> + </select> + </div> + </div> + </div> + </td> + </tr> + </table> + </div> + </div> + <!-- 椤甸潰涓婚鍐呭 --> + <div class="layui-page-content abs abs-top100"> + <div class="abs-container"> + <div class="layui-upload"> + <div class="layui-upload-list"> + <table class="layui-table"> + <thead> + <tr> + <th>鍥剧墖棰勮</th> + <th>鏂囦欢鍚�</th> + <th>澶у皬</th> + <th>鎿嶄綔</th> + </tr> + </thead> + <tbody id="imgsInfo"></tbody> + </table> + </div> + </div> + <div class="layui-form layui-form-pane" style="margin-bottom: 60px;"> + <label class="layui-form-label">闂鎻忚堪</label> + <div class="layui-form-item layui-form-text"> + <div class="layui-input-block"> + <textarea placeholder="闂鎻忚堪" class="layui-textarea" name="desc" id="desc"></textarea> + </div> + </div> + </div> + </div> + </div> + <div class="bottom-btn"> + <button type="button" class="layui-btn layui-btn-normal" id="addImgs">娣诲姞鍥剧墖</button> + <button type="button" class="layui-btn layui-btn-normal" id="addImgsAction">鎻愪氦鍙嶉</button> + </div> + </div> + <div style="display:none"> + <form action="#" method="post" enctype="multipart/form-data" id="noImgForm"> + <input type="file" id="noImg" accept="image/png"/> <!-- 鐝粍logo --> + </form> + </div> + <script type="text/javascript" src="../js/jquery-1.8.3.js"></script> + <script type="text/javascript" src="../js/base.js"></script> + <script type="text/javascript" src="../jqueryui/jquery-ui.min.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"> + layui.use(['form','table', 'upload', 'layer'], function() { + var form = layui.form; + var upload = layui.upload; + var layer = layui.layer; + + + // 鍥剧墖涓婁紶 + var imgsInfo = $('#imgsInfo'); + var date = new Date(); + var addImgsOpts = { + json:{ + 'record_time': date.format('yyyy-MM-dd hh:mm:ss'), // 鎻愪氦鏃ユ湡 + 'error_descript': '', + 'stationId': '', + 'picture_num':4 + }, + files: {} + + }; + + var uploadImgs = upload.render({ + elem: '#addImgs' + ,url: 'Deverror_recordAction!add' + ,accept: 'file' + ,multiple: true + ,number: 4 + ,auto: false + ,bindAction: '#addImgsActionTmp' + ,choose: function(obj){ + addImgsOpts.files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪 + var files = this.files = obj.pushFile(); + //璇诲彇鏈湴鏂囦欢 + obj.preview(function(index, file, result){ + var tr = $(['<tr id="upload-'+ index +'">' + ,'<td><img src="'+result+'">' + ,'<td>'+ file.name +'</td>' + ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>' + ,'<td>' + ,'<button class="layui-btn layui-btn-xs imgs-reload layui-hide">閲嶄紶</button>' + ,'<button class="layui-btn layui-btn-xs layui-btn-danger imgs-delete">鍒犻櫎</button>' + ,'</td>' + ,'</tr>'].join('')); + + //鍗曚釜閲嶄紶 + tr.find('.imgs-reload').on('click', function(){ + obj.upload(index, file); + }); + + //鍒犻櫎 + tr.find('.imgs-delete').on('click', function(){ + delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠� + tr.remove(); + uploadImgs.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙�� + }); + + imgsInfo.append(tr); + }); + } + }); + + var closePage = parent.$('#closeUploadBtn'); + + // 鐐瑰嚮娣诲姞鐢熸垚 + $('#addImgsAction').click(function() { + uploadQuestionImgs(); + }); + + + + // 涓婁紶 + function uploadQuestionImgs() { + // 鏇存柊鍐呭 + createUploadData(); + var formData = new FormData(); + + var files = addImgsOpts.files; + var filesArr = []; + Object.keys(files).forEach(function(key) { + filesArr.push(files[key]); + }); + + addImgsOpts.json.picture_num = filesArr.length; + var json = JSON.stringify(addImgsOpts.json); + formData.append('json', json); + for(var i=0;i<filesArr.length; i++) { + var _files = filesArr[i]; + formData.append('file', _files); + if(i==0) { + formData.append('fileType', 'picture_one'); + } + + if(i==1) { + formData.append('fileType', 'picture_two'); + } + + if(i==2) { + formData.append('fileType', 'picture_three'); + } + + if(i==3) { + formData.append('fileType', 'picture_four'); + } + } + + if(addImgsOpts.json.picture_num>4) { + layer.msg('鏈�澶氫笂浼�4寮犲浘鐗�'); + return; + } + + if(addImgsOpts.json.stationId == 0) { + layer.msg('璇烽�夋嫨鏈烘埧锛侊紒锛�'); + return; + } + var load = layer.load(1); + $.ajax({ + type: "post", + url: "Deverror_recordAction!add", + async:true, + dataType:'text', + data:formData, + contentType: false,//杩欓噷 + processData: false,//杩欎袱涓竴瀹氳缃负false + success: function(data){ + layer.close(load); + layer.closeAll(); + layer.msg('涓婁紶鎴愬姛锛�3绉掑悗鑷姩鍏抽棴') ; + setTimeout(function() { + closePage.click(); + }, 3000); + }, + error:function(e){ + layer.close(load); + layer.msg('涓婁紶澶辫触锛�') ; + } + }); + } + + + // 鏇存柊涓婁紶鍚庡彴鐨勪俊鎭� + function createUploadData() { + var home = $('#home').find('option:selected'); + var stationid = home.attr('stationid')?home.attr('stationid'):0; + + var json = addImgsOpts.json; + json.record_time = date.format('yyyy-MM-dd hh:mm:ss'); // 鎻愪氦鏃ユ湡 + json.error_descript = $('#desc').val(); // 闂鎻忚堪 + json.stationId = stationid; + } + + // 鏌ヨ鐪佷笅鎷夋 + var filterLoad = layer.load(); + searchProvince(); + // 鏌ヨ鐪� + function searchProvince() { + // 璇锋眰鍚庡彴鏌ヨ + $.ajax({ + type:'post', + async:true, + url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup', + data: null, + dataType: 'json', + success:function(result) { + var rs = JSON.parse(result.result); + var list = []; // option缁撴灉闆� + var ele = $('#province'); // 鐩爣select + 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 _tmp = getLayuiSelect(_data, _data, {}, {}); + list.push(_tmp); + } + }else { + list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined)); + } + + // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃 + createLayuiSelect(ele, list); + form.render('select', 'provinceFilter'); + + // 鏌ヨ甯� + searchCity(); + } + }); + } + + // 鍒囨崲鐪�-甯� + form.on('select(province)', function(data) { + // 鏌ヨ甯� + searchCity(true); + }); + + // 鏌ヨ甯� + function searchCity(isLoad) { + // 鏋勯�犳煡璇㈡潯浠� + var tmp = { + StationName1: $("#province").val() + }; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹� + $.ajax({ + type: 'post', + async: true, + url: 'BattInfAction!serchStationName2', + dataType: 'json', + data: "json = "+JSON.stringify(tmp), + success: function(result) { + var rs = JSON.parse(result.result); + var list = []; // option缁撴灉闆� + var ele = $('#city'); // 鐩爣select + 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 _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data); + list.push(_tmp); + } + }else { + list.push(getLayuiSelect('鏆傛棤甯�', '', {}, undefined)); + } + + // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃 + createLayuiSelect(ele, list); + form.render('select', 'cityFilter'); + // 鏌ヨ鍖�/鍘� + searchCounty(); + } + }); + } + + // 鏌ヨ鍖�/鍘� + function searchCounty(isLoad) { + // 鏋勯�犳煡璇㈡潯浠� + var tmp = { + StationName1: $("#province").val(), + StationName2: $("#city").val() + }; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹� + $.ajax({ + type: 'post', + async: true, + url: 'BattInfAction!serchStationName5', + dataType: 'json', + data: "json = "+JSON.stringify(tmp), + success: function(result) { + var rs = JSON.parse(result.result); + var list = []; // option缁撴灉闆� + var ele = $('#county'); // 鐩爣select + 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 _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data); + list.push(_tmp); + } + }else { + list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined)); + } + + // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃 + createLayuiSelect(ele, list); + form.render('select', 'countyFilter'); + + // 鏌ヨ鏈烘埧 + searchHome(); + } + }); + } + + + // 鍒囨崲甯�-鍖�/鍘� + form.on('select(city)', function(data) { + // 鏌ヨ鍖�/鍘� + searchCounty(true); + }); + + // 鍒囨崲鍖�/鍘�-鏈烘埧 + form.on('select(county)', function(data) { + // 鏌ヨ鏈烘埧 + searchHome(true); + }); + + // 鏌ヨ鏈烘埧 + function searchHome(isLoad) { + // 鏋勯�犳煡璇㈡潯浠� + var tmp = { + StationName1:$("#province").val(), + StationName2:$("#city").val(), + StationName5:$("#county").val() + }; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹� + $.ajax({ + type: 'post', + async: true, + url: 'BattInfAction!serchStationName3', + dataType: 'json', + data: "json = "+JSON.stringify(tmp), + success: function(result) { + var rs = JSON.parse(result.result); + var list = []; // option缁撴灉闆� + var ele = $('#home'); // 鐩爣select + if(rs.code == 1) { + var data = rs.data; + list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: ''}, undefined)); + // 閬嶅巻鏌ヨ缁撴灉 + for(var i=0; i<data.length; i++) { + var _data = data[i]; + var _attr = { + StationId: _data.StationId + }; + var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data); + list.push(_tmp); + } + }else { + list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined)); + } + + layer.close(filterLoad); + // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃 + createLayuiSelect(ele, list); + form.render('select', 'homeFilter'); + } + }); + } + }); + </script> +</body> +</html> \ No newline at end of file diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css index 6a52b37..d51a07c 100644 --- a/gx_tieta/WebRoot/pages/css/mylayui.css +++ b/gx_tieta/WebRoot/pages/css/mylayui.css @@ -11,7 +11,7 @@ /* layui-page-filter */ .page-filter-header { - line-height: 36px; + line-height: 32px; background: url('../images/table_th_bg.gif') repeat-x; text-align:center; } @@ -95,6 +95,35 @@ width:100%; } +body .layui-table th { + padding-top: 6px; + padding-bottom: 6px; +} +.abs { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + overflow:hidden; +} +.abs .abs-container { + position: relative; + height: 100%; + overflow-y: auto; +} +/* abs-top */ +.abs.abs-top100 { + top: 100px; +} + +/* abs-bottom */ +.abs.abs-bottom60 { + bottom: 60px; +} +.abs.abs-bottom120 { + bottom: 120px; +} /* width */ .w272 { width: 272px; -- Gitblit v1.9.1