From 42e3fa840d684d5a9f4c09de448b69ee39917bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 30 Dec 2024 07:50:38 +0800
Subject: [PATCH] 'commit'

---
 .../dataease/dataList_proxy_province.html     |   5 +-
 .../dataease/dataMod_proxy_province.html      | 201 ++++++++----------
 2 files changed, 93 insertions(+), 113 deletions(-)
diff --git a/WebRoot/html/pages/dataease/dataList_proxy_province.html b/WebRoot/html/pages/dataease/dataList_proxy_province.html
index 350324dd..eb84deae 100644
--- a/WebRoot/html/pages/dataease/dataList_proxy_province.html
+++ b/WebRoot/html/pages/dataease/dataList_proxy_province.html
@@ -51,7 +51,7 @@
 
             <script type="text/html" id="table-bar">
                 <span class="woo-tool-span woo-tool-text-span" lay-event="uploadData"><a
-                    class="woo-theme-color">上传数据</a></span>  
+                    class="woo-theme-color">全量更新</a></span>
                 <i class="woo-tool-text-delimiter"></i>                
                 <span class="woo-tool-span woo-tool-text-span" lay-event="downloadData"><a
                     class="woo-theme-color">下载数据</a></span>  
@@ -60,9 +60,6 @@
                         class="woo-theme-color">数据维护</a></span>
                     
             </script>
-
-
-
         </div>
     </div>
 
diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_province.html b/WebRoot/html/pages/dataease/dataMod_proxy_province.html
index fe913308..7d13c4e6 100644
--- a/WebRoot/html/pages/dataease/dataMod_proxy_province.html
+++ b/WebRoot/html/pages/dataease/dataMod_proxy_province.html
@@ -68,135 +68,118 @@
 </head>
 
 <body class="layui-form">
-    <div class="layui-card" style="margin-top: 50px;">
-        <div class="layui-card-body">
-            <!-- <button type="button" class="layui-btn" id="getData">获取数据</button> -->
-            <div class="fix">
-                <button type="button" class="layui-btn" id="saveData">保存</button>
-                <button type="button" class="layui-btn" id="back">返回</button>
-            </div>
-            <table id="ID-table-demo-data"></table>
-
-            <script type="text/html" id="table-bar">
-                <span class="woo-tool-span woo-tool-text-span" lay-event="add"><a
-                    class="woo-theme-color">向下插入</a></span>   
-                    <span class="woo-tool-span woo-tool-text-span" lay-event="delete"><a
-                        class="woo-theme-color">删除</a></span>   
-            </script>
+<div class="layui-card" style="margin-top: 50px;">
+    <div class="layui-card-body">
+        <!-- <button type="button" class="layui-btn" id="getData">获取数据</button> -->
+        <div class="fix">
+            <button type="button" class="layui-btn" id="saveData">保存</button>
+            <button type="button" class="layui-btn" id="back">返回</button>
+        </div>
+        <table id="ID-table-demo-data"></table>
 
+        <script type="text/html" id="table-bar">
+            <span class="woo-tool-span woo-tool-text-span" lay-event="delete"><a
+                    class="woo-theme-color">删除</a></span>
+        </script>
 
 
-        </div>
     </div>
+</div>
+
+<!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
+<script src="../js/layui/layui.js"></script>
+<script>
+    layui.use('table', function () {
+        var table = layui.table;
+        var $ = layui.jquery;
+        var id = GetQueryString("id");
+        var _data = [];
+        $.ajax({
+            type: "GET",
+            async: false,
+            url: '/dsBase/dataease/getDataSetContentByProvince?id=' + id,
+            dataType: "json",
+            success: function (res) {
+                _data = res.data;
+            }
+        });
 
-    <!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
-    <script src="../js/layui/layui.js"></script>
-    <script>
-        layui.use('table', function () {
-            var table = layui.table;
-            var $ = layui.jquery;
-            var util = layui.util;
 
-            var id = GetQueryString("id");
+        var _emptyData = {};
+        var _cols = [];
+        let keys = Object.keys(_data[0]);
 
-            // var id = "3";
+        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
+        });
 
-            var _data = [];
+        table.on('tool(ID-table-demo-data)', function (obj) {
+            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;
+            });
 
             $.ajax({
-                type: "GET",
-                async: false,
-                url: '/dsBase/dataease/getDataSetContentByProvince?id=' + id,
+                type: "POST",
                 dataType: "json",
+                async: false,
+                url: '/dsBase/dataease/saveDataSetByProvince',
+                data: {
+                    "id": id,
+                    "data": JSON.stringify(cleanedData)
+                },
                 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
-            });
-
-            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;
-                    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;
-                });
-
-                $.ajax({
-                    type: "POST",
-                    dataType: "json",
-                    async: false,
-                    url: '/dsBase/dataease/saveDataSetByProvince',
-                    data: {
-                        "id": id,
-                        "data": JSON.stringify(cleanedData)
-                    },
-                    success: function (res) {
-                        if (res.success) {
-                            layer.msg("保存成功！", {
-                                icon: 1,
-                                time: 1300
-                            });
-                        } else {
-                            layer.msg(res.message, {
-                                icon: 2,
-                                time: 2000
-                            });
-                        }
+                    if (res.success) {
+                        layer.msg("保存成功！", {
+                            icon: 1,
+                            time: 1300
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2,
+                            time: 2000
+                        });
                     }
-                });
+                }
             });
+        });
 
 
-            $("#back").click(function () {
-                history.back();
-            });
+        $("#back").click(function () {
+            history.back();
+        });
 
 
-            function GetQueryString(name, istop) {
-                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-                var r = window.location.search.substr(1).match(reg);
-                if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+        function GetQueryString(name, istop) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+            var r = window.location.search.substr(1).match(reg);
+            if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
 
-                if (r != null) return unescape(r[2]);
-                return null;
-            }
-        });
-    </script>
+            if (r != null) return unescape(r[2]);
+            return null;
+        }
+    });
+</script>
 
 </body>
 
