From f4354c5a98c6a3bdb4f355b107e2421848f1426b Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期三, 13 十一月 2024 17:31:52 +0800 Subject: [PATCH] Merge branches 'test' and 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test --- src/views/project/yw/dataManage/knowledge/AddKnowledge.vue | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/views/project/yw/dataManage/knowledge/AddKnowledge.vue b/src/views/project/yw/dataManage/knowledge/AddKnowledge.vue index 5852e03..d89123c 100644 --- a/src/views/project/yw/dataManage/knowledge/AddKnowledge.vue +++ b/src/views/project/yw/dataManage/knowledge/AddKnowledge.vue @@ -136,6 +136,7 @@ label: 'group_name', children: 'Children', }" + defaultExpandAll @click="handleClickNode" > </LeftTreeByMgr> @@ -220,14 +221,16 @@ <script setup lang="ts"> import { ElMessage, type FormRules } from 'element-plus'; import moment from 'moment'; -import { computed, nextTick, reactive, ref } from 'vue'; -import { useRouter } from 'vue-router'; +import { computed, nextTick, onMounted, reactive, ref } from 'vue'; +import { useRoute, useRouter } from 'vue-router'; import { add_docvector_file, add_docvector_name } from '/@/api/knowledge/docvector'; import { get_knowledge_group_list, list_knowledge_file } from '/@/api/knowledge/group'; import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue'; import mittBus from '/@/utils/mitt'; import { verifiyNumberInteger } from '/@/utils/toolsValidate'; import { convertListToTree } from '/@/utils/util'; +import { OptClassificationMap, classificationEnum } from '/@/views/types/metrics'; +const route = useRoute(); // 瀹氫箟鍙橀噺鍐呭 const state = reactive({ soliderValue: 0, @@ -318,6 +321,7 @@ fileData: [], //鏂囦欢鏁版嵁婧� isCreateIndex: false, //鏄惁璋冪敤鍒涘缓鐨勭储寮曠殑瀛楁 knowlg_id: '', + groupKnow_id: null, }); //楠岃瘉scope瀛楁鍙兘杈撳叆姝f暣鏁� const validateNumber = (rule, value, callback) => { @@ -356,6 +360,7 @@ //娓呯┖琛ㄥ崟 knowledgeFormRef.value.resetFields(); state.showKnowledgeForm = false; + state.isCreateIndex = false; }; //閫夋嫨鏁版嵁绫诲瀷 const activeDataType = (id: number) => { @@ -381,6 +386,7 @@ }; const backKnowledge = () => { state.showKnowledgeForm = false; + state.isCreateIndex = true; }; //#endregion @@ -390,16 +396,28 @@ const emptyKnowledgeBase = async () => { const valid = await knowledgeFormRef.value.validate().catch(() => {}); if (!valid) return; - console.log('馃殌 ~ currentListID.value:', currentListID.value); + var currentTime = moment().format('YYYY-MM-DD HH:mm:ss'); const res = await add_docvector_name({ title: state.knowledgeForm.title, prompt: state.knowledgeForm.prompt, scope: state.knowledgeForm.scope, - group_id: currentListID.value, + group_id: state.groupKnow_id, }); if (res.json_ok) { state.knowlg_id = res.knowlg_id; + let obj = { + id: state.knowlg_id, + group_id: state.groupKnow_id, + title: state.knowledgeForm.title, + prompt: state.knowledgeForm.prompt, + publish: 'N', + create_time: currentTime, + user_name: '', + scope: state.knowledgeForm.scope, + }; + mittBus.emit('addEmptyKnowledge', obj); getFileTreeData(true); + state.isCreateIndex = false; } }; //瀵煎叆瀹屾垚 @@ -415,6 +433,7 @@ if (res.json_ok) { let obj = { id: state.knowlg_id, + group_id: state.groupKnow_id, title: state.knowledgeForm.title, prompt: state.knowledgeForm.prompt, publish: 'N', @@ -422,7 +441,7 @@ user_name: '', scope: state.knowledgeForm.scope, }; - mittBus.emit('addKnowledgeBaseObj', obj); + mittBus.emit('updateKnowledgeBaseObj', obj); router.push({ name: 'Knowledge' }); //娓呯┖琛ㄥ崟 knowledgeFormRef.value.resetFields(); @@ -440,11 +459,18 @@ const res = await get_knowledge_group_list(); if (res?.json_ok) { const resData = (res.groups || []) as []; - state.knowledgeBaseData = convertListToTree(resData, { + const byParentData = convertListToTree(resData, { ID: 'group_id', Children: 'Children', ParentID: 'p_group_id', }); + const result = []; + byParentData.forEach((item) => { + if (item.group_type == OptClassificationMap[classificationEnum.Knowledge]) { + result.push(item); + } + }); + state.knowledgeBaseData = result; if (selectFirst) { const firstListTreeNode = state.knowledgeBaseData[0]; if (firstListTreeNode) { @@ -459,7 +485,6 @@ } }; const handleClickNode = (data: any) => { - console.log('馃殌 ~ data:', data); multipleSelection.value = []; nextTick(() => { leftTreeRef.value?.treeRef.setCurrentKey(data.group_id); @@ -506,6 +531,10 @@ multipleTableRef.value.toggleRowSelection(item, false); }; //#endregion +onMounted(() => { + const group_id = route.query.group_id; + state.groupKnow_id = group_id; +}); </script> <style scoped lang="scss"> .set-form-height { -- Gitblit v1.9.3