From 04f37dbc48f29b48ba65e8ad259240937f0e4e0a Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 22 八月 2024 11:07:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/sessionManager/components/agentSession.vue | 6 +++---
src/views/sessionManager/components/historySession.vue | 13 +++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/views/sessionManager/components/agentSession.vue b/src/views/sessionManager/components/agentSession.vue
index 3226171..0c25dda 100644
--- a/src/views/sessionManager/components/agentSession.vue
+++ b/src/views/sessionManager/components/agentSession.vue
@@ -141,6 +141,7 @@
maxRows: 5,
}"
/>
+ <div style="height: 40px"></div>
<div class="btn-send">
<!-- <icon-send size="32" /> -->
<a-button
@@ -235,8 +236,8 @@
// agentObj.conversation_id = agentObj.id;
console.log(agentObj, 'agentObj');
let chatData = {
- id:agentObj.id,
- conversation_id:agentObj.id,
+ id:activeSessionId.value,
+ conversation_id:activeSessionId.value,
name: agentTitle.value
}
const { code, data } = await addSessionApi(chatData);
@@ -570,7 +571,6 @@
createNewAgent(data);
});
EventBus.on('queryAgentSessionDetail', (data) => {
- Object.assign(agentObj, data);
isHistory.value = true;
querySessionDetail(data);
});
diff --git a/src/views/sessionManager/components/historySession.vue b/src/views/sessionManager/components/historySession.vue
index 16eb7ff..58e0bb1 100644
--- a/src/views/sessionManager/components/historySession.vue
+++ b/src/views/sessionManager/components/historySession.vue
@@ -220,8 +220,12 @@
const querySessionDetail = async (session) => {
console.log(session, 'session');
- // 鏌ヨ鍘嗗彶璁板綍
- if (session.app_type == '2') {
+ // 鏌ヨ鍘嗗彶璁板綍 app_type 1:鏅鸿兘浣� 2:agent
+ if (session.app_type == '1') {
+ // 鐢熸垚鏅鸿兘浣撴柊鐨勫璇�
+ emit('changeAgentType','1');
+ emit('querySessionDetail',session);
+ } else if (session.app_type == '2'){
// agent瀵硅薄鏁版嵁灏佽
// const { code, data } = await getAgentSessionDetailsApi(session.dialog_id);
// if (code == 0) {
@@ -234,10 +238,6 @@
// }
EventBus.emit("queryAgentSessionDetail",session);
emit('changeAgentType','2');
- } else {
- // 鐢熸垚鏅鸿兘浣撴柊鐨勫璇�
- emit('changeAgentType','1');
- emit('querySessionDetail',session);
}
}
@@ -311,6 +311,7 @@
EventBus.on("history", () => {
emit('changeAgentType','3');
// DialogList()
+ queryPage.page = 1;
querySessionList('');
});
--
Gitblit v1.8.0