From 8d2fb8e1da38c8bf22ccfe4884edcdc29cf4284b Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Tue, 3 Dec 2024 15:45:19 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/html/pages/dataease/dataMod.html            | 13 ++++++++-----
 WebRoot/html/pages/dataease/dataMod_proxy_city.html | 11 +++++++----
 .../html/pages/dataease/dataMod_proxy_province.html | 11 +++++++----
 src/main/java/com/dsideal/base/Test/Main.java       |  2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/WebRoot/html/pages/dataease/dataMod.html b/WebRoot/html/pages/dataease/dataMod.html
index dbfefe2d..1ff0fa04 100644
--- a/WebRoot/html/pages/dataease/dataMod.html
+++ b/WebRoot/html/pages/dataease/dataMod.html
@@ -121,7 +121,7 @@
 
             keys.forEach((item, index) => {
                 _emptyData[item] = "";
-                var _obj = { field: item, title: item, edit: 'text', align: 'center',expandedMode:'tips' }
+                var _obj = { field: item, title: item, edit: 'text', align: 'center', expandedMode: 'tips' }
                 _cols.push(_obj);
             });
             _cols.push({ title: '操作', align: 'center', toolbar: '#table-bar' });
@@ -140,9 +140,12 @@
                     table.cache['ID-table-demo-data'] = _data;
                     table.renderData('ID-table-demo-data');
                 } else {
-                    var cacheData = table.cache['ID-table-demo-data'];
-                    cacheData.splice(obj.index, 1)
-                    table.renderData('ID-table-demo-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');
+                        layer.close(index);
+                    });
                 }
             });
 
@@ -182,7 +185,7 @@
             $("#back").click(function () {
                 history.back();
             });
-            
+
 
             function GetQueryString(name, istop) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_city.html b/WebRoot/html/pages/dataease/dataMod_proxy_city.html
index c54dd7c5..96d63b10 100644
--- a/WebRoot/html/pages/dataease/dataMod_proxy_city.html
+++ b/WebRoot/html/pages/dataease/dataMod_proxy_city.html
@@ -140,9 +140,12 @@
                     table.cache['ID-table-demo-data'] = _data;
                     table.renderData('ID-table-demo-data');
                 } else {
-                    var cacheData = table.cache['ID-table-demo-data'];
-                    cacheData.splice(obj.index, 1)
-                    table.renderData('ID-table-demo-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');
+                        layer.close(index);
+                    });
                 }
             });
 
@@ -182,7 +185,7 @@
             $("#back").click(function () {
                 history.back();
             });
-            
+
 
             function GetQueryString(name, istop) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
diff --git a/WebRoot/html/pages/dataease/dataMod_proxy_province.html b/WebRoot/html/pages/dataease/dataMod_proxy_province.html
index 83da7cbc..fe913308 100644
--- a/WebRoot/html/pages/dataease/dataMod_proxy_province.html
+++ b/WebRoot/html/pages/dataease/dataMod_proxy_province.html
@@ -140,9 +140,12 @@
                     table.cache['ID-table-demo-data'] = _data;
                     table.renderData('ID-table-demo-data');
                 } else {
-                    var cacheData = table.cache['ID-table-demo-data'];
-                    cacheData.splice(obj.index, 1)
-                    table.renderData('ID-table-demo-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');
+                        layer.close(index);
+                    });
                 }
             });
 
@@ -182,7 +185,7 @@
             $("#back").click(function () {
                 history.back();
             });
-            
+
 
             function GetQueryString(name, istop) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
diff --git a/src/main/java/com/dsideal/base/Test/Main.java b/src/main/java/com/dsideal/base/Test/Main.java
index fe166aa9..27d322d1 100644
--- a/src/main/java/com/dsideal/base/Test/Main.java
+++ b/src/main/java/com/dsideal/base/Test/Main.java
@@ -3,7 +3,7 @@ package com.dsideal.base.Test;
 
 import java.util.Arrays;
 
-import com.alibaba.dashscope.aigc.generation.Generation;
+import com.alibaba.dashscope.aigc.generation .Generation;
 import com.alibaba.dashscope.aigc.generation.GenerationResult;
 import com.alibaba.dashscope.aigc.generation.models.QwenParam;
 import com.alibaba.dashscope.common.Message;