From 0e1870c9fa918fb4ae1c042a1308fefa5d3217f5 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Mon, 1 Sep 2025 11:16:24 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/Util/ShiTiRecognizer.py            |   3 +-
 dsLightRag/Util/ShouXieShiBie.py              |   1 +
 .../ShiTiRecognizer.cpython-310.pyc           | Bin 5378 -> 5382 bytes
 .../static/RecognizeEduQuestionOcr.html       | 361 +++++++++++-------
 4 files changed, 228 insertions(+), 137 deletions(-)
 create mode 100644 dsLightRag/Util/ShouXieShiBie.py

diff --git a/dsLightRag/Util/ShiTiRecognizer.py b/dsLightRag/Util/ShiTiRecognizer.py
index 6c8e5ff0..a0c5d6a3 100644
--- a/dsLightRag/Util/ShiTiRecognizer.py
+++ b/dsLightRag/Util/ShiTiRecognizer.py
@@ -165,7 +165,8 @@ if __name__ == '__main__':
     try:
         recognizer = ShiTiRecognizer()
         # 传入固定的图片URL
-        image_url = "https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShiTi.jpg"
+        #image_url = "https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShiTi.jpg"
+        image_url="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShouXieTi.jpg"
         result = recognizer.recognize_question(image_url)
 
         print("识别结果:")
diff --git a/dsLightRag/Util/ShouXieShiBie.py b/dsLightRag/Util/ShouXieShiBie.py
new file mode 100644
index 00000000..feb7bf65
--- /dev/null
+++ b/dsLightRag/Util/ShouXieShiBie.py
@@ -0,0 +1 @@
+# https://cloud.baidu.com/product/ocr_education
diff --git a/dsLightRag/Util/__pycache__/ShiTiRecognizer.cpython-310.pyc b/dsLightRag/Util/__pycache__/ShiTiRecognizer.cpython-310.pyc
index fea2efaf66887388e9cd8fd918db2b5510d0849d..e1ad839553c9b33cf03d33b060e5d10ce9e87a52 100644
GIT binary patch
delta 47
zcmZqDYSZG)=jG*M00IrRtr<Tz^3D}x^qag|(3v&AG$J!~^LxQJOpMHv?}(@}J^=tZ
Cln&1T

