From 578928d66720a75e6d06611324532dcb711e079c Mon Sep 17 00:00:00 2001
From: gerson <1405270578@qq.com>
Date: 星期三, 22 一月 2025 10:36:16 +0800
Subject: [PATCH] 统计重复问题
---
src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue | 122 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue
index 635c544..23cd988 100644
--- a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue
+++ b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue
@@ -4,8 +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="{ invisible: showMode2 === DisplayModeType2.Map }"
+ class="flex-0 m-2 first-of-type:ml-0"
+ :class="{ hidden: isMap && showMode2 === DisplayModeType2.Map }"
v-model="visibleParams[index].value"
v-for="(item, index) in visibleParams as any"
:key="item.id"
@@ -61,8 +61,8 @@
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">
@@ -116,17 +116,14 @@
</div>
<div class="flex-auto" v-if="isMap && showMode2 === DisplayModeType2.Map">
- <MapView :data="data" @equipClick="showCurve" />
+ <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>
- <el-tabs v-if="chartDlgIsShow&& metricsList.length>0" v-model="activeTab" type="border-card" class="mt-5">
- <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>
+
+ <EquipCurve v-model:isShow="chartDlgIsShow" class="mt-5" :data="equipCurveMapRow" :quotaChartCol="data?.quota_chart?.col" />
<InfoDetail class="text-base" v-model="infoDetailIsShow" :item="detailMapRow" :colList="colList" />
</div>
@@ -137,6 +134,7 @@
import * as echarts from 'echarts';
import type { TableInstance } from 'element-plus';
import { chunk, sortBy } from 'lodash-es';
+import EquipCurve from './components/EquipCurve.vue';
import type { CSSProperties } from 'vue';
import { computed, nextTick, onMounted, reactive, ref, shallowRef, watchEffect, type PropType } from 'vue';
import { PATH_ICON } from '../../../common';
@@ -149,11 +147,11 @@
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 RecordSetDialog from '../recordSet/RecordSetDialog.vue';
+import { isSharePage } from '/@/stores/chatRoom';
const props = defineProps({
data: {
@@ -177,6 +175,13 @@
type: Boolean,
default: false,
},
+ reportIndex: {
+ type: Number,
+ default: 0,
+ },
+ historyId: {
+ type: String,
+ },
});
const [DefineColumns, ReuseColumns] = createReusableTemplate<{
@@ -196,10 +201,13 @@
const isTotalTable = computed(() => checkIsTotalTable(props.data));
+const checkHasAddRateCol = (current) => {
+ return current.find((item) => item.title === '姣斾緥' && item.type === 'text');
+};
const getTableCols = (propsData) => {
const current = propsData?.cols ?? [];
- if (checkIsTotalTable(propsData)) {
+ if (checkIsTotalTable(propsData) && !checkHasAddRateCol(current)) {
current.push({
title: '姣斾緥',
type: 'text',
@@ -220,7 +228,8 @@
const getTableValues = (propsData) => {
const agg_count_col = propsData?.agg_count_col;
const current = (propsData?.values ?? []) as Array<any[]>;
- if (checkIsTotalTable(propsData)) {
+
+ if (checkIsTotalTable(propsData)&& !current.find(item=>item[0]==='鍚堣') ) {
const last = current[current.length - 1];
const lastItemIndex = last?.length > 0 ? last.length - 1 : 0;
valueColIndex = agg_count_col ?? lastItemIndex;
@@ -345,7 +354,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>();
@@ -380,28 +409,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锛夋�诲灏忎簬瀹瑰櫒瀹斤細鐩存帴鎸夋瘮渚嬪垎
@@ -409,6 +416,7 @@
* 3锛夎绠楀畬鐨勫搴︽斁鍦� colList.value 鐨� width 灞炴�т笂
* @param width
*/
+
const calcColWidth = (width) => {
// 杩斿洖鎵�鏈夋爣棰樺瓧绗︿覆
const maxStrList = tableCols.value.map((item, index) => {
@@ -534,7 +542,7 @@
borderColor: BORDER_COLOR,
borderWidth: `${THICK_BORDER_WIDTH}px`,
color: '#7331a5',
- fontSize: '0.875rem',
+ // fontSize: '0.875rem',
...extraStyle,
};
};
@@ -553,7 +561,7 @@
borderWidth: `${THICK_BORDER_WIDTH}px`,
backgroundColor: COL_HEADER_CELL_BG_COLOR,
fontWeight: 700,
- fontSize: '0.875rem',
+ // fontSize: '0.875rem',
color: '#000',
...extraStyle,
};
@@ -684,7 +692,7 @@
const queryLoading = ref(false);
let orderDimName = '';
const queryUpdate = async (val?: any, item?: any) => {
- const historyId = (props as any).originData.historyId;
+ const historyId = props.historyId;
let res = null;
if (item) {
@@ -707,6 +715,7 @@
agent_key: props.data.agent_key,
filter_json: JSON.stringify(filterList),
order_dim_name: orderDimName,
+ result_group_index: props.reportIndex,
};
res = await curveQuery(params);
queryLoading.value = true;
@@ -1148,25 +1157,19 @@
};
const chartDlgIsShow = ref(false);
-const chartDlgKey= ref('');
-const activeTab = ref(0);
-const metricsList = ref([]);
-const resetTab = () => {
- activeTab.value = 0;
-};
+const equipCurveMapRow = ref(null);
const showCurve = (row) => {
- resetTab();
+ if (isSharePage.value) return;
+ if (!row) return;
+ equipCurveMapRow.value = row;
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;
+ equipCurveMapRow.value = null;
};
const tableRowClick = (row) => {
@@ -1182,14 +1185,11 @@
if (!isMap.value) return;
showInfoDetail(row);
};
+
defineExpose({
updateAll,
updateCurrent,
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