修改对话输出

README.md

@@ -1,2 +1,306 @@
-{"model":"spark","appid":"d3a4647c","apiSecret":"YjRlNGNjYzM5ZjIxNGM5NzhkNDJjMGM4","apiKey":"3ee5ae2b03a4039e79ba1a490631309e","domain":"pro-128k"}
+<template>
+  <div class="chat-container">
+    <!-- 消息列表 -->
+    <el-card class="chat-messages" shadow="never" ref="messageContainer">
+      <div
+        v-for="(message, index) in messages"
+        :key="index"
+        :class="['message', message.role]"
+      >
+        <div class="message-avatar">
+          <span v-if="message.role === 'assistant'">💬</span>
+          <span v-else>👤</span>
+        </div>
+        <div class="message-content">
+          <div v-html="renderMarkdown(message.content)"></div>
+        </div>
+      </div>
+      <div v-if="loading" class="loading-indicator">Loading...</div>
+    </el-card>
 
+    <!-- 输入区域 -->
+    <el-card class="chat-input" shadow="never">
+      <el-row :gutter="10">
+        <el-col :span="20">
+          <el-input
+            v-model="inputMessage"
+            type="textarea"
+            :rows="2"
+            placeholder="输入消息..."
+            @keyup.enter="sendMessage"
+          />
+        </el-col>
+        <el-col :span="4">
+          <el-button type="primary" @click="sendMessage">Send</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, reactive, nextTick } from "vue";
+import { ElCard, ElInput, ElButton } from "element-plus";
+import { WSMessage, AIQMessage, OllamaMessage } from "@/types/im";
+import { ElMessage } from "element-plus";
+import { GetMessageService } from "@/api/im";
+import MarkdownIt from "markdown-it";
+import hljs from "highlight.js";
+import bash from "highlight.js/lib/languages/bash";
+import javascript from "highlight.js/lib/languages/javascript";
+import typescript from "highlight.js/lib/languages/typescript";
+import java from "highlight.js/lib/languages/java";
+import sql from "highlight.js/lib/languages/sql";
+import nginx from "highlight.js/lib/languages/nginx";
+import json from "highlight.js/lib/languages/json";
+import yaml from "highlight.js/lib/languages/yaml";
+import xml from "highlight.js/lib/languages/xml";
+import shell from "highlight.js/lib/languages/shell";
+interface Message {
+  role: "user" | "assistant";
+  content: string;
+  finished?: boolean;
+}
+hljs.registerLanguage("bash", bash);
+hljs.registerLanguage("javascript", javascript);
+hljs.registerLanguage("typescript", typescript);
+hljs.registerLanguage("java", java);
+hljs.registerLanguage("sql", sql);
+hljs.registerLanguage("nginx", nginx);
+hljs.registerLanguage("json", json);
+hljs.registerLanguage("yaml", yaml);
+hljs.registerLanguage("xml", xml);
+hljs.registerLanguage("shell", shell);
+
+const md = new MarkdownIt({
+  html: true,
+  linkify: true,
+  breaks: true,
+  xhtmlOut: true,
+  typographer: true,
+  highlight: function (str, lang) {
+    if (lang && hljs.getLanguage(lang)) {
+      try {
+        return (
+          '<pre class="hljs"><code>' +
+          hljs.highlight(lang, str, true).value +
+          "</code></pre>"
+        );
+      } catch (__) {}
+    }
+
+    return (
+      '<pre class="hljs"><code>' + md.utils.escapeHtml(str) + "</code></pre>"
+    );
+  },
+});
+
+const loading = ref(false);
+const isUserScrolling = ref<boolean>(false);
+const messages = reactive([]);
+const inputMessage = ref("");
+const socket = ref(null);
+const currentAIMessage = ref("");
+const messageContainer = ref(null);
+const sessionID = ref(0);
+
+const renderMarkdown = (content: string) => {
+  return md.render(content);
+};
+
+onMounted(() => {
+  let url =
+    "wss://pm.ljsea.top/im/ai_chat_ws?" +
+    "token=" +
+    localStorage.getItem("token");
+  socket.value = new WebSocket(url);
+  socket.value.onopen = () => {
+    console.log("WebSocket 连接已建立");
+    ElMessage.success("连接成功");
+  };
+
+  const container = document.querySelector('.messages-wrapper') as HTMLElement | null;
+      if (container) {
+        container.addEventListener('scroll', handleScroll);
+      }
+
+  socket.value.onmessage = (event) => {
+    let msg: WSMessage = JSON.parse(event.data);
+    const existingMessage = messages.find(
+      (msg) => msg.role === "assistant" && !msg.finished
+    );
+    // if (msg.msg.msg.done) {
+    //   messages.push({ role: 'assistant', content: currentAIMessage.value });
+    //   currentAIMessage.value = '';
+    //   scrollToBottom();
+    //   return;
+    // }
+    if (existingMessage) {
+      // 追加内容
+      existingMessage.content += msg.msg.msg.response;
+    } else {
+      // 新消息
+      messages.push({
+        role: "assistant",
+        content: msg.msg.msg.response,
+        finished: false,
+      });
+    }
+    console.log("resp:", msg);
+    sessionID.value = msg.session_id;
+    currentAIMessage.value += msg.msg.msg.response;
+    scrollToBottom();
+    if (msg.msg.msg.done) {
+      const assistantMessage = messages[messages.length - 1];
+      assistantMessage.finished = true;
+    }
+  };
+
+  socket.value.onclose = () => {
+    console.log("WebSocket 连接已关闭");
+    ElMessage.error("连接已关闭");
+  };
+
+  socket.value.onerror = (error) => {
+    console.error("WebSocket 发生错误:", error);
+  };
+});
+
+onUnmounted(() => {
+  if (socket.value) {
+    socket.value.close();
+  }
+});
+
+const sendMessage = () => {
+  let msg = {
+    msg: inputMessage.value,
+    type: "ollama",
+    function: "gen-ai-chat",
+    session_id: sessionID.value,
+  };
+  if (inputMessage.value.trim() === "") return;
+  messages.push({ role: "user", content: inputMessage.value, finished: true });
+  socket.value.send(JSON.stringify(msg));
+  inputMessage.value = "";
+  //getMessage();
+  scrollToBottom();
+};
+
+const scrollToBottom = (): void => {
+  nextTick(() => {
+    if (messageContainer.value && !isUserScrolling.value) {
+      messageContainer.value.scrollTop = messageContainer.value.scrollHeight;
+    }
+  });
+};
+
+// 监听用户滚动行为，判断是否在手动滚动历史消息
+const handleScroll = (): void => {
+  const container = document.querySelector(
+    ".messages-wrapper"
+  ) as HTMLElement | null;
+  if (container) {
+    const scrollBottom =
+      container.scrollHeight - container.scrollTop - container.clientHeight;
+    isUserScrolling.value = scrollBottom > 50; // 如果距离底部超过50px，则认为在查看历史消息
+  }
+};
+
+const getMessage = async () => {
+  let result = {};
+  try {
+    let req = {
+      token: localStorage.getItem("token"),
+      session_id: sessionID.value,
+    };
+    result = await GetMessageService(req);
+    if (result["code"] === 0) {
+      console.log(result["data"]);
+    }
+  } catch (e) {
+    console.log(e);
+  }
+  return {};
+};
+</script>
+
+<style scoped>
+.chat-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%; /* 使用视口高度确保容器占满整个屏幕 */
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.chat-messages {
+  flex: 1;
+  overflow-y: auto; /* 允许垂直滚动 */
+  padding: 10px;
+  margin-bottom: 20px;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+
+.messages-wrapper {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end; /* 默认将新消息对齐到底部 */
+  overflow-y: auto; /* 确保内部可以滚动 */
+  height: 100%;
+}
+
+.message {
+  display: flex;
+  margin-bottom: 15px;
+}
+
+.message.user {
+  justify-content: flex-end;
+}
+
+.message-avatar {
+  width: 40px;
+  text-align: center;
+  line-height: 40px;
+  font-size: 20px;
+  margin-right: 10px;
+}
+
+.message.assistant .message-avatar {
+  margin-right: 0;
+  margin-left: 10px;
+}
+
+.message-content {
+  background-color: #f0f9eb;
+  border: 1px solid #e1f3d8;
+  border-radius: 4px;
+  padding: 10px 15px;
+  white-space: pre-wrap;
+  max-width: 70%;
+}
+
+.message.assistant .message-content {
+  background-color: #f3f4f6;
+  border: 1px solid #dce4eb;
+  max-width: 70%;
+}
+
+.loading-indicator {
+  text-align: center;
+  color: #999;
+  font-size: 16px;
+}
+
+.chat-input {
+  width: 100%;
+}
+
+.el-input {
+  width: 100%;
+}
+</style>

index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>vue-manage-system后台管理系统</title>
+  <title>大学生学业作品AI生成工具</title>
   <link rel="stylesheet" href="//at.alicdn.com/t/c/font_830376_92o68tc95je.css">
 </head>
 

src/views/system/gen-chat.vue

@@ -1,218 +1,288 @@
 <template>
-    <div class="chat-container">
+  <div class="chat-container">
-      <div class="chat-messages" ref="messageContainer">
+    <!-- 消息列表 -->
-        <el-card
+    <el-card class="chat-messages" shadow="never" ref="messagesContainer">
-          v-for="(message, index) in messages"
+      <div
-          :key="index"
+        v-for="(message, index) in messages"
-          :class="{ 'user-message': message.sender === 'user', 'ai-message': message.sender === 'ai' }"
+        :key="index"
-          shadow="never"
+        :class="['message', message.role]"
-        >
+      >
-          <!-- <template #header>
+        <div class="message-avatar">
-            <span>{{ message.sender === 'user' ? '你' : 'AI' }}</span>
+          <span v-if="message.role === 'assistant'">💬</span>
-          </template> -->
+          <span v-else>👤</span>
+        </div>
+        <div class="message-content">
           <div v-html="renderMarkdown(message.content)"></div>
-        </el-card>
+        </div>
-        <el-card
-          v-if="currentAIMessage.length > 0"
-          class="ai-message"
-          shadow="never"
-        >
-          <!-- <template #header>
-            <span>AI</span>
-          </template> -->
-          <div v-html="renderMarkdown(currentAIMessage)"></div>
-        </el-card>
       </div>
-      <div class="input-container">
+      <div v-if="loading" class="loading-indicator">Loading...</div>
-        <el-input
+    </el-card>
-        type="textarea"
+
-        :row = "3"
+    <!-- 输入区域 -->
-          v-model="inputMessage"
+    <el-card class="chat-input" shadow="never">
-          placeholder="输入你的消息..."
+      <el-row :gutter="10">
-          @keyup.enter="sendMessage"
+        <el-col :span="20">
-        ></el-input>
+          <el-input
-        <el-button @click="sendMessage">发送</el-button>
+            v-model="inputMessage"
-      </div>
+            type="textarea"
-    </div>
+            :rows="2"
-  </template>
+            placeholder="输入消息..."
+            @keyup.enter="sendMessage"
+          />
+        </el-col>
+        <el-col :span="4" style="text-align: center;" >
+          <el-button type="primary" @click="sendMessage">Send</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue';
+import { ref, onMounted, onUnmounted, reactive, nextTick } from "vue";
-import { ElCard, ElInput, ElButton } from 'element-plus';
+import { ElCard, ElInput, ElButton } from "element-plus";
-import { WSMessage,AIQMessage,OllamaMessage } from '@/types/im';
+import { WSMessage, AIQMessage, OllamaMessage } from "@/types/im";
-import { ElMessage } from 'element-plus';
+import { ElMessage } from "element-plus";
-import {GetMessageService} from "@/api/im";
+import { GetMessageService } from "@/api/im";
-import MarkdownIt from 'markdown-it';
+import MarkdownIt from "markdown-it";
-import hljs from 'highlight.js';
+import hljs from "highlight.js";
-import bash from 'highlight.js/lib/languages/bash'
+import bash from "highlight.js/lib/languages/bash";
-import javascript from 'highlight.js/lib/languages/javascript';
+import javascript from "highlight.js/lib/languages/javascript";
-import typescript from 'highlight.js/lib/languages/typescript';
+import typescript from "highlight.js/lib/languages/typescript";
-import java from 'highlight.js/lib/languages/java';
+import java from "highlight.js/lib/languages/java";
-import sql from 'highlight.js/lib/languages/sql';
+import sql from "highlight.js/lib/languages/sql";
-import nginx from 'highlight.js/lib/languages/nginx';
+import nginx from "highlight.js/lib/languages/nginx";
-import json from 'highlight.js/lib/languages/json';
+import json from "highlight.js/lib/languages/json";
-import yaml from 'highlight.js/lib/languages/yaml';
+import yaml from "highlight.js/lib/languages/yaml";
-import xml from 'highlight.js/lib/languages/xml';
+import xml from "highlight.js/lib/languages/xml";
-import shell from 'highlight.js/lib/languages/shell'
+import shell from "highlight.js/lib/languages/shell";
-
+interface Message {
-hljs.registerLanguage('bash', bash)
+  role: "user" | "assistant";
-hljs.registerLanguage('javascript', javascript);
+  content: string;
-hljs.registerLanguage('typescript', typescript);
+  finished?: boolean;
-hljs.registerLanguage('java', java);
+}
-hljs.registerLanguage('sql', sql);
+hljs.registerLanguage("bash", bash);
-hljs.registerLanguage('nginx', nginx);
+hljs.registerLanguage("javascript", javascript);
-hljs.registerLanguage('json', json);
+hljs.registerLanguage("typescript", typescript);
-hljs.registerLanguage('yaml', yaml);
+hljs.registerLanguage("java", java);
-hljs.registerLanguage('xml', xml);
+hljs.registerLanguage("sql", sql);
-hljs.registerLanguage('shell', shell);
+hljs.registerLanguage("nginx", nginx);
-
+hljs.registerLanguage("json", json);
-  
+hljs.registerLanguage("yaml", yaml);
-  const md = new MarkdownIt({
+hljs.registerLanguage("xml", xml);
-    html: true,
+hljs.registerLanguage("shell", shell);
-    linkify: true,
-    breaks: true,
-    xhtmlOut: true,
-    typographer: true,
-    highlight: function (str, lang) {
-        if (lang && hljs.getLanguage(lang)) {
-        try {
-            return (
-            '<pre class="hljs"><code>' +
-            hljs.highlight(lang, str, true).value +
-            "</code></pre>"
-            );
-        } catch (__) { }
-        }
 
+const md = new MarkdownIt({
+  html: true,
+  linkify: true,
+  breaks: true,
+  xhtmlOut: true,
+  typographer: true,
+  highlight: function (str, lang) {
+    if (lang && hljs.getLanguage(lang)) {
+      try {
         return (
-        '<pre class="hljs"><code>' +
+          '<pre class="hljs"><code>' +
-        md.utils.escapeHtml(str) +
+          hljs.highlight(lang, str, true).value +
-        "</code></pre>"
+          "</code></pre>"
         );
-    },
+      } catch (__) {}
+    }
+
+    return (
+      '<pre class="hljs"><code>' + md.utils.escapeHtml(str) + "</code></pre>"
+    );
+  },
 });
 
-  const messages = ref([]);
+const loading = ref(false);
-  const inputMessage = ref('');
+const isUserScrolling = ref<boolean>(false);
-  const socket = ref(null);
+const messages = reactive([]);
-  const currentAIMessage = ref('');
+const inputMessage = ref("");
-  const messageContainer = ref(null);
+const socket = ref(null);
-  const sessionID = ref(0);
+const currentAIMessage = ref("");
-  const AIIsSending =ref(false);
+const sessionID = ref(0);
+const messagesContainer = ref<HTMLDivElement | null>(null);
 
+const renderMarkdown = (content: string) => {
+  return md.render(content);
+};
 
-  const renderMarkdown = (content: string) => {
+const scrollToBottom = () => {
-    return md.render(content);
+  nextTick(() => {
-  };
+    if (messagesContainer.value) {
-  
+      messagesContainer.value.scrollTop = messagesContainer.value.scrollHeight;
-  onMounted(() => {
-    let url ='wss://pm.ljsea.top/im/ai_chat_ws?' + 'token=' + localStorage.getItem('token');
-    socket.value = new WebSocket(url);
-    socket.value.onopen = () => {
-      console.log('WebSocket 连接已建立');
-      ElMessage.success('连接成功');
-    };
-  
-    socket.value.onmessage = (event) => {
-        let msg : WSMessage = JSON.parse(event.data);
-       const chunk = event.data;
-      if (msg.msg.msg.done) {
-        messages.value.push({ sender: 'ai', content: currentAIMessage.value });
-        currentAIMessage.value = '';
-        scrollToBottom();
-        return;
-      }
-      console.log("resp:",msg);
-      sessionID.value =msg.session_id;
-      currentAIMessage.value += msg.msg.msg.response;
-      scrollToBottom();
-    };
-  
-    socket.value.onclose = () => {
-      console.log('WebSocket 连接已关闭');
-      ElMessage.error('连接已关闭');
-    };
-  
-    socket.value.onerror = (error) => {
-      console.error('WebSocket 发生错误:', error);
-    };
-  });
-  
-  onUnmounted(() => {
-    if (socket.value) {
-      socket.value.close();
     }
   });
+};
 
-  const sendMessage = () => {
+onMounted(() => {
-    let msg = {
+  let url =
-        msg: inputMessage.value,
+    "wss://pm.ljsea.top/im/ai_chat_ws?" +
-        type: "ollama",
+    "token=" +
-        function: "gen-ai-chat",
+    localStorage.getItem("token");
-        session_id: sessionID.value,
+  socket.value = new WebSocket(url);
+  socket.value.onopen = () => {
+    console.log("WebSocket 连接已建立");
+    ElMessage.success("连接成功");
+  };
+  messagesContainer.value = document.querySelector(".chat-messages");
+
+  socket.value.onmessage = (event) => {
+    let msg: WSMessage = JSON.parse(event.data);
+    const existingMessage = messages.find(
+      (msg) => msg.role === "assistant" && !msg.finished
+    );
+    if (existingMessage) {
+      // 追加内容
+      existingMessage.content += msg.msg.msg.response;
+    } else {
+      // 新消息
+      messages.push({
+        role: "assistant",
+        content: msg.msg.msg.response,
+        finished: false,
+      });
     }
-    if (inputMessage.value.trim() === '') return;
+    console.log("resp:", msg);
-    messages.value.push({ sender: 'user', content: inputMessage.value });
+    sessionID.value = msg.session_id;
-    socket.value.send(JSON.stringify(msg));
+    currentAIMessage.value += msg.msg.msg.response;
-    inputMessage.value = '';
+    if (msg.msg.msg.done) {
-    //getMessage();
+      const assistantMessage = messages[messages.length - 1];
-    scrollToBottom();
+      assistantMessage.finished = true;
+      loading.value = false;
+    }
+    nextTick(() => {
+      scrollToBottom(); // 新增滚动调用
+    });
   };
 
-  const scrollToBottom = () => {
+  socket.value.onclose = () => {
-    if (messageContainer.value) {
+    console.log("WebSocket 连接已关闭");
-      messageContainer.value.scrollTop = messageContainer.value.scrollHeight;
+    ElMessage.error("连接已关闭");
-    }
   };
 
-  const getMessage = async () => {
+  socket.value.onerror = (error) => {
-    let result = {};
+    console.error("WebSocket 发生错误:", error);
-    try{
+  };
-      let req={
+});
-          token: localStorage.getItem('token'),
+
-          session_id: sessionID.value,
+onUnmounted(() => {
-      };
+  if (socket.value) {
-      result = await GetMessageService(req)
+    socket.value.close();
-      if(result['code'] === 0){
+  }
-        console.log(result['data']);
+});
-      }
+
-    }catch(e){
+const sendMessage = () => {
-      console.log(e);
+  let msg = {
+    msg: inputMessage.value,
+    type: "ollama",
+    function: "gen-ai-chat",
+    session_id: sessionID.value,
+  };
+  if (inputMessage.value.trim() === "") return;
+  messages.push({ role: "user", content: inputMessage.value, finished: true });
+  socket.value.send(JSON.stringify(msg));
+  inputMessage.value = "";
+  scrollToBottom();
+  loading.value = true;
+  //getMessage();
+};
+
+
+const getMessage = async () => {
+  let result = {};
+  try {
+    let req = {
+      token: localStorage.getItem("token"),
+      session_id: sessionID.value,
+    };
+    result = await GetMessageService(req);
+    if (result["code"] === 0) {
+      console.log(result["data"]);
     }
-    return {};
+  } catch (e) {
+    console.log(e);
   }
-  </script>
+  return {};
+};
+</script>
 
-  <style scoped>
+<style scoped>
-  .chat-container {
+.chat-container {
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    height: 100%;
+  height: 100%;
-  }
+  padding: 20px;
+  box-sizing: border-box;
+}
 
-  .chat-messages {
+.chat-messages {
-    flex: 1;
+  flex: 1;
-    overflow-y: auto;
+  overflow-y: auto; /* 允许垂直滚动 */
-    padding: 10px;
+  padding: 10px;
-    border: 1px solid #ccc;
+  margin-bottom: 20px;
-    margin-bottom: 10px;
+  position: relative;
-    height: 80%;
+  display: flex;
-  }
+  flex-direction: column;
+}
 
-  .user-message {
+.messages-wrapper {
-    text-align: right;
+  flex: 1;
-    background-color: #ccc;
+  display: flex;
-    margin-bottom: 10px;
+  flex-direction: column;
-  }
+  overflow-y: auto; /* 确保内部可以滚动 */
+  height: 100%;
+}
 
-  .ai-message {
+.message {
-    text-align: left;
+  display: flex;
-    max-width: 60%;
+  margin-bottom: 15px;
-    margin-bottom: 10px;
+}
-  }
 
-  .input-container {
+.message.user {
-    display: flex;
+  justify-content: flex-end;
-    gap: 10px;
+}
-  }
+
-  </style>    
+.message-avatar {
+  width: 40px;
+  text-align: center;
+  line-height: 40px;
+  font-size: 20px;
+  margin-right: 10px;
+}
+
+.message.assistant .message-avatar {
+  margin-right: 0;
+  margin-left: 10px;
+}
+
+.message-content {
+  background-color: #f0f9eb;
+  border: 1px solid #e1f3d8;
+  border-radius: 4px;
+  padding: 10px 15px;
+  white-space: pre-wrap;
+  max-width: 70%;
+}
+
+.message.assistant .message-content {
+  background-color: #f3f4f6;
+  border: 1px solid #dce4eb;
+  max-width: 70%;
+}
+
+.loading-indicator {
+  text-align: center;
+  color: #999;
+  font-size: 16px;
+}
+
+.chat-input {
+  width: 100%;
+}
+
+.el-input {
+  width: 100%;
+}
+</style>

src/views/system/reco-topic.vue

@@ -6,6 +6,7 @@
 </template>
 
 <script lang="ts">
+import { ref, reactive } from 'vue';
 </script>
 
 <style lang="scss" scoped>