From b8924d161f2a49ee138339274dc770a825a834aa Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Fri, 22 Nov 2024 18:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/customTarget/index.vue | 11 ++++++----- src/views/perfManage/kpiCReport/index.vue | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue index 61227c63..98959937 100644 --- a/src/views/perfManage/customTarget/index.vue +++ b/src/views/perfManage/customTarget/index.vue @@ -154,7 +154,9 @@ function fnTableSize({ key }: MenuInfo) { function fnRecordDelete(row: Record) { Modal.confirm({ title: t('common.tipTitle'), - content: t('views.perfManage.customTarget.delCustomTip', { num: row.kpiId }), + content: t('views.perfManage.customTarget.delCustomTip', { + num: row.kpiId, + }), onOk() { const key = 'delThreshold'; message.loading({ content: t('common.loading'), key }); @@ -605,12 +607,12 @@ onMounted(() => { - + @@ -695,7 +697,6 @@ onMounted(() => { - { > { }, ]" > - diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index fd342b4d..1ae622a8 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -318,6 +318,8 @@ function fnGetListTitle() { var language = currentLocale.value.split('_')[0]; if (language === 'zh') language = 'cn'; + if (!state.neType[0]) return false; + // 获取表头文字 listCustom({ neType: state.neType[0], status: 'Active' }) .then(res => { @@ -580,7 +582,7 @@ function fnRanderChartData() { } chartDataXAxisData = Array.from(new Set(chartDataXAxisData)); - ///console.log(queryParams.sortOrder, chartDataXAxisData); + //console.log(queryParams.sortOrder, chartDataXAxisData); //console.log(chartDataXAxisData, chartDataYSeriesData); // 绘制图数据 @@ -724,6 +726,7 @@ onMounted(() => { res.data.forEach((item: any) => { typeArr.push(item.neType); }); + typeArr = Array.from(new Set(typeArr)); neInfoStore.fnNelist().then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { if (res.data.length > 0) {