From 8bb9fe3e7f6dda7720784a049177d606e66fbc2b Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期五, 16 八月 2024 18:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/store/modules/user/index.ts | 2
src/views/sessionManager/components/smartAi.vue | 2
src/views/sessionManager/components/agentSession.vue | 60 ++++++++++---------
src/api/authority.ts | 3 -
src/assets/images/his.png | 0
src/views/sessionManager/components/historySession.vue | 66 +++++++++++++++------
6 files changed, 78 insertions(+), 55 deletions(-)
diff --git a/src/api/authority.ts b/src/api/authority.ts
index 6e7240a..697a8b3 100644
--- a/src/api/authority.ts
+++ b/src/api/authority.ts
@@ -10,9 +10,6 @@
phoneNumber: string;
dept: any;
deptName:string;
- resources: any;
- knowledges: any;
- dialogs: any;
createTime: string;
status: string;
psw:string;
diff --git a/src/assets/images/his.png b/src/assets/images/his.png
new file mode 100644
index 0000000..9631abe
--- /dev/null
+++ b/src/assets/images/his.png
Binary files differ
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 7bb51c3..1ee0211 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -78,8 +78,6 @@
};
if(res.data.roles && res.data.roles.length>0)
this.resources=res.data.roles[0].resources;
- else
- this.resources=res.data.resources;
setUserInfo(JSON.stringify(userInfo));
setUserResources(JSON.stringify(this.resources))
for (const r of this.resources) {
diff --git a/src/views/sessionManager/components/agentSession.vue b/src/views/sessionManager/components/agentSession.vue
index 342d9a3..b408c10 100644
--- a/src/views/sessionManager/components/agentSession.vue
+++ b/src/views/sessionManager/components/agentSession.vue
@@ -106,7 +106,7 @@
</template>
<script setup lang="ts">
-import { defineProps, ref, watch, defineEmits, onMounted, reactive, computed, nextTick } from "vue";
+import { defineProps, ref, watch, defineEmits, onMounted, reactive, computed, nextTick, onBeforeUnmount } from "vue";
import { Message } from '@arco-design/web-vue';
import { useAppStore } from "@/store";
import { getAuthorization } from "@/utils/auth";
@@ -150,9 +150,6 @@
// 鍒濆鍖栭〉闈�
const initPage = async () => {
agentSet();
- agentReset();
- agentCompletion();
- queryAgentSessionDetail(agentObj.id);
};
const createNewAgent = async (session) => {
@@ -175,6 +172,7 @@
if (res.code == 0) {
// sessionDetailList.value = res.data.dsl.messages;
// Message.success('淇敼鎴愬姛');
+ agentReset();
}
}
// 璋冪敤reset鏂规硶
@@ -182,8 +180,9 @@
const res = await agentResetApi({
id: agentObj.id,
});
- if (res.code === 200) {
+ if (res.code == 0) {
// Message.success('淇敼鎴愬姛');
+ agentCompletion();
}
}
// 璋冪敤completion鏂规硶
@@ -207,30 +206,30 @@
.pipeThrough(new EventSourceParserStream())
.getReader();
currIndex.value = 0;
- // while (true) {
- // const x = await reader?.read();
- // if (x) {
- // const { done, value } = x;
- // console.log(x, 999);
- // try {
- // const val = JSON.parse(value?.data || '');
- // const d = val?.data;
- // if (typeof d !== 'boolean') {
- // console.info('data:', d);
- // streamStr.value = d.content;
- // startDisplayStr();
- // }
- // } catch (e) {
- // console.warn(e);
- // }
- // if (done) {
- // console.info('done');
- // displayedText.value = '';
- // queryAgentSessionDetail(agentObj.id);
- // break;
- // }
- // }
- // }
+ while (true) {
+ const x = await reader?.read();
+ if (x) {
+ const { done, value } = x;
+ console.log(x, 999);
+ try {
+ const val = JSON.parse(value?.data || '');
+ const d = val?.data;
+ if (typeof d !== 'boolean') {
+ console.info('data:', d);
+ streamStr.value = d.content;
+ startDisplayStr();
+ }
+ } catch (e) {
+ console.warn(e);
+ }
+ if (done) {
+ console.info('done');
+ displayedText.value = '';
+ queryAgentSessionDetail(agentObj.id);
+ break;
+ }
+ }
+ }
chatDis.value = false;
loading.value = false;
inputMsg.value = '';
@@ -377,6 +376,9 @@
createNewAgent(data);
});
});
+onBeforeUnmount(() => {
+ EventBus.off('createAgent');
+});
watch(
() => props.modalObj,
diff --git a/src/views/sessionManager/components/historySession.vue b/src/views/sessionManager/components/historySession.vue
index 1fc2d03..23b3479 100644
--- a/src/views/sessionManager/components/historySession.vue
+++ b/src/views/sessionManager/components/historySession.vue
@@ -8,7 +8,7 @@
top: 10px;
left: -40px;
font-size: 30px;
- z-index: 9999;
+ z-index: 99;
cursor: pointer"
@click="emit('changeAgentType','1')"
>
@@ -47,6 +47,8 @@
class="item historyCenter-box"
v-for="session in sessionList"
@click="querySessionDetail(session)"
+ @mouseenter="handleMouseEnter(session)"
+ @mouseleave="handleMouseLeave(session)"
>
<div class="text" >
<img
@@ -56,22 +58,19 @@
/>
{{ session.name }}
</div>
- <a-popover position="rt">
- <div class="time"
- >{{
+ <div class="time"
+ >
+ <span v-show="session.showtype == 1" style="font-size: 14px">
+ {{
moment(new Date(session.create_time)).format(
'YYYY-MM-DD HH:mm:ss'
)
}}
- </div>
- <template #content>
- <span
- style="cursor: pointer; color: #4977ba; font-size: 12px"
- @click="deleteSession(session)"
- ><icon-delete style="font-size: 14px" />鍒犻櫎</span
- >
- </template>
- </a-popover>
+ </span>
+ </div>
+ <a-button type="text" @click.stop="deleteSession(session)" style="color: red;position: absolute;right: 10px;top: 10px;" v-show="session.showtype == 2">
+ <icon-delete style="font-size: 14px" />
+ </a-button>
</div>
</div>
</a-scrollbar>
@@ -86,7 +85,7 @@
import { useAppStore, useUserStore } from "@/store";
import { computed, nextTick, onMounted, watch, reactive, ref, onBeforeMount, onBeforeUnmount } from "vue";
-import { Message } from "@arco-design/web-vue";
+import { Message, Modal } from "@arco-design/web-vue";
import EventBus from '@/utils/EventBus';
import moment from "moment";
import {
@@ -101,6 +100,7 @@
import { queryCanvasList } from "@/api/Agent";
const emit = defineEmits(["querySessionDetail","changeAgentType"]);
import logo from "@/assets/images/model.png";
+import { deleteKnow } from "@/api/kbList";
const sessionList = ref([]); //浼氳瘽鍒楄〃
const activeSessionId = ref("");
const fieldNames = { value: "id", label: "name" };
@@ -163,7 +163,12 @@
const querySessionList = async (id) => {
const { code, data } = await sessionListApi(id);
if (code === 200) {
- sessionList.value = data;
+ sessionList.value = data.map((item) => {
+ return {
+ ...item,
+ showtype: 1
+ }
+ });
@@ -174,11 +179,21 @@
//鏍规嵁浼氳瘽id鍒犻櫎浼氳瘽
const deleteSession = async (session) => {
- const { code } = await deleteSessionApi([session.id]);
- if (code === 200) {
- Message.success('鍒犻櫎鎴愬姛');
- querySessionList('');
- }
+ Modal.confirm({
+ title: '鎻愮ず淇℃伅',
+ content: '纭鍒犻櫎鍚�',
+ okText: '纭畾',
+ cancelText: '鍙栨秷',
+ hideTitle: true,
+ onOk: async () => {
+ const { code } = await deleteSessionApi([session.id]);
+ if (code === 200) {
+ Message.success('鍒犻櫎鎴愬姛');
+ querySessionList('');
+ }
+ },
+ onCancel: () => {},
+ });
};
const querySessionDetail = async (session) => {
@@ -186,6 +201,16 @@
emit('changeAgentType','1');
emit('querySessionDetail',session);
}
+
+
+const handleMouseEnter = (session) => {
+ session.showtype = 2;
+};
+
+const handleMouseLeave = (session) => {
+ session.showtype = 1;
+};
+
onBeforeMount(()=>{
// DialogList()
querySessionList('');
@@ -239,6 +264,7 @@
width: 100%;
margin-top: 30px;
.historyCenter-box{
+ position: relative;
display: flex;
width: 70%;
margin-left: 15%;
diff --git a/src/views/sessionManager/components/smartAi.vue b/src/views/sessionManager/components/smartAi.vue
index e74e9c3..6626007 100644
--- a/src/views/sessionManager/components/smartAi.vue
+++ b/src/views/sessionManager/components/smartAi.vue
@@ -9,7 +9,7 @@
>
<div class="search">
<!-- 鏌ヨ妗�-->
- <img src="@/assets/images/square_banner.png"
+ <img src="@/assets/images/his.png"
style="width: 100%"
alt="">
--
Gitblit v1.8.0