From 30a7fd0d9f2f0cea4a21e60ea8a61ff94cc5f6f6 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Mon, 30 Dec 2024 09:16:39 +0800 Subject: [PATCH] 'commit' --- .../pages/dataease/dataMod_proxy_city.html | 12 +-- .../dataease/dataMod_proxy_province.html | 78 ++++++++++++------- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_city.html b/WebRoot/html/pages/dataease/dataMod_proxy_city.html index f83d9402..460b96bb 100644 --- a/WebRoot/html/pages/dataease/dataMod_proxy_city.html +++ b/WebRoot/html/pages/dataease/dataMod_proxy_city.html @@ -56,13 +56,7 @@ cursor: pointer; } - .fix { - /* position: fixed; - top: 0; - right: 10px; - background-color: white; - padding: 10px; - z-index: 1000; */ + .fix { display: flex; justify-content: space-between; align-items: center; @@ -89,10 +83,6 @@
- - - -
diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_province.html b/WebRoot/html/pages/dataease/dataMod_proxy_province.html index 176a8a9e..61a274d5 100644 --- a/WebRoot/html/pages/dataease/dataMod_proxy_province.html +++ b/WebRoot/html/pages/dataease/dataMod_proxy_province.html @@ -57,23 +57,32 @@ } .fix { - position: fixed; - top: 0; - right: 10px; - background-color: white; - padding: 10px; - z-index: 1000; + display: flex; + justify-content: space-between; + align-items: center; + height: 55px; } -
+
- - +
+
+ +
+
+ +
+
+
@@ -92,6 +101,8 @@ layui.use('table', function () { var table = layui.table; var $ = layui.jquery; + var form = layui.form; + var id = GetQueryString("id"); var _data = []; $.ajax({ @@ -112,24 +123,30 @@ _cols.push(_obj); }); _cols.push({ title: '操作', align: 'center', toolbar: '#table-bar' }); - - table.render({ - elem: '#ID-table-demo-data', - id: 'ID-table-demo-data', - url: '/dsBase/dataease/getDataSetContentByProvince?id=' + id, - height: 'full-85', - page: { - limit: 20 - , layout: ['count', 'prev', 'page', 'next', 'skip'] - , prev: "上一页" - , next: "下一页" - }, - request: { - pageName: 'pageNumber' //页码的参数名称，默认：page - , limitName: 'pageSize' //每页数据量的参数名，默认：limit - }, - cols: [_cols] - }); + tableRender(); + + function tableRender() { + table.render({ + elem: '#ID-table-demo-data', + id: 'ID-table-demo-data', + url: '/dsBase/dataease/getDataSetContentByProvince?id=' + id, + where: { + keyword: $("#keyword").val() + }, + height: 'full-85', + page: { + limit: 20 + , layout: ['count', 'prev', 'page', 'next', 'skip'] + , prev: "上一页" + , next: "下一页" + }, + request: { + pageName: 'pageNumber' //页码的参数名称，默认：page + , limitName: 'pageSize' //每页数据量的参数名，默认：limit + }, + cols: [_cols] + }); + } table.on('tool(ID-table-demo-data)', function (obj) { layer.confirm('确定删除吗？', { icon: 0 }, function (index) { @@ -164,6 +181,13 @@ }); }); + form.on('submit(user-query)', function () { + tableRender(); + + // 阻止表单的默认提交行为 + return false; + }); + $("#back").click(function () { history.back();