From 4f33e1e616e2a59112a6265073124abd7f0e81ed Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期二, 25 二月 2025 16:00:27 +0800
Subject: [PATCH] 修改地图
---
src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue | 188 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 144 insertions(+), 44 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..23cd988 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="{ hidden: 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,9 +115,15 @@
/>
</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>
+
+ <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>
@@ -99,22 +133,25 @@
import { createReusableTemplate } from '@vueuse/core';
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';
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 { 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';
+import { isSharePage } from '/@/stores/chatRoom';
const props = defineProps({
data: {
@@ -138,6 +175,13 @@
type: Boolean,
default: false,
},
+ reportIndex: {
+ type: Number,
+ default: 0,
+ },
+ historyId: {
+ type: String,
+ },
});
const [DefineColumns, ReuseColumns] = createReusableTemplate<{
@@ -151,12 +195,19 @@
return propsData?.hasOwnProperty('agg_count_col') ?? false;
};
+const isMap = computed(() => {
+ return props.data?.hasOwnProperty('map') ?? false;
+});
+
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',
@@ -177,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;
@@ -302,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>();
@@ -337,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锛夋�诲灏忎簬瀹瑰櫒瀹斤細鐩存帴鎸夋瘮渚嬪垎
@@ -366,6 +416,7 @@
* 3锛夎绠楀畬鐨勫搴︽斁鍦� colList.value 鐨� width 灞炴�т笂
* @param width
*/
+
const calcColWidth = (width) => {
// 杩斿洖鎵�鏈夋爣棰樺瓧绗︿覆
const maxStrList = tableCols.value.map((item, index) => {
@@ -491,7 +542,7 @@
borderColor: BORDER_COLOR,
borderWidth: `${THICK_BORDER_WIDTH}px`,
color: '#7331a5',
- fontSize: '0.875rem',
+ // fontSize: '0.875rem',
...extraStyle,
};
};
@@ -510,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,
};
@@ -577,7 +628,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;
@@ -641,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) {
@@ -664,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;
@@ -1067,7 +1119,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 +1136,54 @@
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 equipCurveMapRow = ref(null);
+const showCurve = (row) => {
+ if (isSharePage.value) return;
+ if (!row) return;
+ equipCurveMapRow.value = row;
+ chartDlgIsShow.value = true;
+};
+const closeInfoWindow = () => {
+ closeChartDlg();
+};
+const closeChartDlg = () => {
+ chartDlgIsShow.value = false;
+ equipCurveMapRow.value = null;
+};
+
+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 +1192,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