From f4354c5a98c6a3bdb4f355b107e2421848f1426b Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 13 十一月 2024 17:31:52 +0800
Subject: [PATCH] Merge branches 'test' and 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test
---
src/views/project/yw/systemManage/metricMgr/MetricDetail.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue b/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
index 8cb0472..c37c5dd 100644
--- a/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
+++ b/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
@@ -42,7 +42,7 @@
<el-divider />
</div>
</el-tab-pane>
- <el-tab-pane label="鎸囨爣鎺㈢储" name="indicatorExploration" class="h-full">
+ <el-tab-pane label="鎸囨爣鍥捐氨" name="indicatorExploration" class="h-full">
<div class="h-full flex-column">
<el-form :model="dialogFormValue" class="flex-0" ref="dialogFormRef" :rules="dialogFormRules">
<el-form-item label="鏃ユ湡鍖洪棿锛�" prop="rangValue" v-if="currentMetrics?.is_time_values ?? true">
@@ -201,10 +201,10 @@
import { eMetrics_Ops } from '/@/views/types/metrics';
import { FormRules } from 'element-plus/es/components/form/src/types';
+import _, { debounce } from 'lodash';
import { computed } from 'vue';
import SummaryCom from './components/SummaryCom.vue';
import { chatMetricsJsonByPost } from '/@/api/metrics';
-import _, { debounce } from 'lodash';
import { useCompRef } from '/@/utils/types';
const defaultTime = ref<[Date, Date]>([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]);
const router = useRouter();
@@ -274,7 +274,7 @@
});
};
//#endregion
-//#region ====================== 鎸囨爣鎺㈢储鏌ヨ ======================
+//#region ====================== 鎸囨爣鍥捐氨鏌ヨ ======================
// 鏃堕棿闄愬埗
const disablesDate = (time) => {
return time.getTime() > new Date().getTime();
@@ -412,7 +412,7 @@
};
//#endregion
-//#region ====================== 鎸囨爣鎺㈢储 ======================
+//#region ====================== 鎸囨爣鍥捐氨 ======================
const filterDimList = computed(
() => currentMetrics?.value?.dimensions ?? [].filter((item) => item.filter_type === 'str_eq' && item.type === '瀛楃涓�')
--
Gitblit v1.9.3