diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/Achievement_Inputing.iml b/.idea/Achievement_Inputing.iml
new file mode 100644
index 0000000..dc8224d
--- /dev/null
+++ b/.idea/Achievement_Inputing.iml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..55df007
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e478376
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/__pycache__/ESConnect.cpython-312.pyc b/__pycache__/ESConnect.cpython-312.pyc
new file mode 100644
index 0000000..68c251a
Binary files /dev/null and b/__pycache__/ESConnect.cpython-312.pyc differ
diff --git a/__pycache__/json_converter.cpython-312.pyc b/__pycache__/json_converter.cpython-312.pyc
new file mode 100644
index 0000000..eaa2e98
Binary files /dev/null and b/__pycache__/json_converter.cpython-312.pyc differ
diff --git a/app.py b/app.py
index c8c66db..059b809 100644
--- a/app.py
+++ b/app.py
@@ -474,7 +474,10 @@ def upload_image():
# 确认录入路由
@app.route('/confirm', methods=['POST'])
+<<<<<<< HEAD
@user_or_admin_required
+=======
+>>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
def confirm_data():
"""
确认并录入用户编辑后的数据
@@ -499,11 +502,18 @@ def confirm_data():
data_string = json_to_string(edited_data)
print(f"转换后的数据字符串: {data_string}")
+<<<<<<< HEAD
# 构造新的数据结构，只包含data和image字段，并添加用户ID
processed_data = {
"data": data_string,
"image": image_filename, # 存储图片文件名
"user_id": session['user_id'] # 添加用户ID关联
+=======
+ # 构造新的数据结构，只包含data和image字段
+ processed_data = {
+ "data": data_string,
+ "image": image_filename # 存储图片文件名
+>>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
}
print(f"准备存储的数据: {processed_data}")
diff --git a/image/0a4904ba-aae4-4ede-b1bd-801f63f4c0d3_dc11122fd34b490a8ffcc04c2ada900b.png b/image/0a4904ba-aae4-4ede-b1bd-801f63f4c0d3_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/0a4904ba-aae4-4ede-b1bd-801f63f4c0d3_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/1814ed10-ca0c-43f7-91f2-8c4e3d4be9c8_dc11122fd34b490a8ffcc04c2ada900b.png b/image/1814ed10-ca0c-43f7-91f2-8c4e3d4be9c8_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/1814ed10-ca0c-43f7-91f2-8c4e3d4be9c8_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/2dff2e23-2208-4894-b2e7-4e6ba0913bad_dc11122fd34b490a8ffcc04c2ada900b.png b/image/2dff2e23-2208-4894-b2e7-4e6ba0913bad_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/2dff2e23-2208-4894-b2e7-4e6ba0913bad_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/4323af3d-9fcd-4e6d-8e68-76c55f34589c_dc11122fd34b490a8ffcc04c2ada900b.png b/image/4323af3d-9fcd-4e6d-8e68-76c55f34589c_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/4323af3d-9fcd-4e6d-8e68-76c55f34589c_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/4a604c91-b5cd-43da-bb68-5e206def5bdd_dc11122fd34b490a8ffcc04c2ada900b.png b/image/4a604c91-b5cd-43da-bb68-5e206def5bdd_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/4a604c91-b5cd-43da-bb68-5e206def5bdd_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/7ac2aafc-a65a-43b0-894b-c5f1b10b504f_dc11122fd34b490a8ffcc04c2ada900b.png b/image/7ac2aafc-a65a-43b0-894b-c5f1b10b504f_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/7ac2aafc-a65a-43b0-894b-c5f1b10b504f_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/bfbd24fb-a0d5-4194-90ed-f208b74e11f7_dc11122fd34b490a8ffcc04c2ada900b.png b/image/bfbd24fb-a0d5-4194-90ed-f208b74e11f7_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/bfbd24fb-a0d5-4194-90ed-f208b74e11f7_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/e35ea7f3-71a5-4168-a8e7-45e9309efc4d_dc11122fd34b490a8ffcc04c2ada900b.png b/image/e35ea7f3-71a5-4168-a8e7-45e9309efc4d_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/e35ea7f3-71a5-4168-a8e7-45e9309efc4d_dc11122fd34b490a8ffcc04c2ada900b.png differ
diff --git a/image/f05dfec3-7060-48ac-bdcb-0ff2bf44ad83_dc11122fd34b490a8ffcc04c2ada900b.png b/image/f05dfec3-7060-48ac-bdcb-0ff2bf44ad83_dc11122fd34b490a8ffcc04c2ada900b.png
new file mode 100644
index 0000000..69ab541
Binary files /dev/null and b/image/f05dfec3-7060-48ac-bdcb-0ff2bf44ad83_dc11122fd34b490a8ffcc04c2ada900b.png differ