diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 5e27a4b2..476ded9c 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -985,7 +985,6 @@ onBeforeUnmount(() => { diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index 060000eb..6db15cce 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -240,34 +240,33 @@ const statsColumns: TableColumnType[] = [ title: t('views.perfManage.kpiOverView.kpiName'), dataIndex: 'title', key: 'title', - width: '65%', - }, - { - title: t('views.perfManage.kpiOverView.totalValue'), - dataIndex: 'total', - key: 'total', - width: '12%', - sortDirections: ['ascend', 'descend'], - }, - { - title: t('views.perfManage.kpiOverView.avgValue'), - dataIndex: 'avg', - key: 'avg', - width: '24%', - sortDirections: ['ascend', 'descend'], }, + // { + // title: t('views.perfManage.kpiOverView.totalValue'), + // dataIndex: 'total', + // key: 'total', + // width: '12%', + // sortDirections: ['ascend', 'descend'], + // }, + // { + // title: t('views.perfManage.kpiOverView.avgValue'), + // dataIndex: 'avg', + // key: 'avg', + // width: '24%', + // sortDirections: ['ascend', 'descend'], + // }, { title: t('views.perfManage.kpiOverView.maxValue'), dataIndex: 'max', key: 'max', - width: '17%', + width: '200px', sortDirections: ['ascend', 'descend'], }, { title: t('views.perfManage.kpiOverView.minValue'), dataIndex: 'min', key: 'min', - width: '17%', + width: '200px', sortDirections: ['ascend', 'descend'], }, ]; @@ -424,8 +423,8 @@ function fnGetList() { duration: 2, }); tableState.data = []; - tableColumns.value = []; - tableColumnsDnd.value = []; + // tableColumns.value = []; + // tableColumnsDnd.value = []; kpiStats.value = []; //清空数据 fnRanderChartData(); return false; @@ -469,6 +468,26 @@ function fnGetList() { total: total, }); } + } else { + kpiStats.value = []; + for (const columns of tableColumns.value) { + if ( + columns.key === 'neName' || + columns.key === 'startIndex' || + columns.key === 'timeGroup' + ) { + continue; + } + kpiStats.value.push({ + kpiId: columns.key, + title: columns.title, + unit: columns.unit, + max: 0, + min: 0, + avg: 0, + total: 0, + }); + } } }); } @@ -757,7 +776,6 @@ const selectedUnit = ref(null); // 添加处理行点击的方法 function handleRowClick(record: any) { const index = selectedRow.value.indexOf(record.kpiId); - console.log(record); // 如果已经选中,取消选中 if (index > -1) { selectedRow.value.splice(index, 1); @@ -891,7 +909,7 @@ onMounted(() => { return; } // 无查询参数neType时 默认选择UPF - const queryNeType = (route.query.neType as string) || 'UPF'; + const queryNeType = (route.query.neType as string) || 'IMS'; const item = neCascaderOptions.value.find( s => s.value === queryNeType ); @@ -954,6 +972,7 @@ onBeforeUnmount(() => { v-model:value="state.neType" :options="neCascaderOptions" :allow-clear="false" + @change="fnGetListTitle()" :placeholder="t('common.selectPlease')" /> @@ -1041,7 +1060,6 @@ onBeforeUnmount(() => { @@ -1129,7 +1147,7 @@ onBeforeUnmount(() => {
{ const TARGET_KPI_IDS: Record = { AMF: ['AMF.02', 'AMF.03'], UPF: ['UPF.04', 'UPF.05'], - IMS: ['SCSCF.03', 'SCSCF.04', 'SCSCF.06', 'SCSCF.08'], + IMS: ['SCSCF.03', 'SCSCF.04', 'SCSCF.05', 'SCSCF.06', 'SCSCF.07', 'SCSCF.08'], // AMF: ['AMF.02', 'AMF.03', 'AMF.A.07', 'AMF.A.08'], // SMF: ['SMF.02', 'SMF.03', 'SMF.04', 'SMF.05'], @@ -1001,6 +1001,7 @@ const tableRowConfig = computed(() => {