From fa6de28a6fe7e79891f3b0f74f2501e010e460b1 Mon Sep 17 00:00:00 2001 From: gerson <1405270578@qq.com> Date: 星期日, 15 十二月 2024 16:33:03 +0800 Subject: [PATCH] 时间排序 --- src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue | 190 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 149 insertions(+), 41 deletions(-) diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue index 8cebd2c..336204d 100644 --- a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue +++ b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue @@ -4,7 +4,8 @@ <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: isMap && showMode2 === DisplayModeType2.Map }" v-model="visibleParams[index].value" v-for="(item, index) in visibleParams as any" :key="item.id" @@ -16,10 +17,36 @@ :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,14 +54,15 @@ :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 :rowClassName="tableRowClassName" - cellClassName="text-sm" - headerCellClassName="text-sm" + cellClassName="" + headerCellClassName="" > <DefineColumns v-slot="{ cols }"> <template v-for="item in colList" :key="item.prop"> @@ -87,8 +115,24 @@ /> </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" /> @@ -99,22 +143,24 @@ import { createReusableTemplate } from '@vueuse/core'; 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 } from '../recordSet/components/types'; +import { DisplayModeType, DisplayModeType2, displayModeTypeMap, displayModeTypeMap2 } from '../recordSet/components/types'; +import RecordSetDialog from '../recordSet/RecordSetDialog.vue'; 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 type { TableCol } from '/@/components/table/colFilter/types'; import { axisLabelFormatter } from '/@/utils/chart'; import { LocalPlus } from '/@/utils/storage'; import { debounce, getTextWidth, toPercent } from '/@/utils/util'; -import { sortBy, chunk } from 'lodash-es'; const props = defineProps({ data: { @@ -150,6 +196,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)); @@ -302,7 +352,27 @@ }; } }; +const getItemMap = (arr: any[], defaultProps = 'ID', isMultiple = false) => { + if (!arr || arr.length === 0) return {}; + const result = arr.reduce((acc, curr) => { + if (isMultiple) { + if (!acc.get(curr[defaultProps])) { + acc.set(curr[defaultProps], [curr]); + } else { + { + /* acc[curr[defaultProps]].push(curr); */ + } + acc.get(curr[defaultProps]).push(curr); + } + } else { + acc.set(curr[defaultProps], curr); + } + return acc; + }, new Map()); + + return result; +}; // 鍗曞厓鏍艰鍚堝苟鎯呭喌 const cellRowSpanMap = new Map<string, number | undefined>(); @@ -337,28 +407,6 @@ return result; }; -const getItemMap = <T>(arr: T[], defaultProps = 'ID', isMultiple = false) => { - if (!arr || arr.length === 0) return {}; - - const result = arr.reduce((acc, curr) => { - if (isMultiple) { - if (!acc.get(curr[defaultProps])) { - acc.set(curr[defaultProps], [curr]); - } else { - { - /* acc[curr[defaultProps]].push(curr); */ - } - acc.get(curr[defaultProps]).push(curr); - } - } else { - acc.set(curr[defaultProps], curr); - } - return acc; - }, new Map()) as Map<string, T | T[]>; - - return result; -}; - /** * 璁$畻姣忎竴鍒楃殑瀹藉害 * 1锛夋�诲灏忎簬瀹瑰櫒瀹斤細鐩存帴鎸夋瘮渚嬪垎 @@ -366,6 +414,7 @@ * 3锛夎绠楀畬鐨勫搴︽斁鍦� colList.value 鐨� width 灞炴�т笂 * @param width */ + const calcColWidth = (width) => { // 杩斿洖鎵�鏈夋爣棰樺瓧绗︿覆 const maxStrList = tableCols.value.map((item, index) => { @@ -491,7 +540,7 @@ borderColor: BORDER_COLOR, borderWidth: `${THICK_BORDER_WIDTH}px`, color: '#7331a5', - fontSize: '0.875rem', + // fontSize: '0.875rem', ...extraStyle, }; }; @@ -510,7 +559,7 @@ borderWidth: `${THICK_BORDER_WIDTH}px`, backgroundColor: COL_HEADER_CELL_BG_COLOR, fontWeight: 700, - fontSize: '0.875rem', + // fontSize: '0.875rem', color: '#000', ...extraStyle, }; @@ -577,7 +626,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; @@ -1067,7 +1116,12 @@ }; //#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'; @@ -1079,7 +1133,65 @@ const colName = colList.value[prop].name; const sendOrderName = sendOrder ? `${colName},${sendOrder}` : ''; orderDimName = sendOrderName; - queryUpdate(); + + 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({ @@ -1088,8 +1200,4 @@ updateIndexSummary, }); </script> -<style scoped lang="scss"> -// :deep(.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell){ -// background-color: v-bind(stripedBgColor); -// } -</style> +<style scoped lang="scss"></style> -- Gitblit v1.9.3