From c02bff2911f720d54388f4abb6456ec1777f8a96 Mon Sep 17 00:00:00 2001 From: zhangxiao <898441624@qq.com> Date: 星期五, 30 八月 2024 10:40:02 +0800 Subject: [PATCH] fix: 修改bug --- src/views/dmx/knowledgeLib/config.vue | 139 ++++++++++++++++++++++++++-------------------- 1 files changed, 78 insertions(+), 61 deletions(-) diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue index 5e6af51..ebec067 100644 --- a/src/views/dmx/knowledgeLib/config.vue +++ b/src/views/dmx/knowledgeLib/config.vue @@ -18,7 +18,7 @@ v-if="avatarShow" :action="uploadAction" :limit="1" - :url="httpUrl + form.avatar" + :url="form.avatar ? httpUrl + form.avatar : ''" @update:fileList="updateFileList" @success="handleSuccess" ></Upload> @@ -34,22 +34,27 @@ <!-- </a-select>--> <!-- </a-form-item>--> <a-form-item field="embd_id" label="宓屽叆妯″瀷"> - <a-space direction="vertical" size="large"> - <a-select :size="'large'" v-model="form.embd_id" :style="{width:'100%'}" placeholder="璇烽�夋嫨 ..." :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear> - <a-optgroup :label="index" v-for="(item,index) in modelList" :key=index> - <a-option - v-for="(obj) in item" - :key='obj.fid' - :value="obj.llm_name" - > - {{obj.llm_name}} - </a-option> - </a-optgroup> - </a-select> - </a-space> + <a-select :size="'large'" v-model="form.embd_id" placeholder="璇烽�夋嫨 ..." :disabled="kbObj.chunk_num && kbObj.token_num"> + <!-- <a-optgroup :label="index" v-for="(item,index) in mobileData" :key=index> + <a-option + v-for="(obj) in item" + :key='obj.fid' + :value="obj.llm_name" + > + {{obj.llm_name}} + </a-option> + </a-optgroup> --> + <a-option + v-for="(item,index) in mobileData" + :key='item.name' + :value="item.name" + > + {{item.name}} + </a-option> + </a-select> </a-form-item> <a-form-item field="parser_id" label="瑙f瀽鏂规硶"> - <a-select v-model="form.parser_id" placeholder="璇烽�夋嫨" :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear> + <a-select v-model="form.parser_id" placeholder="璇烽�夋嫨" :disabled="!!(kbObj.chunk_num && kbObj.token_num)" > <a-option v-for="item in parser_ids" :key="item.value" :label="item.name" :value="item.value"></a-option> </a-select> </a-form-item> @@ -62,9 +67,7 @@ </a-space> </a-form-item> <a-form-item field="raptor" label="浣跨敤鍙洖澧炲己RAPTOR绛栫暐"> - <a-space direction="vertical" > - <a-switch v-model="form.use_raptor" size="small" /> - </a-space> + <a-switch v-model="form.use_raptor" size="small" /> </a-form-item> <div v-if="form.use_raptor"> <a-form-item field="prompt" label="鎻愮ず璇�"> @@ -154,9 +157,9 @@ </template> <script lang="ts" setup> -import { onMounted, onBeforeMount, reactive, ref } from "vue"; +import { onMounted, onBeforeMount, reactive, ref, nextTick } from "vue"; import { Message } from "@arco-design/web-vue"; -import { queryModelList,kbUpdate } from "@/api/kbList"; +import { queryModelList,kbUpdate,getKnowledgeBaseModel } from "@/api/kbList"; import message from "@arco-design/web-vue/es/message"; import useLoading from "@/hooks/loading"; const { loading,setLoading } = useLoading(true); @@ -191,7 +194,7 @@ description: "", language: "English", permission: "", - embd_id: "BAAI/bge-large-zh-v1.5", + embd_id: "", parser_id: '', layout_recognize: true }); @@ -223,8 +226,9 @@ ], } let visible = ref(false); -const formRef = ref(null); +const formRef = ref(); const modelList = ref({}); +const mobileData= ref<any>([]) const file = ref(); const uploadAction = '/api/v1/llm/upload'; // 鏇挎崲涓轰綘鐨勪笂浼燗PI @@ -318,14 +322,25 @@ Object.assign(form,{ }); - formRef.value.resetFields(); + // formRef.value.resetFields(); } const queryModel = async (params) => { try { - const data = await queryModelList(params); + const data = await getKnowledgeBaseModel(params); + // const res =await queryModelList(params) // console.log(data.data, '澶фā鍨嬪垪琛�'); modelList.value = data.data + for(let key in data.data) { + if (data.data.hasOwnProperty(key)) { // 纭繚鏄璞¤嚜鏈夊睘鎬э紝涓嶆槸鍘熷瀷閾句笂鐨勫睘鎬� + if(data.data[key].llm.length > 0){ + mobileData.value= data.data[key].llm.filter(item => item.type == "embedding") + } + } + + } + + } catch (err) { // you can report use errorHandler or other } finally { @@ -334,43 +349,45 @@ }; const changekbObj = (value) => { - formRef.value.resetFields(); - kbObj = value; - console.log(kbObj, 'kbObj'); - let configObj = { - name: kbObj.name, - avatar: kbObj.avatar, - pages: kbObj.parser_config.pages, - chunk_token_num: kbObj.parser_config.chunk_token_num, - description: kbObj.description, - language: "English", - permission: kbObj.permission, - embd_id: props.kbtenantInfo.embd_id || kbObj.embd_id, - parser_id: kbObj.parser_id, - layout_recognize: true, - } - let raptor = {} - if(kbObj.parser_config && kbObj.parser_config.raptor){ - raptor = kbObj.parser_config.raptor; - Object.assign(form,{ - ...configObj, - ...raptor, - use_raptor: kbObj.parser_config.raptor.use_raptor, - }); - }else{ - Object.assign(form,{ - ...configObj, - use_raptor: false, - }); - } - imageUrls.value = [kbObj.avatar]; - console.log(form,'閰嶇疆椤甸潰琛ㄥ崟淇℃伅'); - avatarShow.value = false; - setTimeout(() => { - avatarShow.value = true; - },100); - scrollContainer.value.scrollTop = 0; - + + formRef.value.resetFields(); + nextTick(()=>{ + kbObj = value; + console.log(kbObj, 'kbObj'); + let configObj = { + name: kbObj.name, + avatar: kbObj.avatar, + pages: kbObj.parser_config.pages, + chunk_token_num: kbObj.parser_config.chunk_token_num, + description: kbObj.description, + language: "English", + permission: kbObj.permission, + embd_id: kbObj.embd_id || props.kbtenantInfo.embd_id, + parser_id: kbObj.parser_id, + layout_recognize: true, + } + let raptor = {} + if(kbObj.parser_config && kbObj.parser_config.raptor){ + raptor = kbObj.parser_config.raptor; + Object.assign(form,{ + ...configObj, + ...raptor, + use_raptor: kbObj.parser_config.raptor.use_raptor, + }); + }else{ + Object.assign(form,{ + ...configObj, + use_raptor: false, + }); + } + imageUrls.value = [kbObj.avatar]; + console.log(form,'閰嶇疆椤甸潰琛ㄥ崟淇℃伅'); + avatarShow.value = false; + setTimeout(() => { + avatarShow.value = true; + },100); + scrollContainer.value.scrollTop = 0; + }) } defineExpose({ -- Gitblit v1.8.0