diff --git a/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx b/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx deleted file mode 100644 index fcd42e3f..00000000 Binary files a/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx and /dev/null differ diff --git a/WebRoot/html/pages/dataease/dataMod.html b/WebRoot/html/pages/dataease/dataMod.html index 06604da6..0edea975 100644 --- a/WebRoot/html/pages/dataease/dataMod.html +++ b/WebRoot/html/pages/dataease/dataMod.html @@ -68,115 +68,117 @@ -
-
- -
- -
-
- - +
- - - - - + + if (r != null) return unescape(r[2]); + return null; + } + }); + diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_city.html b/WebRoot/html/pages/dataease/dataMod_proxy_city.html index 5144f2d7..f83d9402 100644 --- a/WebRoot/html/pages/dataease/dataMod_proxy_city.html +++ b/WebRoot/html/pages/dataease/dataMod_proxy_city.html @@ -57,29 +57,47 @@ } .fix { - position: fixed; + /* position: fixed; top: 0; right: 10px; background-color: white; padding: 10px; - z-index: 1000; + z-index: 1000; */ + display: flex; + justify-content: space-between; + align-items: center; + height: 55px; } -
+
- - +
+
+ +
+
+ +
+
+
+ + + + +
@@ -96,91 +114,97 @@ var table = layui.table; var $ = layui.jquery; var util = layui.util; + var form = layui.form; var id = GetQueryString("id"); - // var id = "3"; - var _data = []; $.ajax({ type: "GET", async: false, - url: '/dsBase/dataease/getDataSetContentByCity?id=' + id, + url: '/dsBase/dataease/getDataSetContentByCity?id=' + id + '&pageNumber=1&pageSize=1', dataType: "json", success: function (res) { _data = res.data; } }); - - var _emptyData = {}; var _cols = []; let keys = Object.keys(_data[0]); keys.forEach((item, index) => { - _emptyData[item] = ""; var _obj = { field: item, title: item, edit: 'text', align: 'center' } _cols.push(_obj); }); _cols.push({ title: '操作', align: 'center', toolbar: '#table-bar' }); - table.render({ - elem: '#ID-table-demo-data', - id: 'ID-table-demo-data', - page: false, - cols: [_cols], - data: _data - }); + tableRender(); + + function tableRender() { + table.render({ + elem: '#ID-table-demo-data', + id: 'ID-table-demo-data', + url: '/dsBase/dataease/getDataSetContentByCity?id=' + id, + where: { + keyword: $("#keyword").val() + }, + height: 'full-90', + 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) { - if (obj.event === 'add') { - _data.splice(obj.index + 1, 0, _emptyData); - table.cache['ID-table-demo-data'] = _data; + layer.confirm('确定删除吗?', { icon: 0 }, function (index) { + var cacheData = table.cache['ID-table-demo-data']; + cacheData.splice(obj.index, 1) table.renderData('ID-table-demo-data'); - } else { - layer.confirm('确定删除吗?', { icon: 0 }, function (index) { - var cacheData = table.cache['ID-table-demo-data']; - cacheData.splice(obj.index, 1) - table.renderData('ID-table-demo-data'); - layer.close(index); - }); - } - }); - - $("#saveData").click(function () { - - const cleanedData = table.cache['ID-table-demo-data'].map(item => { - const { LAY_NUM, LAY_INDEX, ...rest } = item; - return rest; + layer.close(index); }); + }); + table.on('edit(ID-table-demo-data)', function (obj) { + var value = obj.value // 得到修改后的值 + , data = obj.data // 得到所在行所有数据 + , field = obj.field; // 得到字段名 + // 发送Ajax请求 $.ajax({ - type: "POST", - dataType: "json", - async: false, url: '/dsBase/dataease/saveDataSet', + type: 'POST', data: { - "id": id, - "data": JSON.stringify(cleanedData) + dataset_id: id, + id: data.id, + field: field, + value: value }, success: function (res) { if (res.success) { - layer.msg("保存成功!", { - icon: 1, - time: 1300 - }); + layer.msg('保存成功'); } else { - layer.msg(res.message, { - icon: 2, - time: 2000 - }); + layer.msg('保存失败'); } } }); }); + form.on('submit(user-query)', function () { + tableRender(); + + // 阻止表单的默认提交行为 + return false; + }); + $("#back").click(function () { history.back(); diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_province.html b/WebRoot/html/pages/dataease/dataMod_proxy_province.html index 7f115cd6..176a8a9e 100644 --- a/WebRoot/html/pages/dataease/dataMod_proxy_province.html +++ b/WebRoot/html/pages/dataease/dataMod_proxy_province.html @@ -68,118 +68,118 @@ -
-
- -
- - -
-
- - +
-
- - - - + + if (r != null) return unescape(r[2]); + return null; + } + }); +