Commit da8666d0ca9232904f0258925a1c7f9b3053cabd

Authored by 娄高锋
1 parent 21467189

lgf

src/main/resources/static/pages/electricity/jdl/list.html
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 }); 117 });
118 118
119 //提交 119 //提交
120 - $('tr.filter .filter-submit').on('click', function () { 120 + $('tr.filter .filter-submit').on('click', function () {
121 var gsbm = $('#gsbm').val(); 121 var gsbm = $('#gsbm').val();
122 var fgsbm = $('#fgsbm').val(); 122 var fgsbm = $('#fgsbm').val();
123 if ($("#rq").val() == "" || $("#rq").val() ==null){ 123 if ($("#rq").val() == "" || $("#rq").val() ==null){
src/main/resources/static/pages/electricity/jdl/upload.html
@@ -79,6 +79,8 @@ @@ -79,6 +79,8 @@
79 layer.close(j); 79 layer.close(j);
80 alert(data.result); 80 alert(data.result);
81 // alert("文件导入成功"); 81 // alert("文件导入成功");
  82 + $('#uploadFile').modal('hide');
  83 + $('tr.filter .filter-submit').click();
82 }, 84 },
83 error : function(data, status, e) { 85 error : function(data, status, e) {
84 layer.close(j); 86 layer.close(j);
@@ -88,7 +90,7 @@ @@ -88,7 +90,7 @@
88 }); 90 });
89 91
90 $('#downLoad').on('click', function(){ 92 $('#downLoad').on('click', function(){
91 - window.open("/downloadFile/download?fileName=import_Jdl"); 93 + window.open("/downloadFile/downloadModel?fileName=import_Jdl");
92 }); 94 });
93 95
94 function getCurrSelNode(){ 96 function getCurrSelNode(){