From b463ec8735a8dcc9f5c907a22e48f1d954bb0337 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Wed, 13 Nov 2024 10:25:40 +0800 Subject: [PATCH] 'commit' --- .../pages/dataease/dataList_proxy_city.html | 17 +++--------- .../dataease/dataList_proxy_province.html | 25 +++++------------- .../dataease/dataMod_proxy_province.html | 4 +-- .../pages/dataease/upload_proxy_province.html | 2 +- .../D51B1743-0E2D-4175-BAF7-43FF554B8E4E.xlsx | Bin 0 -> 10377 bytes 5 files changed, 13 insertions(+), 35 deletions(-) create mode 100644 WebRoot/upload/D51B1743-0E2D-4175-BAF7-43FF554B8E4E.xlsx diff --git a/WebRoot/html/pages/dataease/dataList_proxy_city.html b/WebRoot/html/pages/dataease/dataList_proxy_city.html index 3f3c7d10..f3e96937 100644 --- a/WebRoot/html/pages/dataease/dataList_proxy_city.html +++ b/WebRoot/html/pages/dataease/dataList_proxy_city.html @@ -88,21 +88,12 @@ { title: '序号', align: 'center', width: "5%", type: 'numbers' }, { title: '分类', field: 'parent_name', align: 'center' }, { title: '数据集', field: 'dataset_name', align: 'center' }, - { title: '已填数据(条)', field: 'fill_count', align: 'center' }, + // { title: '已填数据(条)', field: 'fill_count', align: 'center' }, // { title: '表名', field: 'table_name', align: 'center' }, { title: '操作', toolbar: '#table-bar', align: 'center', width: 390 } ]], skin: 'line', - defaultToolbar: [], - parseData: function (res) { - var data = res.data; - for (var i = 0; i < data.length; i++) { - if (data[i].fill_count > 0) { - data[i].LAY_CHECKED = true; - } - } - return res; - } + defaultToolbar: [] }); table.on('tool(data-table)', function (obj) { @@ -120,12 +111,10 @@ content: './upload_proxy_city.html?id=' + obj.data.id }); - } else if (obj.event === 'downloadSample') { - window.location.href = "/dsBase/dataease/downSampleExcel?id=" + obj.data.id; } else if (obj.event === 'downloadData') { window.location.href = "/dsBase/dataease/downloadExcelByCity?id=" + obj.data.id; } else { - window.location.href = "./dataMod_proxy.html?id=" + obj.data.id + window.location.href = "./dataMod_proxy_city.html?id=" + obj.data.id } }); }); diff --git a/WebRoot/html/pages/dataease/dataList_proxy_province.html b/WebRoot/html/pages/dataease/dataList_proxy_province.html index 3f3c7d10..13e00f04 100644 --- a/WebRoot/html/pages/dataease/dataList_proxy_province.html +++ b/WebRoot/html/pages/dataease/dataList_proxy_province.html @@ -76,7 +76,7 @@ table.render({ elem: '#data-table', - url: '/dsBase/dataease/getDataSetByCity', + url: '/dsBase/dataease/getDataSetByProvince', height: 'full-35', page: { limit: 20 @@ -88,25 +88,16 @@ { title: '序号', align: 'center', width: "5%", type: 'numbers' }, { title: '分类', field: 'parent_name', align: 'center' }, { title: '数据集', field: 'dataset_name', align: 'center' }, - { title: '已填数据(条)', field: 'fill_count', align: 'center' }, + // { title: '已填数据(条)', field: 'fill_count', align: 'center' }, // { title: '表名', field: 'table_name', align: 'center' }, { title: '操作', toolbar: '#table-bar', align: 'center', width: 390 } ]], skin: 'line', - defaultToolbar: [], - parseData: function (res) { - var data = res.data; - for (var i = 0; i < data.length; i++) { - if (data[i].fill_count > 0) { - data[i].LAY_CHECKED = true; - } - } - return res; - } + defaultToolbar: [] }); table.on('tool(data-table)', function (obj) { - window.location.href = "./dataMod_proxy_city.html?id=" + obj.data.id; + window.location.href = "./dataMod_proxy_province.html?id=" + obj.data.id; }); @@ -117,15 +108,13 @@ title: '上传数据', area: ['600px', '230px'], shade: 0.1, - content: './upload_proxy_city.html?id=' + obj.data.id + content: './upload_proxy_province.html?id=' + obj.data.id }); - } else if (obj.event === 'downloadSample') { - window.location.href = "/dsBase/dataease/downSampleExcel?id=" + obj.data.id; } else if (obj.event === 'downloadData') { - window.location.href = "/dsBase/dataease/downloadExcelByCity?id=" + obj.data.id; + window.location.href = "/dsBase/dataease/downloadExcelByProvince?id=" + obj.data.id; } else { - window.location.href = "./dataMod_proxy.html?id=" + obj.data.id + window.location.href = "./dataMod_proxy_province.html?id=" + obj.data.id } }); }); diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_province.html b/WebRoot/html/pages/dataease/dataMod_proxy_province.html index c54dd7c5..83da7cbc 100644 --- a/WebRoot/html/pages/dataease/dataMod_proxy_province.html +++ b/WebRoot/html/pages/dataease/dataMod_proxy_province.html @@ -107,7 +107,7 @@ $.ajax({ type: "GET", async: false, - url: '/dsBase/dataease/getDataSetContentByCity?id=' + id, + url: '/dsBase/dataease/getDataSetContentByProvince?id=' + id, dataType: "json", success: function (res) { _data = res.data; @@ -157,7 +157,7 @@ type: "POST", dataType: "json", async: false, - url: '/dsBase/dataease/saveDataSetByCity', + url: '/dsBase/dataease/saveDataSetByProvince', data: { "id": id, "data": JSON.stringify(cleanedData) diff --git a/WebRoot/html/pages/dataease/upload_proxy_province.html b/WebRoot/html/pages/dataease/upload_proxy_province.html index a039004f..2215c213 100644 --- a/WebRoot/html/pages/dataease/upload_proxy_province.html +++ b/WebRoot/html/pages/dataease/upload_proxy_province.html @@ -95,7 +95,7 @@ upload.render({ elem: '#ID-upload-demo-choose', - url: '/dsBase/dataease/uploadExcelByCity', + url: '/dsBase/dataease/uploadExcelByProvince', data: { id, }, diff --git a/WebRoot/upload/D51B1743-0E2D-4175-BAF7-43FF554B8E4E.xlsx b/WebRoot/upload/D51B1743-0E2D-4175-BAF7-43FF554B8E4E.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..82eb79740bf683b93e4323be676fbc59b3471793 GIT binary patch literal 10377 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