From 99b7194ce9364b0a6ab49a738c03bb89e6c223e7 Mon Sep 17 00:00:00 2001 From: zhangxiao <898441624@qq.com> Date: 星期六, 17 八月 2024 15:06:59 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web --- src/views/sessionManager/components/historySession.vue | 100 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 77 insertions(+), 23 deletions(-) diff --git a/src/views/sessionManager/components/historySession.vue b/src/views/sessionManager/components/historySession.vue index 1fc2d03..e7c9c5e 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,31 +47,30 @@ class="item historyCenter-box" v-for="session in sessionList" @click="querySessionDetail(session)" + @mouseenter="handleMouseEnter(session)" + @mouseleave="handleMouseLeave(session)" > <div class="text" > <img :style="{ width: '16px' }" alt="dessert" - :src="session.avatar || imgSrc" + :src="session.icon ? httpUrl + session.icon : imgSrc" /> {{ 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,8 @@ import { queryCanvasList } from "@/api/Agent"; const emit = defineEmits(["querySessionDetail","changeAgentType"]); import logo from "@/assets/images/model.png"; +import { deleteKnow } from "@/api/kbList"; +import { getAgentSessionDetailsApi } from "@/api/agentSession"; const sessionList = ref([]); //浼氳瘽鍒楄〃 const activeSessionId = ref(""); const fieldNames = { value: "id", label: "name" }; @@ -111,6 +112,7 @@ const searchValue = ref(""); const selectValue = ref(""); const sectionList = ref({}); +const httpUrl = localStorage.getItem('httpUrl'); const imgSrc = ref(logo); const DialogList = async () => { const { code, data } = await getDialogListApi(); @@ -163,7 +165,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,18 +181,64 @@ //鏍规嵁浼氳瘽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) => { console.log(session, 'session'); - emit('changeAgentType','1'); - emit('querySessionDetail',session); + + + // 鏌ヨ鍘嗗彶璁板綍 + if (session.base == 'agent') { + // agent瀵硅薄鏁版嵁灏佽 + // const { code, data } = await getAgentSessionDetailsApi(session.app_id); + // if (code == 0) { + // console.log(data,'浼氳瘽璇︽儏'); + // let sessionObj = { + // id: session.app_id, + // dsl: data.dsl, + // title: session.name, + // } + // + // } + EventBus.emit("queryAgentSessionDetail",{ + ...sessionObj, + id: session.app_id, + }); + emit('changeAgentType','2'); + } else { + // 鐢熸垚鏅鸿兘浣撴柊鐨勫璇� + emit('changeAgentType','1'); + emit('querySessionDetail',session); + } + + + } + + +const handleMouseEnter = (session) => { + session.showtype = 2; +}; + +const handleMouseLeave = (session) => { + session.showtype = 1; +}; + onBeforeMount(()=>{ // DialogList() querySessionList(''); @@ -239,6 +292,7 @@ width: 100%; margin-top: 30px; .historyCenter-box{ + position: relative; display: flex; width: 70%; margin-left: 15%; -- Gitblit v1.8.0