소스 검색

导出传参

ming 4 년 전
부모
커밋
0b5ef1bdf7
5개의 변경된 파일34개의 추가작업 그리고 12개의 파일을 삭제
  1. 7 6
      js/per-manage.js
  2. 16 3
      js/property.js
  3. 5 0
      js/userAccount.js
  4. 6 0
      js/userLog.js
  5. 0 3
      userAccount-manage.html

+ 7 - 6
js/per-manage.js

@@ -284,7 +284,6 @@ layui.use('layer', function() {
                 content: $(".addUserOut"),
                 success: function() {
                     $('.clsBtn,.cancel').click(function() {
-                        //alert(1)
                         layer.close(layerCreateIndex);
                     })
                 }
@@ -343,7 +342,6 @@ layui.use('layer', function() {
                     content: $(".editUserOut"),
                     success: function() {
                         $('.clsBtn,.cancel').click(function() {
-                            //alert(1)
                             layer.close(layerUpdateIndex);
                         })
                     }
@@ -352,7 +350,6 @@ layui.use('layer', function() {
         })
         //删除信息
     $('.delete').click(function() {
-        alert(1)
         if (!$('.pure-table tr').has('.checked').length) {
             layer.msg('请选择一条需要删除的信息!', { icon: 5 });
         } else {
@@ -578,12 +575,16 @@ function linkDep(element) {
 }
 
 // 导出 start
-$('.export').click(getDataExport)
+$('.export').click(function() {
+    getDataExport()
+        // getDataExport(getSearchParamObj(), 1)
+})
+
 
-function getDataExport() {
+function getDataExport(queryParam = {}) {
     // 输出base64编码
     const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-    ajaxRequest(USER_EXPORT, "POST", {}, function(result) {
+    ajaxRequest(USER_EXPORT, "POST", queryParam, function(result) {
         let data = result.data;
         let newData = [];
         data.forEach(function(item, index) {

+ 16 - 3
js/property.js

@@ -1,6 +1,9 @@
 var pageNo = 1;
 var totalPages = 0;
 
+var param1 = '';
+var param2 = '';
+
 //设备类型列表
 getListDataAjax();
 
@@ -70,8 +73,11 @@ function getListDataAjax(queryParam = {}, pageNo = 1) {
 
 //按钮搜索
 $('#buttonClick').on('click', function() {
+    param1 = $('#facilityName').val()
+    param2 = $('#addrs').val()
     pageNo = 1;
     getListDataAjax(getSearchParamObj());
+
 })
 
 //拼接搜索条件
@@ -110,10 +116,15 @@ $('.reset').click(resetForm)
 
 //重置表单
 function resetForm() {
+
+
     pageNo = 1;
     $("#facilityName").val("");
     $("#addrs").val("");
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#facilityName').val()
+    param2 = $('#addrs').val()
 }
 
 //类别下拉
@@ -175,13 +186,15 @@ function linkDep(element) {
 }
 
 // 导出 start
-$('.export').click(getDataExport)
+$('.export').click(function() {
+    getDataExport({ "facilityName": param1, "addrs": param2 })
+})
 
-function getDataExport() {
+function getDataExport(queryParam = {}) {
     // 输出base64编码
     const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
 
-    ajaxRequest(PROPERTY_EXPORT, "POST", {}, function(result) {
+    ajaxRequest(PROPERTY_EXPORT, "POST", queryParam, function(result) {
         let data = result.data;
         let newData = [];
         data.forEach(function(item, index) {

+ 5 - 0
js/userAccount.js

@@ -4,6 +4,8 @@ var totalPages = 0;
 var depname = 0;
 var companyId = 0;
 
+var param1 = '';
+
 //用户列表
 getListDataAjax();
 
@@ -74,6 +76,7 @@ function getListDataAjax(queryParam = {}, pageNo = 1) {
 
 //按钮搜索
 $('#buttonClick').on('click', function() {
+    param1 = $('#userName').val()
     pageNo = 1;
     getListDataAjax(getSearchParamObj());
 })
@@ -165,6 +168,8 @@ function resetForm() {
     $("#userName").val("");
     $('#roleId option').eq(0).prop("selected", true)
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#userName').val()
 }
 //拼接树搜索条件
 

+ 6 - 0
js/userLog.js

@@ -1,5 +1,11 @@
 var pageNo = 1;
 var totalPages = 0;
+
+var param1 = '';
+var param2 = '';
+var param3 = '';
+
+
 //数据列表
 getListDataAjax();
 

+ 0 - 3
userAccount-manage.html

@@ -323,8 +323,6 @@
         </div>
     </div>
 
-
-
     <script src="js/jquery.js"></script>
     <!-- <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script> -->
     <script src="js/md5.js"></script>
@@ -335,7 +333,6 @@
     <script src="js/userAccount.js"></script>
     <script src="js/main.js"></script>
 
-
 </body>
 
 </html>