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 00000000..82eb7974 Binary files /dev/null and b/WebRoot/upload/D51B1743-0E2D-4175-BAF7-43FF554B8E4E.xlsx differ