完成通用选择模型,修复多选问题
This commit is contained in:
parent
dbb64d6fb3
commit
52b4969610
|
|
@ -47,3 +47,15 @@ export const DelFunctionService = (Data) => {
|
|||
}
|
||||
})
|
||||
}
|
||||
|
||||
export const FindModelListByFunctionName= (Data) => {
|
||||
const params = new URLSearchParams();
|
||||
for (let key in Data) {
|
||||
params.append(key, Data[key])
|
||||
}
|
||||
return request.post('/func/find_models_by_function', params,{
|
||||
headers: {
|
||||
'token': Data.token, //token
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -39,7 +39,6 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import { FormOption } from '@/types/form-option';
|
||||
import { json } from 'd3';
|
||||
import { FormInstance, FormRules, UploadProps } from 'element-plus';
|
||||
import { PropType, ref } from 'vue';
|
||||
|
||||
|
|
@ -63,30 +62,30 @@ const { options, formData, edit, update } = defineProps({
|
|||
});
|
||||
|
||||
|
||||
//const form = ref({ ...(edit ? formData : {}) });
|
||||
const form = ref();
|
||||
const form = ref({ ...(edit ? formData : {}) });
|
||||
// const form = ref();
|
||||
|
||||
const doFormData = () => {
|
||||
let a={}
|
||||
let initialForm = { ...(edit ? formData : {}) };
|
||||
|
||||
options.list.forEach(item => {
|
||||
if (item.type === 'select' && item.multiple) {
|
||||
let ids = formData[item.prop];
|
||||
let id_list = JSON.parse(ids);
|
||||
console.log(id_list);
|
||||
let selectedValues = [];
|
||||
for (let i = 0; i < id_list.length; i++) {
|
||||
selectedValues.push(id_list[i]["id"]);
|
||||
}
|
||||
if (!Array.isArray(initialForm[item.prop])) {
|
||||
initialForm[item.prop] = selectedValues;
|
||||
}
|
||||
}
|
||||
});
|
||||
return initialForm;
|
||||
};
|
||||
form.value=doFormData();
|
||||
// const doFormData = () => {
|
||||
// form.value ={};
|
||||
// let initialForm = { ...(edit ? formData : {}) };
|
||||
// //console.log("edit:",formData);
|
||||
// options.list.forEach(item => {
|
||||
// if (item.type === 'select' && item.multiple) {
|
||||
// let ids = formData[item.prop];
|
||||
// let id_list = JSON.parse(ids);
|
||||
// console.log(id_list);
|
||||
// let selectedValues = [];
|
||||
// for (let i = 0; i < id_list.length; i++) {
|
||||
// selectedValues.push(id_list[i]["id"]);
|
||||
// }
|
||||
// if (!Array.isArray(initialForm[item.prop])) {
|
||||
// initialForm[item.prop] = selectedValues;
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// return initialForm;
|
||||
// };
|
||||
// form.value=doFormData();
|
||||
|
||||
const rules: FormRules = options.list.map(item => {
|
||||
if (item.required) {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ export interface Function{
|
|||
Info: string;
|
||||
UserID: number;
|
||||
ModelID: number | Object | Array<any>;
|
||||
ModelIDs: string;
|
||||
ModelIDS: string| Object | Array<any>;
|
||||
Function: string;
|
||||
}
|
||||
|
|
@ -19,3 +19,17 @@ export interface ModelParameter{
|
|||
APIKey: string;
|
||||
APISecret: string;
|
||||
}
|
||||
|
||||
export interface ModelContent{
|
||||
ID: number;
|
||||
CreatedAt: string;
|
||||
UpdatedAt: string;
|
||||
DeletedAt: string;
|
||||
Name: string;
|
||||
Url: string;
|
||||
UserID: number;
|
||||
Type: string;
|
||||
Parameter: string;
|
||||
Description: string;
|
||||
token: number; //消耗大模型的token
|
||||
}
|
||||
|
|
@ -100,6 +100,16 @@
|
|||
>发送</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="3" style="text-align: center">
|
||||
<el-select v-model="selectModel" placeholder="选择模型">
|
||||
<el-option
|
||||
v-for="item in ModelList"
|
||||
:key="item.ID"
|
||||
:label="item.Type +':' + item.Description"
|
||||
:value="item.ID"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</div>
|
||||
|
|
@ -109,7 +119,7 @@
|
|||
<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 { WSMessage} from "@/types/im";
|
||||
import { ElMessage } from "element-plus";
|
||||
import { GetMessageService } from "@/api/im";
|
||||
import { Check, Loading, DocumentCopy } from "@element-plus/icons-vue";
|
||||
|
|
@ -117,10 +127,12 @@ import MarkdownIt from "markdown-it";
|
|||
import hljs from "highlight.js";
|
||||
import { Session } from "@/types/session";
|
||||
import { FindSessionService } from "@/api/session";
|
||||
import { FindModelListByFunctionName } from "@/api/function";
|
||||
import markdownItHighlightjs from "markdown-it-highlightjs";
|
||||
import markdownItKatex from "markdown-it-katex";
|
||||
import mermaidPlugin from "@agoose77/markdown-it-mermaid";
|
||||
import "katex/dist/katex.min.css";
|
||||
import { Model } from "@/types/model";
|
||||
interface Message {
|
||||
role: "user" | "assistant";
|
||||
content: string;
|
||||
|
|
@ -149,6 +161,8 @@ const sessionID = ref(0);
|
|||
const messagesContainer = ref<HTMLDivElement | null>(null);
|
||||
const sessionIsShow = ref(false);
|
||||
const sessionName = ref("");
|
||||
const ModelList = ref<Model[]>([]);
|
||||
const selectModel = ref(0);
|
||||
|
||||
const renderMarkdown = (content: string) => {
|
||||
return md.render(content);
|
||||
|
|
@ -288,6 +302,7 @@ const sendMessage = () => {
|
|||
type: "ollama",
|
||||
function: "gen-ai-chat",
|
||||
session_id: sessionID.value,
|
||||
model_id: selectModel.value,
|
||||
};
|
||||
try {
|
||||
socket.value.send(JSON.stringify(msg));
|
||||
|
|
@ -388,6 +403,27 @@ const copyMessage = (content: string) => {
|
|||
ElMessage.error("复制失败: " + error);
|
||||
});
|
||||
};
|
||||
|
||||
const GetModelListByFunctionName = async () => {
|
||||
let req = {
|
||||
function: "gen-ai-chat",
|
||||
token: localStorage.getItem("token"),
|
||||
};
|
||||
try{
|
||||
let result = await FindModelListByFunctionName(req);
|
||||
if (result["code"] === 0) {
|
||||
ModelList.value = result["data"];
|
||||
selectModel.value = ModelList.value[0].ID;
|
||||
console.log("model_list:", ModelList.value);
|
||||
} else {
|
||||
ElMessage.error(result["msg"]);
|
||||
}
|
||||
}catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
};
|
||||
|
||||
GetModelListByFunctionName();
|
||||
</script>
|
||||
<style scoped>
|
||||
.chat-app {
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ const getData = async () => {
|
|||
type: "UserID"
|
||||
}
|
||||
let modelResult = await FindModelService(req);
|
||||
model_select_opts.value.length = 0; // 清空数组
|
||||
for (let i = 0; i < modelResult.data.length; i++) {
|
||||
model_select_opts.value.push({
|
||||
label: modelResult.data[i].Type + ":" + modelResult.data[i].Description,
|
||||
|
|
@ -112,7 +113,7 @@ let options = ref<FormOption>({
|
|||
span: 12,
|
||||
list: [
|
||||
{ type: 'input', label: '名称', prop: 'Name', required: true },
|
||||
{ type: 'select', label: '模型', prop: 'ModelID', required: true, opts:model_select_opts.value },
|
||||
{ type: 'select', label: '模型', prop: 'ModelIDS', required: true, opts:model_select_opts.value ,multiple: true},
|
||||
{ type: 'input', label: '功能', prop: 'Function', required: true },
|
||||
{ type: 'input', label: '描述', prop: 'Info', required: true },
|
||||
]
|
||||
|
|
@ -138,13 +139,20 @@ const rowData = ref({});
|
|||
const handleEdit = async (row: Function) => {
|
||||
let data = row;
|
||||
rowData.value = data;
|
||||
let model_ids = JSON.parse(data.ModelIDS.toString())
|
||||
let model_id_list = []
|
||||
for (let i = 0; i < model_ids.length; i++) {
|
||||
model_id_list.push(model_ids[i]["id"])
|
||||
}
|
||||
rowData.value.ModelIDS = model_id_list
|
||||
//console.log("edit_row_data:", rowData.value);
|
||||
isEdit.value = true;
|
||||
visible.value = true;
|
||||
};
|
||||
const updateData = async (data) => {
|
||||
let model_id =[]
|
||||
let model_id_list= data["ModelID"]
|
||||
console.log("model update:",data)
|
||||
let model_id_list= data["ModelIDS"]
|
||||
for (let i = 0; i < model_id_list.length; i++) {
|
||||
model_id.push({"id":model_id_list[i]})
|
||||
}
|
||||
|
|
@ -175,12 +183,20 @@ const updateData = async (data) => {
|
|||
};
|
||||
|
||||
const addData = async (data) => {
|
||||
let model_id =[]
|
||||
console.log("model update:",data)
|
||||
let model_id_list= data["ModelIDS"]
|
||||
for (let i = 0; i < model_id_list.length; i++) {
|
||||
model_id.push({"id":model_id_list[i]})
|
||||
}
|
||||
let model_ids = JSON.stringify(model_id)
|
||||
let result ={}
|
||||
try{
|
||||
let req={
|
||||
token:localStorage.getItem("token"),
|
||||
name: data.Name,
|
||||
model_id: data.ModelID,
|
||||
model_id: model_id_list[0],
|
||||
model_ids: model_ids,
|
||||
function: data.Function,
|
||||
info: data.Info
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue