From 3675e202a47910821a86370ae64b60d3cfe93e79 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 02 一月 2025 14:17:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/WI/Web.V1.0
---
src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue | 150 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 55 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/RecordSetTable.vue
index f097a31..2e03ba9 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="{ invisible: isMap && showMode2 === DisplayModeType2.Map }"
v-model="visibleParams[index].value"
v-for="(item, index) in visibleParams as any"
:key="item.id"
@@ -27,7 +27,11 @@
@change="displayModeChange"
/>
<div class="ml-auto space-x-2 flex-items-center" v-if="isMap || !isTotalTable">
- <ColFilter v-if="!isTotalTable" :columnList="colList" @change="colFilterChange" />
+ <ColFilter
+ v-if="(!isMap && !isTotalTable) || (isMap && showMode2 === DisplayModeType2.List && !isTotalTable)"
+ :columnList="colList"
+ @change="colFilterChange"
+ />
<DisplayMode
v-if="isMap"
@@ -57,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">
@@ -112,14 +116,24 @@
</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>
-
- <RecordSetDialog v-model="chartDlgIsShow" indexName="SDVAL_FULL_FLOW" oname="25" otype="DEV_FLOW_W" :isDialog="false" height="20rem"/>
+ <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>
@@ -137,17 +151,17 @@
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 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 RecordSetDialog from '../recordSet/RecordSetDialog.vue';
-
+import { isSharePage } from '/@/stores/chatRoom';
const props = defineProps({
data: {
@@ -170,6 +184,13 @@
disabled: {
type: Boolean,
default: false,
+ },
+ reportIndex: {
+ type: Number,
+ default: 0,
+ },
+ historyId: {
+ type: String,
},
});
@@ -339,7 +360,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>();
@@ -374,28 +415,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锛夋�诲灏忎簬瀹瑰櫒瀹斤細鐩存帴鎸夋瘮渚嬪垎
@@ -403,6 +422,7 @@
* 3锛夎绠楀畬鐨勫搴︽斁鍦� colList.value 鐨� width 灞炴�т笂
* @param width
*/
+
const calcColWidth = (width) => {
// 杩斿洖鎵�鏈夋爣棰樺瓧绗︿覆
const maxStrList = tableCols.value.map((item, index) => {
@@ -528,7 +548,7 @@
borderColor: BORDER_COLOR,
borderWidth: `${THICK_BORDER_WIDTH}px`,
color: '#7331a5',
- fontSize: '0.875rem',
+ // fontSize: '0.875rem',
...extraStyle,
};
};
@@ -547,7 +567,7 @@
borderWidth: `${THICK_BORDER_WIDTH}px`,
backgroundColor: COL_HEADER_CELL_BG_COLOR,
fontWeight: 700,
- fontSize: '0.875rem',
+ // fontSize: '0.875rem',
color: '#000',
...extraStyle,
};
@@ -678,7 +698,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) {
@@ -701,6 +721,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;
@@ -1141,33 +1162,52 @@
}
};
-const chartDlgIsShow = ref(false)
-
-const showCurve = (row) =>{
+const chartDlgIsShow = ref(false);
+const chartDlgKey = ref('');
+const activeTab = ref(0);
+const metricsList = ref([]);
+const resetTab = () => {
+ activeTab.value = 0;
+};
+const showCurve = (row) => {
+ if(isSharePage.value) return;
+ resetTab();
chartDlgIsShow.value = true;
-}
-const tableRowClick =(row)=>{
- if(isMap.value) {
- showCurve(row)
- }else{
- showInfoDetail(row)
+ 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)
+const tableDblClick = (row) => {
+ 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