From 7d68c674fc27260c59ab66b349c1f3158c0c0843 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 25 十月 2024 15:33:09 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/components/drawer/CustomDrawer.vue | 313 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 196 insertions(+), 117 deletions(-)
diff --git a/src/components/drawer/CustomDrawer.vue b/src/components/drawer/CustomDrawer.vue
index 174dcfa..7421410 100644
--- a/src/components/drawer/CustomDrawer.vue
+++ b/src/components/drawer/CustomDrawer.vue
@@ -6,7 +6,7 @@
<div class="pc-mouldboard column exampleSlide">
<div class="header flex items-center justify-center">
<div
- class="box-border flex w-[203px] h-[32px] rounded-md items-center justify-between cursor-pointer relative border border-solid border-[#2c2d33]"
+ class="box-border flex w-[234px] h-[32px] rounded-md items-center justify-between cursor-pointer relative border border-solid border-[#2c2d33]"
>
<div
class="tabbar-item"
@@ -25,33 +25,39 @@
</div>
<div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 1">
- <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto">
+ <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]">
<div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl">
<el-input v-model="queryParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable>
</el-input>
</div>
- <div class="mt20 w100 relative" v-show="state.businessTagList.length > 0">
+ <div class="mt10 w100 h100 relative" v-show="state.customBusinessList.length > 0">
<div class="set_custom_label">
<div class="chanel-tags">
- <div v-for="(item, index) in state.businessTagList" :key="index" class="flex items-center">
+ <div
+ v-for="(item, index) in state.customBusinessList"
+ :key="index"
+ :class="{ 'set-group-label-active': state.activeBusinessName === item.group_id }"
+ class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6"
+ @click="handleBusinessClick(item)"
+ >
<span class="set-group-name">{{ item.group_name }}</span>
- <div
- class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center"
- >
- <div
- v-for="(itemChildren, index) in item.Children"
- :key="index"
- :class="{ 'set-label-active': state.activeBusinessChildName === itemChildren.group_id }"
- @click="handleLabelChildClick(itemChildren)"
- class="cursor-pointer rounded-xl bg-[#e0e7f] text-[#b2b2b2] text-[12px] transition-[background-color .1s, color .1s, border-color .1s]"
- >
- <el-divider direction="vertical" />{{ itemChildren.group_name }}
- </div>
- </div>
</div>
</div>
</div>
- <div class="mt20 w100" v-show="finalSampleList.length > 0">
+ <div
+ class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]"
+ >
+ <div
+ v-for="(itemChildren, index) in state.customBusinessChildList"
+ :key="index"
+ :class="{ 'set-label-active': state.activeBusinessChildName === itemChildren.group_id }"
+ @click="handleLabelChildClick(itemChildren)"
+ class="cursor-pointer m-[5px] py-[5px] pl-[10px] rounded-xl border transition-[background-color .1s, color .1s, border-color .1s] text-[#999]"
+ >
+ {{ itemChildren.group_name }}
+ </div>
+ </div>
+ <div class="mt10 overflow-auto set-height-custom" v-show="finalSampleList.length > 0">
<div class="w100 pb-[20px]" v-for="item in finalSampleList" :key="item.sample_id">
<div
class="cursor-pointer flex box-border p-[12px] w100 rounded bg-[#f5f7fd] transition-[background-color .2s]"
@@ -70,39 +76,45 @@
</div>
</div>
</div>
- <div class="mt20 w100" v-show="finalSampleList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div>
+ <div class="mt10 w100" v-show="finalSampleList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div>
</div>
</div>
</div>
<div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 2">
- <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto">
+ <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]">
<div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl">
- <el-input v-model="instructParams.template_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable>
+ <el-input v-model="officeParams.template_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable>
</el-input>
</div>
- <div class="mt20 w100 relative" v-show="state.customOfficeList.length > 0">
+ <div class="mt10 w100 relative h100" v-show="state.customOfficeList.length > 0">
<div class="set_custom_label">
<div class="chanel-tags">
- <div v-for="(item, index) in state.customOfficeList" :key="index" class="flex items-center">
+ <div
+ v-for="(item, index) in state.customOfficeList"
+ :key="index"
+ :class="{ 'set-group-label-active': state.activeOfficeName === item.group_id }"
+ class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6"
+ @click="handleOfficeClick(item)"
+ >
<span class="set-group-name">{{ item.group_name }}</span>
- <div
- class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center"
- >
- <div
- v-for="(itemChildren, index) in item.Children"
- :key="index"
- :class="{ 'set-label-active': state.activeOfficeChildName === itemChildren.group_id }"
- @click="handleOfficeChildClick(itemChildren)"
- class="cursor-pointer rounded-xl bg-[#e0e7f] text-[#b2b2b2] text-[12px] transition-[background-color .1s, color .1s, border-color .1s]"
- >
- <el-divider direction="vertical" />{{ itemChildren.group_name }}
- </div>
- </div>
</div>
</div>
</div>
- <div class="mt20 w100">
- <div class="w100 pb-[20px] flex overflow-auto flex-col" v-for="item in showInstructList" :key="item.group_id">
+ <div
+ class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]"
+ >
+ <div
+ v-for="(itemChildren, index) in state.customOfficeChildList"
+ :key="index"
+ :class="{ 'set-label-active': state.activeOfficeChildName === itemChildren.group_id }"
+ @click="handleOfficeChildClick(itemChildren)"
+ class="cursor-pointer m-[5px] py-[5px] pl-[10px] text-[#999] transition-[background-color .1s, color .1s, border-color .1s]"
+ >
+ {{ itemChildren.group_name }}
+ </div>
+ </div>
+ <div class="mt10 w100 overflow-auto set-height-custom">
+ <div class="w100 pb-[20px] flex flex-col" v-for="item in finalOfficeList" :key="item.group_id">
<div class="bg-[#f5f7fd] p-[12px] transition-[background-color .2s] flex flex-col rounded-2xl">
<div class="flex justify-between">
<span class="set-title">{{ item.template_title }}</span>
@@ -119,33 +131,39 @@
</div>
</div>
<div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 3">
- <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto">
+ <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]">
<div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl">
<el-input v-model="queryParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable>
</el-input>
</div>
- <div class="mt20 w100 relative" v-show="state.knowledgeBaseList.length > 0">
+ <div class="mt10 w100 relative h100" v-show="state.knowledgeBaseList.length > 0">
<div class="set_custom_label">
<div class="chanel-tags">
- <div v-for="(item, index) in state.knowledgeBaseList" :key="index" class="flex items-center">
+ <div
+ v-for="(item, index) in state.knowledgeBaseList"
+ :key="index"
+ :class="{ 'set-group-label-active': state.activeKnowledgeName === item.group_id }"
+ class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6"
+ @click="handleKnowledgeClick(item)"
+ >
<span class="set-group-name">{{ item.group_name }}</span>
- <div
- class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center"
- >
- <div
- v-for="(itemChildren, index) in item.Children"
- :key="index"
- :class="{ 'set-label-active': state.activeKnowledgeChildName === itemChildren.group_id }"
- @click="handleKnowledgeChildClick(itemChildren)"
- class="cursor-pointer rounded-xl bg-[#e0e7f] text-[#b2b2b2] text-[12px] transition-[background-color .1s, color .1s, border-color .1s]"
- >
- <el-divider direction="vertical" />{{ itemChildren.group_name }}
- </div>
- </div>
</div>
</div>
</div>
- <div class="mt20 w100" v-show="finalKnowledgeList.length > 0">
+ <div
+ class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]"
+ >
+ <div
+ v-for="(itemChildren, index) in state.customKnowledgeChildList"
+ :key="index"
+ :class="{ 'set-label-active': state.activeKnowledgeChildName === itemChildren.group_id }"
+ @click="handleKnowledgeChildClick(itemChildren)"
+ class="cursor-pointer m-[5px] py-[5px] pl-[10px] text-[#999] transition-[background-color .1s, color .1s, border-color .1s]"
+ >
+ {{ itemChildren.group_name }}
+ </div>
+ </div>
+ <div class="mt10 w100 overflow-auto set-height-custom" v-show="finalKnowledgeList.length > 0">
<div class="w100 pb-[20px]" v-for="item in finalKnowledgeList" :key="item.sample_id">
<div
class="cursor-pointer flex box-border p-[12px] w100 rounded bg-[#f5f7fd] transition-[background-color .2s]"
@@ -164,7 +182,7 @@
</div>
</div>
</div>
- <div class="mt20 w100" v-show="finalKnowledgeList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div>
+ <div class="mt10 w100" v-show="finalKnowledgeList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div>
</div>
</div>
</div>
@@ -196,9 +214,18 @@
{ ID: 3, Name: '鐭ヨ瘑搴�' },
],
activeName: 1,
- activeBusinessChildName: '', //鍦烘櫙
- activeOfficeChildName: '', //鍔炲叕
- activeKnowledgeChildName: '', //鐭ヨ瘑搴�
+ activeBusinessName: '', //鍦烘櫙
+ activeBusinessChildName: '',
+ customBusinessList: [],
+ customBusinessChildList: [],
+ activeOfficeName: '', //鍔炲叕
+ activeOfficeChildName: '',
+ customOfficeList: [],
+ customOfficeChildList: [],
+ activeKnowledgeName: '', //鐭ヨ瘑搴�
+ activeKnowledgeChildName: '',
+ knowledgeBaseList: [],
+ customKnowledgeChildList: [],
useInstructDialog: false,
instructInfo: {},
inputInstruct: '', //鍙慨鏀规寚浠�
@@ -208,19 +235,17 @@
listInstructLoading: false,
listSampleExpand: false,
listInstructExpand: false,
- knowledgeBaseList: [],
- customTagChildList: [],
- customOfficeList: [],
- businessTagList: [],
});
-const instructContentList = ref([]); //鎸囦护鍒楄〃
-const exampleList = ref([]); //绀轰緥鍒楄〃
+//#region ====================== 浼犲弬 ======================
const isShow = defineModel('isShow', {
type: Boolean,
});
-
-const emit = defineEmits(['updateChatInput']);
const rightBox = computed(() => (isShow.value ? 354 : 0));
+const emit = defineEmits(['updateChatInput']);
+//#endregion
+//#region ====================== 涓氬姟鍦烘櫙/鍔炲叕鍔╂墜/鐭ヨ瘑搴撶殑list ======================
+const instructContentList = ref([]); //鎸囦护鍒楄〃
+const exampleList = ref([]); //绀轰緥鍒楄〃
//鑾峰彇妯＄増鍒楄〃
const getSelectListSample = async () => {
state.listSampleLoading = true;
@@ -259,35 +284,71 @@
});
instructContentList.value = res.templates;
};
-//鍒囨崲鍒版寚浠�/鎻愰棶
-const handleTabClick = (item) => {
+//#endregion
+//#region ====================== 榛樿閫夋嫨绗竴涓殑鍦烘櫙鐨勫瓙鍦烘櫙 ======================
+//tags鏍囩鍒囨崲
+const handleTabClick = async (item) => {
state.activeName = item.ID;
+ if (state.activeName == 2) {
+ if (state.listInstructExpand) return;
+ await getUserTemplate();
+ state.listInstructExpand = true;
+ }
tagListClick(sectionAList.value);
- getTableData();
};
//鍦烘櫙瀛愬満鏅�
+const handleBusinessClick = (item) => {
+ state.activeBusinessName = item.group_id;
+ state.customBusinessChildList = item.Children;
+ if (item.Children.length > 0) {
+ state.activeBusinessChildName = item.Children[0].group_id ?? '';
+ } else {
+ state.activeBusinessChildName = '';
+ state.customBusinessChildList = [];
+ }
+};
const handleLabelChildClick = (item) => {
state.activeBusinessChildName = item.group_id;
};
//鍔炲叕瀛愬満鏅�
+const handleOfficeClick = (item) => {
+ state.activeOfficeName = item.group_id;
+ state.customOfficeChildList = item.Children;
+ if (item.Children.length > 0) {
+ state.activeOfficeChildName = item.Children[0].group_id ?? '';
+ } else {
+ state.activeOfficeChildName = '';
+ state.customOfficeChildList = [];
+ }
+};
const handleOfficeChildClick = (item) => {
state.activeOfficeChildName = item.group_id;
};
//鐭ヨ瘑搴撳瓙鍦烘櫙
+const handleKnowledgeClick = (item) => {
+ state.activeKnowledgeName = item.group_id;
+ state.customKnowledgeChildList = item.Children;
+ if (item.Children.length > 0) {
+ state.activeKnowledgeChildName = item.Children[0].group_id ?? '';
+ } else {
+ state.activeKnowledgeChildName = '';
+ state.customKnowledgeChildList = [];
+ }
+};
const handleKnowledgeChildClick = (item) => {
state.activeKnowledgeChildName = item.group_id;
};
+//#endregion
+//鎵撳紑楂樼骇绀轰緥
const toggleShow = async () => {
isShow.value = !isShow.value;
- if (!isShow.value) {
- loadingData.value = true;
- await getMainSectionList().finally(() => {
- loadingData.value = false;
- });
-
- getTableData();
- }
+ getTableData();
};
+//鍏抽棴楂樼骇绀轰緥
+const handleCloseTemplate = () => {
+ isShow.value = false;
+};
+//鑾峰彇涓诲満鏅垪琛�
const getMainSectionList = async () => {
const res = await getSectionList();
const iconList = [
@@ -309,27 +370,19 @@
};
const loadingData = ref(false);
const getTableData = async () => {
- loadingData.value = true;
-
- try {
+ if (!isShow.value) {
+ loadingData.value = true;
+ await getMainSectionList().finally(() => {
+ loadingData.value = false;
+ });
if (state.activeName == 1 || state.activeName == 3) {
if (state.listSampleExpand) return;
await getSelectListSample();
state.listSampleExpand = true;
}
- if (state.activeName == 2) {
- if (state.listInstructExpand) return;
- await getUserTemplate();
- state.listInstructExpand = true;
- }
- } finally {
- loadingData.value = false;
}
};
-//鍏抽棴楂樼骇绀轰緥
-const handleCloseTemplate = () => {
- isShow.value = false;
-};
+
//#region ====================== templateUseClick ======================
const templateUseClick = (row) => {
state.useInstructDialog = true;
@@ -362,15 +415,18 @@
}
);
//鍔炲叕
-const instructParams = ref({
+const officeParams = ref({
template_title: '',
});
-const { query: queryInstruct, queryData: showInstructList } = useSearch(instructContentList, instructParams);
-
+const { query: queryInstruct, queryData: showInstructList } = useSearch(instructContentList, officeParams);
+const finalOfficeList = computed(() => {
+ const result = showInstructList.value.filter((item) => item.template_group == state.activeOfficeChildName);
+ return result ?? [];
+});
const instructQuery = debounce(queryInstruct);
watch(
- () => instructParams.value.template_title,
+ () => officeParams.value.template_title,
(val) => {
instructQuery();
}
@@ -387,7 +443,7 @@
const knowledgeQuery = debounce(queryKnowledge);
watch(
- () => instructParams.value.template_title,
+ () => officeParams.value.template_title,
(val) => {
knowledgeQuery();
}
@@ -420,8 +476,10 @@
Children: 'Children',
ParentID: 'p_group_id',
});
- state.activeBusinessChildName = treeBusinessList[0].Children[0].group_id ?? '';
- state.businessTagList = treeBusinessList; //涓氬姟鍦烘櫙
+ state.customBusinessList = treeBusinessList; //涓氬姟鍦烘櫙鏁版嵁婧�
+ state.activeBusinessName = treeBusinessList[0].group_id; //榛樿閫変腑绗竴涓笟鍔″満鏅�
+ state.customBusinessChildList = treeBusinessList[0].Children; //榛樿閫変腑绗竴涓笟鍔″満鏅殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮
+ state.activeBusinessChildName = treeBusinessList[0].Children[0].group_id;
break;
case 2:
const treeOfficeList = convertListToTree(officeList, {
@@ -429,8 +487,10 @@
Children: 'Children',
ParentID: 'p_group_id',
});
- state.activeOfficeChildName = treeOfficeList[0].Children[0].group_id ?? '';
- state.customOfficeList = treeOfficeList; //鍔炲叕鍔╂墜
+ state.customOfficeList = treeOfficeList; //鍔炲叕鍔╂墜鏁版嵁婧�
+ state.activeOfficeName = treeOfficeList[0].group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵�
+ state.customOfficeChildList = treeOfficeList[0].Children; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮
+ state.activeOfficeChildName = treeOfficeList[0].Children[0].group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙
break;
case 3:
const treeTagList = convertListToTree(selectTagList, {
@@ -438,14 +498,25 @@
Children: 'Children',
ParentID: 'p_group_id',
});
- state.knowledgeBaseList = treeTagList; //鐭ヨ瘑搴�
- state.activeKnowledgeChildName = treeTagList[0].Children[0].group_id ?? '';
+ state.knowledgeBaseList = treeTagList; //鐭ヨ瘑搴撴暟鎹簮
+ state.activeKnowledgeName = treeTagList[0].group_id; //榛樿閫変腑绗竴涓煡璇嗗簱
+ state.customKnowledgeChildList = treeTagList[0].Children; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙鐨勬暟鎹簮
+ state.activeKnowledgeChildName = treeTagList[0].Children[0].group_id; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙
break;
}
} else {
- state.knowledgeBaseList = [];
+ state.customBusinessList = [];
+ state.customBusinessChildList = [];
+ state.customOfficeChildList = [];
+ state.customKnowledgeChildList = [];
+ state.activeBusinessName = '';
+ state.activeBusinessChildName = '';
+ state.activeOfficeName = '';
+ state.activeOfficeChildName = '';
+ state.activeKnowledgeName = '';
+ state.activeKnowledgeChildName = '';
state.customOfficeList = [];
- state.businessTagList = [];
+ state.knowledgeBaseList = [];
}
};
//#endregion
@@ -454,7 +525,6 @@
</script>
<style scoped lang="scss">
.exampleSlide {
- // position: absolute;
right: 0;
top: 0;
height: 100%;
@@ -463,26 +533,29 @@
z-index: 100;
}
.set_custom_label {
- // height: 141px;
- min-height: 53px;
+ min-height: 32px;
box-sizing: border-box;
- background-color: #f2f4f8;
+ // background-color: #f2f4f8;
border-bottom: 1px solid #eee;
.chanel-tags {
width: 100%;
position: relative;
overflow: hidden;
font-size: 12px;
- color: #000;
+ display: flex;
+ flex-wrap: wrap;
line-height: 26px;
- padding: 6px;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
+ color: #999;
+ cursor: pointer;
box-sizing: border-box;
height: 100%;
.set-group-name {
margin: 0px 7px;
white-space: nowrap;
+ // border: 1px solid #999;
+ // border-radius: 0.75rem;
+ // padding: 0 6px;
+ // line-height: 22px;
}
}
}
@@ -511,7 +584,7 @@
font-size: 14px;
-webkit-animation: right-c650b75e 0.2s;
animation: right-c650b75e 0.2s;
-
+ overflow: hidden;
.header {
box-sizing: border-box;
width: 100%;
@@ -520,7 +593,7 @@
position: relative;
}
.tabbar-item {
- width: 108px;
+ width: 78px;
height: 30px;
font-size: 13px;
font-weight: 400;
@@ -567,10 +640,11 @@
max-height: 180px;
}
.set-group-label-active {
- border-color: #1c86ff;
- color: #1c86ff;
+ border-color: #161616;
+ color: #000;
}
.set-label-active {
+ // background-color: #ccdcfb;
color: #1c86ff;
}
.example-body {
@@ -596,6 +670,7 @@
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
+ overflow: hidden;
.example-item {
background-color: #f0f2f3;
color: #8b939e;
@@ -627,5 +702,9 @@
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
+ overflow: hidden;
+}
+.set-height-custom {
+ height: calc(100% - 120px);
}
</style>
--
Gitblit v1.9.3