From c56e32865068bc1c8c4950394772922d69f820f8 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期日, 03 十一月 2024 17:09:03 +0800
Subject: [PATCH] 修复统计
---
src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue | 255 ++++++++++++++++++++++++++++++--------------------
1 files changed, 152 insertions(+), 103 deletions(-)
diff --git a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
index a7f0e6c..0ab119e 100644
--- a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
+++ b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
@@ -6,120 +6,116 @@
v-loading="treeLoading"
class="h100"
ref="leftTreeRef"
+ :defaultProps="{
+ id: 'group_id',
+ label: 'group_name',
+ children: 'children',
+ }"
:treedata="listTreeData"
- title-name="鍒嗙粍鍒楄〃"
- :show-more-operate="true"
- :show-add="true"
+ title-name="鍦烘櫙鍒楄〃"
+ :show-more-operate="false"
+ defaultExpandAll
+ :show-add="false"
:current-node-key="currentListID"
:node-icon="() => 'ele-Document'"
@click="handleClickNode"
- @tree-edit="openOperateModuleDialog"
- @tree-delete="deleteCurrentModule"
- @tree-add="openOperateModuleDialog"
>
</LeftTreeByMgr>
</template>
<template #header>
<el-form ref="queryFormRef" :inline="true" :model="queryParams">
<el-form-item label="鏍囬" prop="title">
- <el-input v-model="queryParams.title" style="width: 226.4px" placeholder="鏍囬" clearable />
+ <el-input v-model="queryParams.title" style="width: 226.4px" placeholder="鏍囬" clearable @input="debounceQueryTable" />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="ele-Search" @click="handleQueryTable"> 鏌ヨ </el-button>
+ <!-- <el-button type="primary" icon="ele-Search" @click="handleQueryTable"> 鏌ヨ </el-button> -->
<el-button icon="ele-Refresh" @click="resetQuery">閲嶇疆 </el-button>
<el-button icon="ele-Plus" @click="openOptDlg()"> 娣诲姞 </el-button>
</el-form-item>
</el-form>
</template>
<template #main>
- <div class="h-full" ref="chatDragContainerRef">
+ <div class="h-full flex-column">
+ <div class="flex-0 flex">
+ <ColFilter class="ml-auto" :columnList="columnList" />
+ </div>
<el-table
v-loading="tableLoading"
ref="draggableTableRef"
- class="h100"
+ class="flex-auto"
border
:row-class-name="isDragStatus ? 'cursor-move' : 'cursor-pointer'"
:data="displayTableData"
highlight-current-row
>
- <!-- <el-table-column type="expand" fixed="left">
- <template #default="scope">
- <div class="px-4">
- <h3 class="mb-2">椤甸潰鍙傛暟</h3>
- <JsonEditor currentMode="view" :modelValue="scope.row.args" />
- </div>
+ <template v-for="item in columnList" :key="item.prop">
+ <el-table-column
+ v-if="item.isShow ?? true"
+ :prop="item.prop"
+ :label="item.label"
+ :fixed="item.fixed"
+ :width="item.width"
+ showOverflowTooltip
+ >
+ <template #default="scope" v-if="item.prop === 'published'">
+ <el-tag :type="scope.row.published === SupervisorPublished.Y ? 'primary' : 'info'">{{
+ supervisorPublishedMap[scope.row.published]
+ }}</el-tag>
+ </template>
+
+ <template #default="scope" v-else-if="item.prop === 'operate'">
+ <div class="space-x-3 items-center flex">
+ <el-tooltip effect="dark" content="AMIS浣庝唬鐮佺紪杈�" placement="top">
+ <i class="ywifont ywicon-didaima !text-[21px] text-blue-400 cursor-pointer" @click="gotoAmisPage(scope.row)"></i>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鏁版嵁瀵规帴" placement="top">
+ <i class="ywifont ywicon-sjdj !text-[17px] text-blue-400 cursor-pointer" @click="editSqlClick(scope.row)"></i>
+ </el-tooltip>
+
+ <el-tooltip effect="dark" content="瀵硅瘽娴嬭瘯" placement="top">
+ <i class="ywifont ywicon-ceshi !text-[20px] text-blue-400 cursor-pointer" @click="openChatTest(scope.row)"></i>
+ </el-tooltip>
+
+ <el-tooltip
+ effect="dark"
+ :content="scope.row.published === SupervisorPublished.Y ? '鍙栨秷鍙戝竷' : '鍙戝竷'"
+ placement="top"
+ >
+ <i
+ class="ywifont !text-[20px] cursor-pointer"
+ :class="[
+ scope.row.published === SupervisorPublished.Y ? 'ywicon-quxiaofabu text-red-400' : 'ywicon-fabu text-blue-400',
+ ]"
+ @click="
+ publishStatusChange(
+ scope.row.published === SupervisorPublished.Y ? SupervisorPublished.N : SupervisorPublished.Y,
+ scope.row.id,
+ scope.$index
+ )
+ "
+ ></i>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="缂栬緫" placement="top">
+ <i class="ywifont ywicon-bianji !text-[15px] text-blue-400 cursor-pointer" @click="openOptDlg(scope.row)"></i>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ class="ywifont ywicon-shanchu !text-[17px] text-red-400 cursor-pointer"
+ @click="
+ () => {
+ deleteCurrentRow(scope.row, '椤甸潰', supervisorAdminApi.deleteSupervisor, () => {
+ const foundIndex = tableData.findIndex((item) => item === scope.row);
+ foundIndex > -1 && tableData.splice(foundIndex, 1);
+ });
+ }
+ "
+ ></i>
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
</template>
- </el-table-column> -->
- <!-- <el-table-column prop="id" label="id" width="130" fixed="left" show-overflow-tooltip> </el-table-column> -->
-
- <el-table-column prop="title" label="鏍囬" width="300" fixed="left" show-overflow-tooltip> </el-table-column>
- <el-table-column prop="prompt" label="鎻愮ず璇�" width="300" show-overflow-tooltip> </el-table-column>
-
- <el-table-column label="鍒涘缓浜�" prop="creator" width="100" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" prop="create_time" width="105" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鏇存柊鏃堕棿" prop="update_time" width="105" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鍙戝竷鐘舵��" prop="published" width="85" show-overflow-tooltip>
- <template #default="scope">
- <el-tag :type="scope.row.published === SupervisorPublished.Y ? 'primary' : 'info'">{{
- supervisorPublishedMap[scope.row.published]
- }}</el-tag>
- </template>
- </el-table-column>
-
- <el-table-column label="澶囨敞" prop="note" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鎿嶄綔" width="200" fixed="right" show-overflow-tooltip>
- <template #default="scope">
- <div class="space-x-3 items-center flex">
- <el-tooltip effect="dark" content="AMIS浣庝唬鐮佺紪杈�" placement="top">
- <i class="ywifont ywicon-didaima !text-[21px] text-blue-400 cursor-pointer" @click="gotoAmisPage(scope.row)"></i>
- </el-tooltip>
- <el-tooltip effect="dark" content="SQL缂栬緫" placement="top">
- <i class="ywifont ywicon-sql !text-[14px] text-blue-400 cursor-pointer" @click="editSqlClick(scope.row)"></i>
- </el-tooltip>
-
- <el-tooltip effect="dark" content="瀵硅瘽娴嬭瘯" placement="top">
- <i class="ywifont ywicon-ceshi !text-[20px] text-blue-400 cursor-pointer" @click="openChatTest(scope.row)"></i>
- </el-tooltip>
-
- <el-tooltip
- effect="dark"
- :content="scope.row.published === SupervisorPublished.Y ? '鍙栨秷鍙戝竷' : '鍙戝竷'"
- placement="top"
- >
- <i
- class="ywifont !text-[20px] cursor-pointer"
- :class="[
- scope.row.published === SupervisorPublished.Y ? 'ywicon-quxiaofabu text-red-400' : 'ywicon-fabu text-blue-400',
- ]"
- @click="
- publishStatusChange(
- scope.row.published === SupervisorPublished.Y ? SupervisorPublished.N : SupervisorPublished.Y,
- scope.row.id,
- scope.$index
- )
- "
- ></i>
- </el-tooltip>
- <el-tooltip effect="dark" content="缂栬緫" placement="top">
- <i class="ywifont ywicon-bianji !text-[15px] text-blue-400 cursor-pointer" @click="openOptDlg(scope.row)"></i>
- </el-tooltip>
- <el-tooltip effect="dark" content="鍒犻櫎" placement="top">
- <i
- class="ywifont ywicon-shanchu !text-[17px] text-red-400 cursor-pointer"
- @click="
- () => {
- deleteCurrentRow(scope.row, '椤甸潰', supervisorAdminApi.deleteSupervisor, () => {
- const foundIndex = tableData.findIndex((item) => item === scope.row);
- foundIndex > -1 && tableData.splice(foundIndex, 1);
- });
- }
- "
- ></i>
- </el-tooltip>
- </div>
- </template>
- </el-table-column>
</el-table>
<div
v-if="chatTestIsShow"
@@ -147,7 +143,7 @@
<el-dialog
:destroy-on-close="true"
v-model="moduleDialogIsShow"
- width="400"
+ width="300"
:close-on-click-modal="false"
@closed="closeModuleDialog"
>
@@ -172,6 +168,7 @@
label: 'title',
children: 'children',
}"
+ defaultExpandAll
:data="parentSelectOptions"
node-key="id"
:clearable="true"
@@ -201,42 +198,71 @@
<script setup lang="ts">
import { useDraggable } from '@vueuse/core';
-import { deleteCurrentRow, travelTree } from '/@/utils/util';
+import { debounce, travelTree } from '/@/utils/util';
import { computed, onMounted, ref } from 'vue';
import { usePageDisplay } from '/@/hooks/usePageDisplay';
import { useQueryTable } from '/@/hooks/useQueryTable';
// import { useTableSort } from '/@/hooks/useTableSort';
// import { useValidateUniqueness } from '/@/hooks/useValidateUniqueness';
+import axios, { CancelTokenSource } from 'axios';
import type { FormInstance, FormRules } from 'element-plus';
import { ElMessage, ElMessageBox } from 'element-plus';
import { nextTick } from 'vue';
import SqlAmisEdit from './edit/SqlAmisEdit.vue';
import OptDlg from './optDlg/OptDlg.vue';
import { SupervisorPublished, supervisorPublishedMap } from './types';
+import * as agentGroupApi from '/@/api/ai/agentGroup';
import * as supervisorAdminApi from '/@/api/supervisorAdmin';
import { checkSupervisorValidate, updatePublishStatus } from '/@/api/supervisorAdmin';
+import * as supervisorGroupApi from '/@/api/supervisorAdmin/supervisorGroup';
import Chat from '/@/components/chat/Chat.vue';
+import AHMContainer from '/@/components/layout/AHMContainer.vue';
+import ColFilter from '/@/components/table/colFilter/ColFilter.vue';
+import { TableCol } from '/@/components/table/colFilter/types';
+import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue';
+import { useUpdateData } from '/@/hooks/useUpdateData';
import emitter from '/@/utils/mitt';
import { deepClone } from '/@/utils/other';
import { gotoRoute } from '/@/utils/route';
import { useCompRef } from '/@/utils/types';
import { convertListToTree } from '/@/utils/util';
+import { OptClassificationMap, classificationEnum } from '/@/views/types/metrics';
-import * as supervisorGroupApi from '/@/api/supervisorAdmin/supervisorGroup';
-import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue';
-import AHMContainer from '/@/components/layout/AHMContainer.vue';
-import { useUpdateData } from '/@/hooks/useUpdateData';
-
+const columnList = ref<TableCol[]>([
+ { prop: 'title', label: '鏍囬', width: 300, fixed: 'left' },
+ { prop: 'published', label: '鍙戝竷鐘舵��', width: 85 },
+ { prop: 'prompt', label: '鎻愮ず璇�', width: 300 },
+ { prop: 'question', label: '闂', width: 300 },
+ { prop: 'creator', label: '鍒涘缓浜�', width: 100 },
+ { prop: 'create_time', label: '鍒涘缓鏃堕棿', width: 105 },
+ { prop: 'update_time', label: '鏇存柊鏃堕棿', width: 105 },
+ { prop: 'note', label: '澶囨敞' },
+ { prop: 'operate', label: '鎿嶄綔', width: 200, fixed: 'right' },
+]);
//#region ====================== 宸︿晶鏍戞暟鎹紝tree init ======================
-const leftTreeRef = ref(null);
+const leftTreeRef = useCompRef(LeftTreeByMgr);
const treeLoading = ref(false);
const listData = ref([]);
-const currentListID = computed(() => currentNode.value?.id);
+const currentListID = computed(() => currentNode.value?.group_id);
const currentNode = ref(null);
const listTreeData = computed(() => {
- return convertListToTree(listData.value);
+ const byParentData = convertListToTree(listData.value, {
+ ID: 'group_id',
+ ParentID: 'p_group_id',
+ Children: 'children',
+ });
+ const result = [];
+ byParentData.forEach((item) => {
+ if (
+ item.group_type != OptClassificationMap[classificationEnum.Office] &&
+ item.group_type != OptClassificationMap[classificationEnum.Knowledge]
+ ) {
+ result.push(item);
+ }
+ });
+ return result;
});
const updateRelatedType = (extendType) => {
@@ -252,8 +278,8 @@
getTableData();
};
const getListTreeData = async () => {
- const res = await supervisorGroupApi.getSupervisorGroupList();
- listData.value = res.values || [];
+ const res = await agentGroupApi.getSceneGroupTreeByPost();
+ listData.value = res.groups || [];
const firstListTreeNode = listTreeData.value[0];
if (firstListTreeNode) {
handleClickNode(firstListTreeNode);
@@ -367,6 +393,12 @@
//#endregion
//#region ====================== 琛ㄦ牸鏁版嵁锛宼able init ======================
+const getLenById =(data:any[],id:string,value:any)=>{
+ return data.filter(
+ (item) =>
+ item.group_id === id || value.children?.some((treeItem) => treeItem.group_id === item.group_id)
+ ).length;
+}
const tableLoading = ref(false);
const tableData = ref([]);
const isDragStatus = ref(false);
@@ -380,8 +412,18 @@
return item;
});
+
+ travelTree(listTreeData.value, (value, index, array, parent) => {
+ const len = getLenById(allTableData.value,value.group_id,value);
+ value.group_name =`${value.group_name} (${len})`
+
+ })
+
}
- tableData.value = allTableData.value.filter((item) => item.group_id === currentListID.value);
+ tableData.value = allTableData.value.filter(
+ (item) =>
+ item.group_id === currentListID.value || currentNode.value.children?.some((treeItem) => treeItem.group_id === item.group_id)
+ );
};
//#endregion
@@ -393,7 +435,7 @@
const { resetQuery, handleQueryTable, displayTableData } = useQueryTable(tableData, queryParams, () => {
displayTableData.value = tableData.value;
});
-
+const debounceQueryTable = debounce(handleQueryTable, 400);
//#endregion
//#region ====================== 鏌ヨ蹇嵎閿� ======================
@@ -424,6 +466,9 @@
const backLastPage = () => {
supervisorMgrShow.value = true;
+ nextTick(() => {
+ leftTreeRef.value?.treeRef.setCurrentKey(currentListID.value);
+ });
};
//#endregion
@@ -500,7 +545,9 @@
nextTick(() => {
chatRef.value.clear();
- chatRef.value.autoSend(row.prompt);
+ setTimeout(() => {
+ chatRef.value.autoSend(row.question);
+ }, 30);
});
};
@@ -511,7 +558,6 @@
const draggableChatRef = ref<HTMLElement | null>(null);
const chatDragHandlerRef = ref<HTMLDivElement>(null);
-const chatDragContainerRef = ref<HTMLDivElement>(null);
// `style` will be a helper computed for `left: ?px; top: ?px;`
const { x, y, style } = useDraggable(draggableChatRef, {
@@ -522,7 +568,9 @@
},
});
-const questionAi = async (text) => {
+const questionAi = async (text, sourceObj: { source: CancelTokenSource }) => {
+ const currentSource = axios.CancelToken.source();
+ sourceObj.source = currentSource;
const res = await checkSupervisorValidate(
{
id: chatTestMapRow.value.id,
@@ -530,6 +578,7 @@
},
{
loading: false,
+ cancelToken: currentSource.token,
}
);
return res;
--
Gitblit v1.9.3