delta 43
ycmZqEYSQA(=jG*M00NWOTQa6><ee+X=rwt@pfh9U=Ffs}m>8KRKM+x6d<p;%`wh7O

diff --git a/dsLightRag/static/RecognizeEduQuestionOcr.html b/dsLightRag/static/RecognizeEduQuestionOcr.html
index 09ffaa36..76b30e43 100644
--- a/dsLightRag/static/RecognizeEduQuestionOcr.html
+++ b/dsLightRag/static/RecognizeEduQuestionOcr.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>教育场景识别</title>
-    <link rel="icon" href="data:">    
+    <link rel="icon" href="data:">
     <!-- 新增：引入MathJax库 -->
     <script src="https://gcore.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
     <!-- 新增：MathJax配置 -->
@@ -25,6 +25,38 @@
             background-color: #f5f5f5;
         }
 
+        .tab-container {
+            display: flex;
+            border-bottom: 1px solid #ccc;
+            margin-bottom: 20px;
+        }
+
+        .tab-button {
+            padding: 10px 20px;
+            border: none;
+            background: #f1f1f1;
+            cursor: pointer;
+            transition: all 0.3s ease;
+        }
+
+        .tab-button.active {
+            background: #4CAF50;
+            color: white;
+        }
+
+        .tab-button:hover:not(.active) {
+            background: #ddd;
+        }
+
+        .tab-content {
+            display: none;
+            padding: 10px;
+        }
+
+        .tab-content.active {
+            display: block;
+        }
+
         .container {
             max-width: 1200px;
             margin: 0 auto;
@@ -181,6 +213,7 @@
             background-color: #f9f9f9;
             line-height: 1.8; /* 优化行高 */
         }
+
         .option-item {
             margin: 8px 0; /* 为选项添加上下间距 */
             background-color: #f9f9f9;
@@ -212,7 +245,7 @@
             animation: spin 1s linear infinite !important;
             margin-bottom: 10px;
         }
-        
+
         .result-area {
             margin-top: 20px;
             min-height: 200px;
@@ -224,14 +257,19 @@
             position: relative; /* 关键：作为动画容器的定位基准 */
             overflow: hidden; /* 防止动画溢出 */
         }
+
         .option-item {
             margin: 8px 0; /* 为选项添加上下间距 */
             background-color: #f9f9f9;
         }
 
         @keyframes spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
+            0% {
+                transform: rotate(0deg);
+            }
+            100% {
+                transform: rotate(360deg);
+            }
         }
 
         /* 图片模态框样式 */
@@ -245,7 +283,7 @@
             width: 100%;
             height: 100%;
             overflow: auto;
-            background-color: rgba(0,0,0,0.9);
+            background-color: rgba(0, 0, 0, 0.9);
         }
 
         .modal-content {
@@ -276,58 +314,51 @@
     <h1>教育场景识别</h1>
 
     <div class="tab-container">
-        <button class="tab-button active" onclick="switchTab('formula')">公式识别</button>
-        <button class="tab-button" onclick="switchTab('question')">试题识别</button>
+        <button class="tab-button active" data-tab="formula" onclick="switchTab('formula')">公式识别</button>
+        <button class="tab-button" data-tab="question" onclick="switchTab('question')">试题识别</button>
+        <button class="tab-button" data-tab="handwriting" onclick="switchTab('handwriting')">手写识别</button>
     </div>
 
-    <!-- 公式识别标签页 -->
-    <div id="formula-tab" class="tab-content active">
-        <div class="example-section">
-            <h2>示例公式图片</h2>
-            <div class="example-images">
-                <div class="example-image-card">
-                    <img src="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/GongShi.jpg" alt="公式示例1" onclick="openModal(this.src)">
-                    <div class="description">数学公式示例</div>
-                </div>
-            </div>
-        </div>
+    <!-- 标签内容区域 -->
+    <div id="formula-content" class="tab-content active">公式识别内容...</div>
+    <div id="question-content" class="tab-content">试题识别内容...</div>
+    <div id="handwriting-content" class="tab-content">手写识别内容...</div>
 
-        <div class="recognize-section">
-            <h2>公式识别</h2>
-            <div class="input-area">
-                <div class="input-group">
-                    <input type="text" id="formulaImageUrl" placeholder="请输入图片URL或使用示例图片" value="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/GongShi.jpg">
-                    <button onclick="recognizeFormula()">识别公式</button>
-                </div>
-                <div id="formulaResult" class="result-area">
-                    <div style="color:#666; text-align:center; padding:20px;">识别结果将在此处显示</div>
-                </div>
+    <div class="example-section">
+        <h2>示例公式图片</h2>
+        <div class="example-images">
+            <div class="example-image-card">
+                <img src="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/GongShi.jpg" alt="公式示例1"
+                     onclick="openModal(this.src)">
+                <div class="description">数学公式示例</div>
             </div>
         </div>
     </div>
 
-    <!-- 试题识别标签页 -->
-    <div id="question-tab" class="tab-content">
-        <div class="example-section">
-            <h2>示例试题图片</h2>
-            <div class="example-images">
-                <div class="example-image-card">
-                    <img src="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShiTi.jpg" alt="试题示例1" onclick="openModal(this.src)">
-                    <div class="description">试题示例</div>
-                </div>
+    <div class="recognize-section">
+        <h2>公式识别</h2>
+        <div class="input-area">
+            <div class="input-group">
+                <input type="text" id="formulaImageUrl" placeholder="请输入图片URL或使用示例图片"
+                       value="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/GongShi.jpg">
+                <button onclick="recognizeFormula()">识别公式</button>
+            </div>
+            <div id="formulaResult" class="result-area">
+                <div style="color:#666; text-align:center; padding:20px;">识别结果将在此处显示</div>
             </div>
         </div>
+    </div>
 
-        <div class="recognize-section">
-            <h2>试题识别</h2>
-            <div class="input-area">
-                <div class="input-group">
-                    <input type="text" id="questionImageUrl" placeholder="请输入图片URL或使用示例图片" value="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShiTi.jpg">
-                    <button onclick="recognizeQuestion()">识别试题</button>
-                </div>
-                <div id="questionResult" class="result-area">
-                    <div style="color:#666; text-align:center; padding:20px;">识别结果将在此处显示</div>
-                </div>
+    <div class="recognize-section">
+        <h2>试题识别</h2>
+        <div class="input-area">
+            <div class="input-group">
+                <input type="text" id="questionImageUrl" placeholder="请输入图片URL或使用示例图片"
+                       value="https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/Backup/ShiTi.jpg">
+                <button onclick="recognizeQuestion()">识别试题</button>
+            </div>
+            <div id="questionResult" class="result-area">
+                <div style="color:#666; text-align:center; padding:20px;">识别结果将在此处显示</div>
             </div>
         </div>
     </div>
@@ -350,13 +381,13 @@
             processEscapes: true,
             packages: {'[+]': ['ams']}
         },
-        svg: { fontCache: 'global' },
-        startup: { pageReady: pageReady }
+        svg: {fontCache: 'global'},
+        startup: {pageReady: pageReady}
     };
 
     // MathJax 加载完成后执行
     function pageReady() {
-        return MathJax.startup.defaultPageReady().then(function() {
+        return MathJax.startup.defaultPageReady().then(function () {
             console.log('MathJax 3 加载完成');
         });
     }
@@ -367,15 +398,36 @@
 <script>
     // 切换标签页
     function switchTab(tabName) {
-        document.querySelectorAll('.tab-button').forEach(button => button.classList.remove('active'));
-        document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
+        console.log('切换到标签页:', tabName);
 
-        if (tabName === 'formula') {
-            document.querySelectorAll('.tab-button')[0].classList.add('active');
-            document.getElementById('formula-tab').classList.add('active');
+        // 移除所有标签按钮的active类
+        document.querySelectorAll('.tab-button').forEach(button => {
+            button.classList.remove('active');
+            console.log('移除按钮active类:', button.textContent);
+        });
+
+        // 移除所有标签内容的active类
+        document.querySelectorAll('.tab-content').forEach(content => {
+            content.classList.remove('active');
+            console.log('移除内容active类:', content.id);
+        });
+
+        // 添加active类到当前标签按钮
+        const targetButton = document.querySelector(`.tab-button[data-tab="${tabName}"]`);
+        if (targetButton) {
+            targetButton.classList.add('active');
+            console.log('添加按钮active类成功:', tabName);
         } else {
-            document.querySelectorAll('.tab-button')[1].classList.add('active');
-            document.getElementById('question-tab').classList.add('active');
+            console.error('未找到标签按钮:', tabName);
+        }
+
+        // 添加active类到当前标签内容
+        const targetContent = document.getElementById(`${tabName}-content`);
+        if (targetContent) {
+            targetContent.classList.add('active');
+            console.log('添加内容active类成功:', tabName);
+        } else {
+            console.error('未找到标签内容:', tabName);
         }
     }
 
@@ -383,39 +435,48 @@
     function recognizeFormula() {
         const imageUrl = document.getElementById('formulaImageUrl').value.trim();
         const resultArea = document.getElementById('formulaResult');
-    
-        if (!imageUrl) { alert('请输入图片URL！'); return; }
-    
+
+        if (!imageUrl) {
+            alert('请输入图片URL！');
+            return;
+        }
+
         resultArea.innerHTML = '<div class="loading-animation"><div class="spinner"></div><div>正在识别公式...</div></div>';
-    
+
         // 添加延迟模拟API调用
         setTimeout(() => {
             // 读取本地JSON文件
             fetch('Formula.json')
-            .then(response => {
-                console.log('JSON请求响应:', response);
-                if (!response.ok) throw new Error('无法加载本地JSON文件');
-                return response.json();
-            })
-            .then(data => {
-                if (data.error) { resultArea.innerHTML = `<div style="color:red">识别失败: ${data.error}</div>`; return; }
-    
-                const content = data.Data?.content || '';
-                if (!content) { resultArea.innerHTML = '<div>未识别到公式内容</div>'; return; }
-    
-                try {
-                    resultArea.innerHTML = `<div class="tex2jax_process">$$${content}$$</div>`;
-                    renderWithMathJax(resultArea);
-                } catch (error) {
-                    console.error('公式处理错误:', error);
-                    resultArea.innerHTML = `<div style="color:red">公式处理失败: ${error.message}</div>`;
-                }
-            })
-            .catch(error => {
-                console.error('请求错误:', error);
-                const errorMsg = '加载本地JSON失败: ' + error.message;
-                resultArea.innerHTML = `<div style="color:red">${errorMsg}</div>`;
-            });
+                .then(response => {
+                    console.log('JSON请求响应:', response);
+                    if (!response.ok) throw new Error('无法加载本地JSON文件');
+                    return response.json();
+                })
+                .then(data => {
+                    if (data.error) {
+                        resultArea.innerHTML = `<div style="color:red">识别失败: ${data.error}</div>`;
+                        return;
+                    }
+
+                    const content = data.Data?.content || '';
+                    if (!content) {
+                        resultArea.innerHTML = '<div>未识别到公式内容</div>';
+                        return;
+                    }
+
+                    try {
+                        resultArea.innerHTML = `<div class="tex2jax_process">$$${content}$$</div>`;
+                        renderWithMathJax(resultArea);
+                    } catch (error) {
+                        console.error('公式处理错误:', error);
+                        resultArea.innerHTML = `<div style="color:red">公式处理失败: ${error.message}</div>`;
+                    }
+                })
+                .catch(error => {
+                    console.error('请求错误:', error);
+                    const errorMsg = '加载本地JSON失败: ' + error.message;
+                    resultArea.innerHTML = `<div style="color:red">${errorMsg}</div>`;
+                });
         }, 1000); // 1秒延迟
     }
 
@@ -423,64 +484,70 @@
     function recognizeQuestion() {
         const imageUrl = document.getElementById('questionImageUrl').value.trim();
         const resultArea = document.getElementById('questionResult');
-    
-        if (!imageUrl) { alert('请输入图片URL！'); return; }
-    
+
+        if (!imageUrl) {
+            alert('请输入图片URL！');
+            return;
+        }
+
         // 立即显示加载动画（关键修复）
         console.log('显示加载动画');
         resultArea.innerHTML = '<div class="loading-animation"><div class="spinner"></div><div>正在识别试题...</div></div>';
-    
+
         // 添加延迟模拟API调用
         setTimeout(() => {
             // 读取本地JSON文件
             fetch('ShiTi.json')
-            .then(response => {
-                console.log('JSON请求响应:', response);
-                if (!response.ok) throw new Error('无法加载本地JSON文件');
-                return response.json();
-            })
-            .then(data => {
-                if (data.error) { resultArea.innerHTML = `<div style="color:red">识别失败: ${data.error}</div>`; return; }
-
-                let content = data.Data?.content || '';
-                console.log("处理前："+content);
-
-                try {
-                    // 彻底修复选项标签闭合问题 - 采用分而治之策略
-                    // 1. 首先拆分所有选项为独立数组
-                    const options = content.split(/(?=[A-D]\s*\.)/);
-                    // 2. 逐个处理每个选项确保标签完整
-                    content = options.map(option => {
-                      // 仅处理以选项标签开头的部分
-                      if (/^[A-D]\s*\./.test(option)) {
-                        return `<span class="option-item">$${option}$</span>`; // 添加$符号
-                      }
-                      return option;
-                    }).join('');
-                    // 3. 清理可能的空标签
-                    content = content.replace(/<span class="option-item"><\/span>/g, '');
-                    if (!content.includes('<span class="option-item">')) {
-                      content = content.replace(/((?:[A-D]\s*\.\s*[^.]+)+)/g, '<span class="option-item">$1</span>');
+                .then(response => {
+                    console.log('JSON请求响应:', response);
+                    if (!response.ok) throw new Error('无法加载本地JSON文件');
+                    return response.json();
+                })
+                .then(data => {
+                    if (data.error) {
+                        resultArea.innerHTML = `<div style="color:red">识别失败: ${data.error}</div>`;
+                        return;
                     }
-                    // 添加选项间的分隔处理
-                    content = content.replace(/<\/span>\s*<span class="option-item">/g, '</span>\n<span class="option-item">');
-                    const latexContainer = document.createElement('div');
-                    latexContainer.className = 'tex2jax_process';
-                    latexContainer.innerHTML = content;
-                    console.log('预处理后的内容:', latexContainer.innerHTML);
-                    resultArea.innerHTML = '';
-                    resultArea.appendChild(latexContainer);
-                    renderWithMathJax(resultArea);
-                } catch (error) {
-                    console.error('试题处理错误:', error);
-                    resultArea.innerHTML = `<div style="color:red">试题处理失败: ${error.message}</div>`;
-                }
-            })
-            .catch(error => {
-                console.error('请求错误:', error);
-                const errorMsg = '加载本地JSON失败: ' + error.message;
-                resultArea.innerHTML = `<div style="color:red">${errorMsg}</div>`;
-            });
+
+                    let content = data.Data?.content || '';
+                    console.log("处理前：" + content);
+
+                    try {
+                        // 彻底修复选项标签闭合问题 - 采用分而治之策略
+                        // 1. 首先拆分所有选项为独立数组
+                        const options = content.split(/(?=[A-D]\s*\.)/);
+                        // 2. 逐个处理每个选项确保标签完整
+                        content = options.map(option => {
+                            // 仅处理以选项标签开头的部分
+                            if (/^[A-D]\s*\./.test(option)) {
+                                return `<span class="option-item">$${option}$</span>`; // 添加$符号
+                            }
+                            return option;
+                        }).join('');
+                        // 3. 清理可能的空标签
+                        content = content.replace(/<span class="option-item"><\/span>/g, '');
+                        if (!content.includes('<span class="option-item">')) {
+                            content = content.replace(/((?:[A-D]\s*\.\s*[^.]+)+)/g, '<span class="option-item">$1</span>');
+                        }
+                        // 添加选项间的分隔处理
+                        content = content.replace(/<\/span>\s*<span class="option-item">/g, '</span>\n<span class="option-item">');
+                        const latexContainer = document.createElement('div');
+                        latexContainer.className = 'tex2jax_process';
+                        latexContainer.innerHTML = content;
+                        console.log('预处理后的内容:', latexContainer.innerHTML);
+                        resultArea.innerHTML = '';
+                        resultArea.appendChild(latexContainer);
+                        renderWithMathJax(resultArea);
+                    } catch (error) {
+                        console.error('试题处理错误:', error);
+                        resultArea.innerHTML = `<div style="color:red">试题处理失败: ${error.message}</div>`;
+                    }
+                })
+                .catch(error => {
+                    console.error('请求错误:', error);
+                    const errorMsg = '加载本地JSON失败: ' + error.message;
+                    resultArea.innerHTML = `<div style="color:red">${errorMsg}</div>`;
+                });
         }, 1000); // 1秒延迟
     }
 
@@ -520,6 +587,28 @@
         return div.innerHTML;
     }
 
+    // 等待DOM加载完成
+    document.addEventListener('DOMContentLoaded', function () {
+        // 初始化第一个标签为活动状态
+        document.querySelector('.tab-button[data-tab="formula"]').classList.add('active');
+        document.getElementById('formula-content').classList.add('active');
+
+        // 为所有标签按钮添加点击事件
+        document.querySelectorAll('.tab-button').forEach(button => {
+            button.addEventListener('click', function () {
+                const tabName = this.getAttribute('data-tab');
+
+                // 移除所有活动状态
+                document.querySelectorAll('.tab-button').forEach(btn => btn.classList.remove('active'));
+                document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
+
+                // 设置当前标签为活动状态
+                this.classList.add('active');
+                document.getElementById(`${tabName}-content`).classList.add('active');
+            });
+        });
+    });
+
     // 图片模态框控制函数
     function openModal(imageSrc) {
         const modal = document.getElementById('imageModal');
@@ -531,4 +620,4 @@
     function closeModal() {
         document.getElementById('imageModal').style.display = 'none';
     }
-</script>
\ No newline at end of file
+</script>