From 1fa91c6d2022d863de897e27863b7e960731e59f Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期四, 28 十一月 2024 15:26:11 +0800 Subject: [PATCH] 关闭曲线查询界面 --- src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue | 301 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 222 insertions(+), 79 deletions(-) diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue index e4e1509..1cdc316 100644 --- a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue +++ b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue @@ -1,10 +1,11 @@ <!-- 鏌ヨ鏈�鏂拌鍛婁俊鎭� --> <template> <div class="w-full flex-column"> - <div class="flex-0 flex-items-center mb-1 h-[38px]"> + <div class="flex-0 flex-items-center mb-1 flex-wrap"> <template v-if="visibleParams && visibleParams.length > 0 && showFilter"> <component - class="flex-0 m-2" + class="flex-0 m-2 first-of-type:ml-0" + :class="{ invisible: showMode2 === DisplayModeType2.Map}" v-model="visibleParams[index].value" v-for="(item, index) in visibleParams as any" :key="item.id" @@ -13,13 +14,39 @@ :data="item" @change="(val) => handleQueryChange(val, item)" :originData="originData" + :disabled="disabled" ></component> </template> - <ColFilter v-if="!isTotalTable" class="ml-auto" :columnList="colList" @change="colFilterChange" /> - <DisplayMode v-if="isTotalTable" class="ml-auto" :order="modeChangeOrder" v-model="showMode" @change="displayModeChange" /> + <DisplayMode + v-if="isTotalTable" + class="ml-auto" + :order="modeChangeOrder" + v-model="showMode" + :modeTypeMap="displayModeTypeMap" + @change="displayModeChange" + /> + <div class="ml-auto space-x-2 flex-items-center" v-if="isMap || !isTotalTable"> + <ColFilter + v-if="(!isMap && !isTotalTable) || (isMap && showMode2 === DisplayModeType2.List && !isTotalTable)" + :columnList="colList" + @change="colFilterChange" + /> + + <DisplayMode + v-if="isMap" + :order="modeChangeOrder2" + :modeTypeMap="displayModeTypeMap2" + v-model="showMode2" + @change="displayModeChange2" + /> + </div> </div> - <div class="flex-auto flex-col" style="display: flex" v-show="showMode === DisplayModeType.List"> + <div + class="flex-auto flex-col" + style="display: flex" + v-show="(!isMap && showMode === DisplayModeType.List) || (isMap && showMode2 === DisplayModeType2.List)" + > <div class="flex-auto" ref="containerRef" v-resize="resizeHandler" v-loading="queryLoading"> <el-table ref="tableRef" @@ -27,7 +54,9 @@ :cell-style="tableCellStyle" :header-cell-style="tableHeaderCellStyle" :data="tableData" - @row-click="recordSelectChange" + @row-dblclick="tableDblClick" + @row-click="tableRowClick" + @sort-change="sortChange" :spanMethod="objectSpanMethod" class="w-full h-full" highlightCurrentRow @@ -42,9 +71,10 @@ :type="item.type" :label="item.label" :width="item.width" - :sortable="item.sortable" + :sortable="item.sortable ? 'custom' : false" :key="item.prop" :prop="item.prop" + @sortChange="sortChange" show-overflow-tooltip /> </template> @@ -57,7 +87,7 @@ :type="item.type" :label="item.label" :width="item.width" - :sortable="item.sortable" + :sortable="item.sortable ? 'custom' : false" :key="item.prop" :prop="item.prop" show-overflow-tooltip @@ -85,9 +115,22 @@ /> </div> + <div class="flex-auto" v-if="isMap && showMode2 === DisplayModeType2.Map"> + <MapView :data="data" @equipClick="showCurve" @closeInfoWindow="closeInfoWindow"/> + </div> + <div class="flex-auto" v-resize="debounceResizeChart" v-show="showMode === DisplayModeType.Chart"> <div ref="chartRef" style="height: 25rem"></div> </div> + <div class="mt-5 relative" v-if="chartDlgIsShow&& metricsList.length>0"> + <span class="absolute right-[10px] top-[5px] ywifont ywicon-guanbi text-[#528abe] font-bold cursor-pointer" style="z-index: 2;" @click="closeChartDlg"></span> + <el-tabs v-model="activeTab" type="border-card" > + <el-tab-pane lazy v-for="(item, index) in metricsList" :key="`${chartDlgKey}_${index}`" :label="item.title" :name="index" + ><RecordSetDialog :modelValue="true" :isDialog="false" height="20rem" :metrics="item" + /></el-tab-pane> + </el-tabs> + </div> + <InfoDetail class="text-base" v-model="infoDetailIsShow" :item="detailMapRow" :colList="colList" /> </div> @@ -95,25 +138,26 @@ <script setup lang="ts"> import { createReusableTemplate } from '@vueuse/core'; -import type { TableInstance } from 'element-plus'; -import _ from 'lodash'; -import type { CSSProperties } from 'vue'; -import { computed, nextTick, onMounted, reactive, ref, type PropType, watchEffect, shallowRef } from 'vue'; -import { BORDER_COLOR, COL_HEADER_CELL_BG_COLOR, THICK_BORDER_WIDTH } from '../deviceLastValue/constants'; -import ColFilter from '/@/components/table/colFilter/ColFilter.vue'; -import { TableCol } from '/@/components/table/colFilter/types'; -import { debounce, getTextWidth, toPercent } from '/@/utils/util'; -import InfoDetail from './infoDetail/InfoDetail.vue'; -import StringInput from './components/StringInput.vue'; -import { curveQuery } from '/@/api/ai/chat'; -import { RecordSetParamsType, recordSetMapCom } from '../recordSet/types'; -import { DisplayModeType } from '../recordSet/components/types'; -import DisplayMode from '../recordSet/components/DisplayMode.vue'; import * as echarts from 'echarts'; +import type { TableInstance } from 'element-plus'; +import { chunk, sortBy } from 'lodash-es'; +import type { CSSProperties } from 'vue'; +import { computed, nextTick, onMounted, reactive, ref, shallowRef, watchEffect, type PropType } from 'vue'; import { PATH_ICON } from '../../../common'; import { ChartTypeEnum } from '../../../types'; +import { BORDER_COLOR, COL_HEADER_CELL_BG_COLOR, THICK_BORDER_WIDTH } from '../deviceLastValue/constants'; +import DisplayMode from '../recordSet/components/DisplayMode.vue'; +import { DisplayModeType, DisplayModeType2, displayModeTypeMap, displayModeTypeMap2 } from '../recordSet/components/types'; +import { RecordSetParamsType, recordSetMapCom } from '../recordSet/types'; +import InfoDetail from './infoDetail/InfoDetail.vue'; +import MapView from './map/Map.vue'; +import { curveQuery } from '/@/api/ai/chat'; +import ColFilter from '/@/components/table/colFilter/ColFilter.vue'; +import { TableCol } from '/@/components/table/colFilter/types'; import { axisLabelFormatter } from '/@/utils/chart'; import { LocalPlus } from '/@/utils/storage'; +import { debounce, getTextWidth, toPercent } from '/@/utils/util'; +import RecordSetDialog from '../recordSet/RecordSetDialog.vue'; const props = defineProps({ data: { @@ -133,6 +177,10 @@ type: Boolean, default: true, }, + disabled: { + type: Boolean, + default: false, + }, }); const [DefineColumns, ReuseColumns] = createReusableTemplate<{ @@ -145,6 +193,10 @@ const checkIsTotalTable = (propsData) => { return propsData?.hasOwnProperty('agg_count_col') ?? false; }; + +const isMap = computed(() => { + return props.data?.hasOwnProperty('map') ?? false; +}); const isTotalTable = computed(() => checkIsTotalTable(props.data)); @@ -250,7 +302,7 @@ ...item, width: 0, label: item.title, - // sortable: item.type === 'time', + sortable: !!item.name, prop: index + '', isShow: isShow, } as TableCol; @@ -417,7 +469,7 @@ // 褰撳墠宸叉弧瓒冲搴� let curWidth = 0; // 鎺掑ソ搴忕殑瀹藉害鍒楄〃 - const sortedWidthList = _.sortBy(maxWidthList, 'maxWidth'); + const sortedWidthList = sortBy(maxWidthList, 'maxWidth'); // 鍓╀綑瀹藉害 let restWidth = width; let notFitStartIndex = 1; @@ -546,7 +598,7 @@ tableRef.value.doLayout(); // pager.index = 1; - chunkTableData.value = _.chunk(tableValues.value ?? [], pager.size); + chunkTableData.value = chunk(tableValues.value ?? [], pager.size); }; //#endregion @@ -572,7 +624,7 @@ // 鏄惁宸茬粡鏄剧ず鎵�鏈夊垪浜� const haveShowAll = computed(() => visibleColProp.value.length === colList.value.length); -const recordSelectChange = (row) => { +const showInfoDetail = (row) => { if (haveShowAll.value) return; detailMapRow.value = row; infoDetailIsShow.value = true; @@ -586,69 +638,79 @@ }); //#region ====================== 琛ㄦ牸杩囨护鍙傛暟 ====================== - -const queryLoading = ref(false); -const queryUpdate = async (val: any, item: any) => { - const historyId = (props as any).originData.historyId; +const getFilterList = () => { const curAgentKey = props.data.agent_key; + + // 鐩稿悓 agent_key 涓嬫墍鏈� filter 璇锋眰鍙傛暟 + const filterList = ((props as any).originData?.content?.origin?.summary ?? []).reduce((preVal, curVal) => { + if (curVal.agent_key !== curAgentKey) return preVal; + + const filter = (curVal.filter ?? []).reduce((subPreVal, subCurVal) => { + if (subCurVal.type === RecordSetParamsType.StringInput) { + subPreVal.push({ + update: subCurVal.update, + value: subCurVal.value, + path: subCurVal.path, + }); + } else if (subCurVal.type === RecordSetParamsType.TimeRange) { + subPreVal.push( + ...[ + { + update: subCurVal.update, + value: subCurVal.start_value, + path: subCurVal.start_path, + }, + { + update: subCurVal.update, + value: subCurVal.end_value, + path: subCurVal.end_path, + }, + ] + ); + } else if (subCurVal.type === RecordSetParamsType.Step) { + subPreVal.push({ + update: subCurVal.update, + value: subCurVal.step_value, + path: subCurVal.step_path, + }); + } + + return subPreVal; + }, []); + + preVal = preVal.concat(filter); + + return preVal; + }, []); + + return filterList; +}; +const queryLoading = ref(false); +let orderDimName = ''; +const queryUpdate = async (val?: any, item?: any) => { + const historyId = (props as any).originData.historyId; let res = null; - // 鏀瑰彉鍘熷鍊� - if (item.type === RecordSetParamsType.StringInput) { - item.origin.value = val; - } else if (item.type === RecordSetParamsType.TimeRange) { - item.origin.start_value = val[0]; - item.origin.end_value = val[1]; - } else if (item.type === RecordSetParamsType.Step) { - item.origin.step_value = val; + if (item) { + // 鏀瑰彉鍘熷鍊� + if (item.type === RecordSetParamsType.StringInput) { + item.origin.value = val; + } else if (item.type === RecordSetParamsType.TimeRange) { + item.origin.start_value = val[0]; + item.origin.end_value = val[1]; + } else if (item.type === RecordSetParamsType.Step) { + item.origin.step_value = val; + } } + + const filterList = getFilterList(); try { - // 鐩稿悓 agent_key 涓嬫墍鏈� filter 璇锋眰鍙傛暟 - const filterList = ((props as any).originData?.content?.origin?.summary ?? []).reduce((preVal, curVal) => { - if (curVal.agent_key !== curAgentKey) return preVal; - - const filter = (curVal.filter ?? []).reduce((subPreVal, subCurVal) => { - if (subCurVal.type === RecordSetParamsType.StringInput) { - subPreVal.push({ - update: subCurVal.update, - value: subCurVal.value, - path: subCurVal.path, - }); - } else if (subCurVal.type === RecordSetParamsType.TimeRange) { - subPreVal.push( - ...[ - { - update: subCurVal.update, - value: subCurVal.start_value, - path: subCurVal.start_path, - }, - { - update: subCurVal.update, - value: subCurVal.end_value, - path: subCurVal.end_path, - }, - ] - ); - } else if (subCurVal.type === RecordSetParamsType.Step) { - subPreVal.push({ - update: subCurVal.update, - value: subCurVal.step_value, - path: subCurVal.step_path, - }); - } - - return subPreVal; - }, []); - - preVal = preVal.concat(filter); - - return preVal; - }, []); const params = { history_id: historyId, // 鏌ヨ鍓嶅悗 agent_key 涓嶄細鍙� agent_key: props.data.agent_key, filter_json: JSON.stringify(filterList), + order_dim_name: orderDimName, }; res = await curveQuery(params); queryLoading.value = true; @@ -1052,6 +1114,87 @@ }; //#endregion +const orderMap = new Map(); +const sortChange = ({ column, prop, order }) => { + // 鎭㈠鍘熺姸锛屾洿鏂板悗鍐嶆樉绀烘帓搴忕姸鎬� + const curOrder = orderMap.get(prop) ?? null; + column.order = curOrder; + + let sendOrder; + if (order === 'descending') { + sendOrder = 'desc'; + } else if (order === 'ascending') { + sendOrder = 'asc'; + } else { + sendOrder = ''; + } + const colName = colList.value[prop].name; + const sendOrderName = sendOrder ? `${colName},${sendOrder}` : ''; + orderDimName = sendOrderName; + + queryUpdate().then(() => { + orderMap.set(prop, order); + column.order = order; + }); +}; + +// 鍦板浘妯″紡灞曠ず +const showMode2 = ref(DisplayModeType2.Map); +const modeChangeOrder2 = [DisplayModeType2.Map, DisplayModeType2.List]; + +const displayModeChange2 = (val: DisplayModeType2) => { + if (val === DisplayModeType2.Map) { + //if (!chartInstance.value || needUpdateChart) { + //updateChart(); + //needUpdateChart = false; + //} + } +}; + +const chartDlgIsShow = ref(false); +const chartDlgKey= ref(''); +const activeTab = ref(0); +const metricsList = ref([]); +const resetTab = () => { + activeTab.value = 0; +}; +const showCurve = (row) => { + resetTab(); + chartDlgIsShow.value = true; + const quotaChartCol = props.data?.quota_chart?.col; + if (!quotaChartCol) { + chartDlgKey.value = ''; + metricsList.value = []; + } else { + const str = row[quotaChartCol] ?? '[]' + chartDlgKey.value = str; + metricsList.value = JSON.parse(str); + + } +}; +const closeInfoWindow =()=>{ + closeChartDlg(); +} +const closeChartDlg = () =>{ + chartDlgIsShow.value = false; + +} + +const tableRowClick = (row) => { + if (isMap.value) { + showCurve(row); + } else { + showInfoDetail(row); + } + chartDlgIsShow.value = true; +}; + +const tableDblClick = (row) => { + if (!isMap.value) return; + showInfoDetail(row); +}; + + defineExpose({ updateAll, updateCurrent, -- Gitblit v1.9.3