From c73a750e60479eca32e7d7321fc6a5eb80eaf43a Mon Sep 17 00:00:00 2001
From: Jeason <1710884619@qq.com>
Date: Thu, 2 Apr 2026 16:57:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9F=A5=E8=AF=86=E5=BA=93=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=88=86=E7=A7=9F=E6=88=B7=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加按钮始终可见（不再在租户列表视图隐藏）
- 在租户详情视图添加时，自动关联当前租户，弹窗标题显示租户名
- 在租户列表视图添加时，弹窗显示租户选择器让用户选择目标租户
- 分类选项统一添加 OTA升级
---
 data/tsp_assistant.db                  | Bin 217088 -> 217088 bytes
 src/web/static/js/modules/knowledge.js |  45 ++++++++++++++++++-------
 src/web/templates/dashboard.html       |  11 ++++--
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/data/tsp_assistant.db b/data/tsp_assistant.db
index 33745c56b3377841a8b680f4fa0879b43d436ee8..46b1d5fae61535b6d126a9d6fa60b9a1d3540063 100644
GIT binary patch
delta 4609
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
B$x8qL

delta 1469
zcmZwFTTC2P90u??XJ?o0vdk<{BDb)+(3)Pj%x&jFCER?l70QE^U`@)cSfjPX6w*XY
zV7F<5+!olvkroR`u{4HD-8KVVDj0o{WU&|xzO_l2*(H6znt&Q=>MS7X7Edw{^FQA?
z$@%4L8jNZhjOt8^YQQkep?%5PXX!d1fQH)@H)_q0T-OFz2Dw45%a%t_CB5s71VsRH
zBQ(z>Hw?e(ro1te4@op>1-K_`+Th)oHRchx$&ZoIM1+|$`OQCgqisHu#dR8w#+)V2
zgP4$DbT|RBl0ZPSMsNt_M1qfyhX6_FlnLac2s21D(`+_PXR?$)(W0DT21_~uCx$U{
zn*5kF5yNDec54@bUP}R0vfc^+*xRTxR_;kNtYVE|9<CBU;;eoGCE7qW#4xm)3V!#P
zi|oDofC2T}!5+ORId~D>_JCIqwIAr^tbKseN4h9oELP}p?2j;_W*b=W%pZ$KwRS*+
z4iU)K1NNc;JBTsYxw2s_cGOiEO3v89Z=TxYHq>he7MvFtVJ8`33jLn0d9SkmEGj<;
zo&Ym?lm_A<$D>X=h||*)FG@RcgWPuroV%naHQ;pFJPH1OsK=Kud`Ww*A18WWjgQ8#
z-b&Zu{D|&y<g9@$^4SPj1_6UUKMC99#Xms-)Nzc222R4bWJMlXzTdw(({`euq)c(Q
z9DU>MK%Y;!-}AW1>1ndYy}#1m6c`#0j^9u}YgPO21ul*ST+`~^*5E`>z~@n~ht4Wr
zxl}Z$_B1QaeQJwGarbK1sAxo)MN0E!^?D~mF?<HaWYCO_rm`tMo0T$IiKBTj_xr`~
za*|^g-<9tbK>?)Ej6|^v;}9vHbI?4^rrT2M&sUzQDX*@rKUbHUZ4>07WcVgX6$Fl!
zSO+JvqCiQ!xI2inpjFODfh@4RoJQ_XVLIx64p=BjXt5kx6Yu6Ml;ZJMF4R<=udV*D
zrY=eo26_XgH)yoaaH8izLWq`iHiT$pjdlg1TSl0q(f;%Sd~2JQr|IsbY+b<TMh`47
z<%r^*2+m#$4z+32N_&rT$-9Ea9yhsmnQ&YtFHs`J<xW-=|NQjUvrQ8br1IfQ*!5Cz
zn}nmn7QH+8BFW2X<ZgSBBugW?gY5Hj7h}Rn40)I#Pb1+CgeNCaBk8Pky|dFc^w$wM
z<#`%67UIZ<nKZ?4t20+$FD~3F#PU=}@aE-}FS``^8`a&p{OvWZK!GcxYO}oTYe&tW
zKz6fpU$-jl-mUiRoYj(QN4GjKvQ<&FV?=QeYo!f%eF5KqIy$6$fs`4SGBx$TzEURd
z;8}-|>pSke6HF@E_O*!NOF~yi;Q@5&CN#=($uI+uY}n#9_hoHg0%-0ZfZM~iS#B4*
z5MoaZwT;m+6onQWp_TL&yB;VN1^?N~&nMuB85~1h3-AP5^}_@?#t;91CLQj_BF`99
s+^?C>;<Eo2C>%BbvJ@jrwMh|)N=e<gHdw>RHE(pq6H;EY>LRIs0huWRg#Z8m

diff --git a/src/web/static/js/modules/knowledge.js b/src/web/static/js/modules/knowledge.js
index e0ee71d..ff71f0e 100644
--- a/src/web/static/js/modules/knowledge.js
+++ b/src/web/static/js/modules/knowledge.js
@@ -20,7 +20,6 @@ Object.assign(TSPDashboard.prototype, {
         tenantListEl.style.display = '';
         tenantDetailEl.style.display = 'none';
         if (searchBar) searchBar.style.display = 'none';
-        if (addBtn) addBtn.style.display = 'none';
         if (uploadBtn) uploadBtn.style.display = 'none';
         
         // 显示加载中
@@ -345,21 +344,19 @@ Object.assign(TSPDashboard.prototype, {
         }
 
         try {
-            // Task 7.3: 添加知识条目时自动设置 tenant_id
-            const body = {
-                question,
-                answer,
-                category,
-                confidence_score: confidence
-            };
+            const body = { question, answer, category, confidence_score: confidence };
+            // 确定 tenant_id：优先用当前租户详情视图的，否则用弹窗里的选择器
             if (this.knowledgeCurrentTenantId) {
                 body.tenant_id = this.knowledgeCurrentTenantId;
+            } else {
+                const selectEl = document.getElementById('knowledge-tenant-select');
+                if (selectEl && selectEl.value) {
+                    body.tenant_id = selectEl.value;
+                }
             }
             const response = await fetch('/api/knowledge', {
                 method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
+                headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(body)
             });
 
@@ -368,14 +365,13 @@ Object.assign(TSPDashboard.prototype, {
                 this.showNotification('知识添加成功', 'success');
                 bootstrap.Modal.getInstance(document.getElementById('addKnowledgeModal')).hide();
                 document.getElementById('knowledge-form').reset();
-                // Task 7.3: 刷新当前视图
                 if (this.knowledgeCurrentTenantId) {
                     this.loadKnowledgeTenantDetail(this.knowledgeCurrentTenantId, this.paginationConfig.currentKnowledgePage);
                 } else {
                     this.loadKnowledgeTenantList();
                 }
             } else {
-                this.showNotification('添加知识失败', 'error');
+                this.showNotification('添加知识失败: ' + (data.error || ''), 'error');
             }
         } catch (error) {
             console.error('添加知识失败:', error);
@@ -383,6 +379,29 @@ Object.assign(TSPDashboard.prototype, {
         }
     },
 
+    async prepareAddKnowledge() {
+        const titleEl = document.getElementById('addKnowledgeModalTitle');
+        const selectGroup = document.getElementById('knowledge-tenant-select-group');
+        if (this.knowledgeCurrentTenantId) {
+            // 在租户详情视图里，直接添加到当前租户
+            if (titleEl) titleEl.textContent = `添加知识 — ${this.knowledgeCurrentTenantId}`;
+            if (selectGroup) selectGroup.style.display = 'none';
+        } else {
+            // 在租户列表视图里，显示租户选择器
+            if (titleEl) titleEl.textContent = '添加知识';
+            if (selectGroup) selectGroup.style.display = '';
+            // 填充租户选择器
+            try {
+                const resp = await fetch('/api/tenants');
+                const tenants = await resp.json();
+                const selectEl = document.getElementById('knowledge-tenant-select');
+                if (selectEl && Array.isArray(tenants)) {
+                    selectEl.innerHTML = tenants.map(t => `<option value="${t.tenant_id}">${t.name} (${t.tenant_id})</option>`).join('');
+                }
+            } catch (e) { console.warn('加载租户列表失败:', e); }
+        }
+    },
+
     async uploadFile() {
         const fileInput = document.getElementById('file-input');
         const processMethod = document.getElementById('process-method').value;
diff --git a/src/web/templates/dashboard.html b/src/web/templates/dashboard.html
index 02514f6..2c0fb65 100644
--- a/src/web/templates/dashboard.html
+++ b/src/web/templates/dashboard.html
@@ -900,7 +900,7 @@
                                         <button class="btn btn-outline-secondary btn-sm" id="knowledge-refresh-btn" onclick="dashboard.refreshKnowledge()">
                                             <i class="fas fa-sync-alt me-1"></i>刷新
                                         </button>
-                                        <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#addKnowledgeModal" style="display:none" id="knowledge-add-btn">
+                                        <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#addKnowledgeModal" id="knowledge-add-btn" onclick="dashboard.prepareAddKnowledge()">
                                             <i class="fas fa-plus me-1"></i>添加知识
                                         </button>
                                         <button class="btn btn-success btn-sm" data-bs-toggle="modal" data-bs-target="#uploadFileModal" style="display:none" id="knowledge-upload-btn">
@@ -2454,11 +2454,17 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">添加知识</h5>
+                    <h5 class="modal-title" id="addKnowledgeModalTitle">添加知识</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
                     <form id="knowledge-form">
+                        <div class="mb-3" id="knowledge-tenant-select-group" style="display:none">
+                            <label class="form-label">所属租户</label>
+                            <select class="form-select" id="knowledge-tenant-select">
+                                <option value="default">默认租户</option>
+                            </select>
+                        </div>
                         <div class="mb-3">
                             <label class="form-label">问题</label>
                             <input type="text" class="form-control" id="knowledge-question" required>
@@ -2474,6 +2480,7 @@
                                 <option value="APP功能">APP功能</option>
                                 <option value="远程控制">远程控制</option>
                                 <option value="车辆绑定">车辆绑定</option>
+                                <option value="OTA升级">OTA升级</option>
                                 <option value="其他">其他</option>
                             </select>
                         </div>