From b0b31b379cfb6e57ffc14b3d8804256df25a1ac3 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 09 十月 2024 16:01:01 +0800
Subject: [PATCH] metric -> metrics
---
src/views/types/metrics/index.ts | 2
src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue | 40 ++++++++-----------
src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricName.vue | 10 ++--
src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricPrompt.vue | 4 +-
src/api/dimension/index.ts | 2
src/views/project/yw/systemManage/metricMgr/MetricDetail.vue | 2
src/api/metrics/index.ts | 6 +-
src/views/project/yw/systemManage/metricMgr/MetricMgr.vue | 12 +++---
src/views/project/yw/systemManage/supervisorPrompt/SupervisorPrompt.vue | 5 --
9 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/src/api/dimension/index.ts b/src/api/dimension/index.ts
index 6a7c96f..2bcafa2 100644
--- a/src/api/dimension/index.ts
+++ b/src/api/dimension/index.ts
@@ -5,7 +5,7 @@
**/
export const getDimensionListByPost = (extraData: ExtraConfig = {}) =>
request({
- url: `/admin/metric/get_dimension_list`,
+ url: `/admin/metrics/get_dimension_list`,
method: 'post',
params: {},
data: {},
diff --git a/src/api/metric/index.ts b/src/api/metrics/index.ts
similarity index 83%
rename from src/api/metric/index.ts
rename to src/api/metrics/index.ts
index dd102bb..d2c4017 100644
--- a/src/api/metric/index.ts
+++ b/src/api/metrics/index.ts
@@ -9,7 +9,7 @@
extraData: ExtraConfig = {}
) =>
request({
- url: `/admin/metric/get_metric_name_list`,
+ url: `/admin/metrics/get_metrics_name_list`,
method: 'post',
params: {},
data: params,
@@ -22,7 +22,7 @@
**/
export const getMetricAgentListByPost = (extraData: ExtraConfig = {}) =>
request({
- url: `/admin/metric/get_metric_agent_list`,
+ url: `/admin/metrics/get_metrics_agent_list`,
method: 'post',
params: {},
data: {},
@@ -36,7 +36,7 @@
**/
export const checkMetricAgentValidateByPost = (params, extraData: ExtraConfig = {}) =>
request({
- url: `/admin/metric/check_metric_agent_validate`,
+ url: `/admin/metrics/check_metrics_agent_validate`,
method: 'post',
params: {},
data: params,
diff --git a/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue b/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue
index 3eda15d..f7145c7 100644
--- a/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue
+++ b/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue
@@ -27,20 +27,15 @@
<el-table-column type="expand" fixed="left">
<template #default="scope">
<div class="ml-16">
- <h3 >鎸囨爣椤甸潰</h3>
+ <h3>鎸囨爣椤甸潰</h3>
<div v-if="scope.row.supervisor">
- <div class="py-3">椤甸潰鎻愮ず璇嶏細<span class="">{{scope.row.supervisor.prompt}}</span></div>
- <el-table class="w-2/3 " :data="scope.row.supervisor.args" border>
- <el-table-column prop="name" label="鍚嶇О" show-overflow-tooltip>
-
- </el-table-column>
- <el-table-column prop="prompt" label="鍙傛暟鎻愮ず璇�" show-overflow-tooltip>
-
- </el-table-column>
- <el-table-column prop="check" label="缂虹渷鍊�" show-overflow-tooltip>
-
- </el-table-column>
-
+ <div class="py-3">
+ 椤甸潰鎻愮ず璇嶏細<span class="">{{ scope.row.supervisor.prompt }}</span>
+ </div>
+ <el-table class="w-2/3" :data="scope.row.supervisor.args" border>
+ <el-table-column prop="name" label="鍚嶇О" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="prompt" label="鍙傛暟鎻愮ず璇�" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="check" label="缂虹渷鍊�" show-overflow-tooltip> </el-table-column>
</el-table>
</div>
</div>
@@ -68,7 +63,10 @@
<i class="ywifont ywicon-tishici !text-[21px] text-blue-400 cursor-pointer" @click="openCopyPrompt(scope.row)"></i>
</el-tooltip>
<el-tooltip effect="dark" content="鏌ョ湅鎸囨爣鍚嶇О" placement="top">
- <i class="ywifont ywicon-zhibiao !text-[17px] text-blue-400 cursor-pointer" @click="openMetricNameDlg(scope.row)"></i>
+ <i
+ class="ywifont ywicon-zhibiao !text-[17px] text-blue-400 cursor-pointer"
+ @click="openMetricNameDlg(scope.row)"
+ ></i>
</el-tooltip>
<el-tooltip effect="dark" content="瀵硅瘽娴嬭瘯" placement="top">
@@ -142,7 +140,6 @@
<script setup lang="ts">
import { useDraggable } from '@vueuse/core';
-import { deleteCurrentRow } from '/@/utils/util';
import { onMounted, ref } from 'vue';
import { usePageDisplay } from '/@/hooks/usePageDisplay';
@@ -151,19 +148,16 @@
// import { useValidateUniqueness } from '/@/hooks/useValidateUniqueness';
import { ElMessage } from 'element-plus';
import { nextTick } from 'vue';
-import OptDlg from './optDlg/OptDlg.vue';
-import * as metricApi from '/@/api/metric';
-import { checkSupervisorValidate, updatePublishStatus } from '/@/api/supervisorAdmin';
+import * as metricApi from '/@/api/metrics';
+import { updatePublishStatus } from '/@/api/supervisorAdmin';
import Chat from '/@/components/chat/Chat.vue';
-import { gotoRoute } from '/@/utils/route';
import { useCompRef } from '/@/utils/types';
import axios, { CancelTokenSource } from 'axios';
-import HMContainer from '/@/components/layout/HMContainer.vue';
-import { useUpdateData } from '/@/hooks/useUpdateData';
import { SupervisorPublished, supervisorPublishedMap } from '../../lowCode/sqlAmis/types';
-import MetricPrompt from './optDlg/MetricPrompt.vue';
import MetricName from './optDlg/MetricName.vue';
+import MetricPrompt from './optDlg/MetricPrompt.vue';
+import HMContainer from '/@/components/layout/HMContainer.vue';
//#region ====================== 琛ㄦ牸鏁版嵁锛宼able init ======================
const tableLoading = ref(false);
@@ -174,7 +168,7 @@
const res = await metricApi.getMetricAgentListByPost();
allTableData.value = (res.values || []).map((item) => {
item.create_time = item.create_time?.slice(0, 10);
-
+
return item;
});
tableData.value = res?.values ?? [];
diff --git a/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricName.vue b/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricName.vue
index b9854b6..31f80b4 100644
--- a/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricName.vue
+++ b/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricName.vue
@@ -11,7 +11,7 @@
>
<el-table-column prop="title" label="鍚嶇О" width="120" fixed="left" show-overflow-tooltip> </el-table-column>
<el-table-column prop="full_name" label="鍏ㄧО" width="170" show-overflow-tooltip> </el-table-column>
- <el-table-column prop="metric_define" label="瀹氫箟" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="metrics_define" label="瀹氫箟" show-overflow-tooltip> </el-table-column>
<el-table-column prop="calcu_method" label="璁＄畻鏂规硶" width="120" show-overflow-tooltip> </el-table-column>
<el-table-column label="缁村害" prop="dimension" show-overflow-tooltip>
@@ -24,10 +24,10 @@
</template>
<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import * as metricApi from '/@/api/metric';
-import ywDialog from '/@/components/dialog/yw-dialog.vue';
import _ from 'lodash';
+import { computed, ref, watch } from 'vue';
+import * as metricApi from '/@/api/metrics';
+import ywDialog from '/@/components/dialog/yw-dialog.vue';
const props = defineProps(['metricItem']);
const isShow = defineModel({
@@ -38,7 +38,7 @@
const title = computed(() => props.metricItem?.title + '鈥斺�旀寚鏍囧悕绉�');
// 闇�瑕佸悎骞跺崟鍏冩牸鐨� prop
-const GROUP_PROP = ['title', 'full_name', 'metric_define', 'calcu_method'];
+const GROUP_PROP = ['title', 'full_name', 'metrics_define', 'calcu_method'];
const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
if (GROUP_PROP.includes(column.property)) {
return {
diff --git a/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricPrompt.vue b/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricPrompt.vue
index 177e24c..3cf37e5 100644
--- a/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricPrompt.vue
+++ b/src/views/project/yw/systemManage/metricAgentMgr/optDlg/MetricPrompt.vue
@@ -1,8 +1,8 @@
<template>
<yw-dialog headerIcon="ele-Copy" v-model="isShow" :showFooter="false" width="810" :title="title">
<div class="max-h-[2/3vh]">
- <pre class="border pre-wrap">{{ metricItem?.metric_prompt }}</pre>
- <i @click="copyInfo(metricItem?.metric_prompt)" class="ywifont ywicon-copy text-blue-400 !text-[25px] cursor-pointer absolute bottom-10 right-10 " ></i>
+ <pre class="border pre-wrap">{{ metricItem?.metrics_prompt }}</pre>
+ <i @click="copyInfo(metricItem?.metrics_prompt)" class="ywifont ywicon-copy text-blue-400 !text-[25px] cursor-pointer absolute bottom-10 right-10 " ></i>
</div>
</yw-dialog>
</template>
diff --git a/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue b/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
index ed2c6b9..b89926f 100644
--- a/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
+++ b/src/views/project/yw/systemManage/metricMgr/MetricDetail.vue
@@ -150,7 +150,7 @@
<script setup lang="ts">
import { onMounted, reactive } from 'vue';
import { useRoute, useRouter } from 'vue-router';
-import { eDrilling_Ops } from '/@/views/types/metric';
+import { eDrilling_Ops } from '/@/views/types/metrics';
const router = useRouter();
const route = useRoute();
// 瀹氫箟鍙橀噺鍐呭
diff --git a/src/views/project/yw/systemManage/metricMgr/MetricMgr.vue b/src/views/project/yw/systemManage/metricMgr/MetricMgr.vue
index 454474d..d15149b 100644
--- a/src/views/project/yw/systemManage/metricMgr/MetricMgr.vue
+++ b/src/views/project/yw/systemManage/metricMgr/MetricMgr.vue
@@ -31,10 +31,10 @@
<el-form-item label="鏁忔劅搴�" prop="sensitivity">
<el-select v-model="queryParams.sensitivity" style="width: 226.4px" clearable>
<el-option
- v-for="item in Object.keys(eMetric_Ops)"
+ v-for="item in Object.keys(eMetrics_Ops)"
:key="item"
:value="parseInt(item)"
- :label="eMetric_Ops[item]"
+ :label="eMetrics_Ops[item]"
></el-option>
</el-select>
</el-form-item>
@@ -64,7 +64,7 @@
</template>
</el-table-column>
<el-table-column prop="full_name" label="鍏ㄧО" width="170" show-overflow-tooltip> </el-table-column>
- <el-table-column prop="metric_define" label="瀹氫箟" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="metrics_define" label="瀹氫箟" show-overflow-tooltip> </el-table-column>
<el-table-column prop="calcu_method" label="璁＄畻鏂规硶" width="120" show-overflow-tooltip> </el-table-column>
<el-table-column label="缁村害" prop="dimension" show-overflow-tooltip>
@@ -128,16 +128,16 @@
import { computed, onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import { SupervisorPublished } from '../../lowCode/sqlAmis/types';
-import * as metricApi from '/@/api/metric';
+import * as metricApi from '/@/api/metrics';
import HMContainer from '/@/components/layout/HMContainer.vue';
import { usePageDisplay } from '/@/hooks/usePageDisplay';
import { useQueryTable } from '/@/hooks/useQueryTable';
import { convertListToTree } from '/@/utils/util';
-import { eMetric_Ops } from '/@/views/types/metric';
+import { eMetrics_Ops } from '/@/views/types/metrics';
const router = useRouter();
//#region ====================== 鍚堝苟鍗曞厓鏍� ======================
// 闇�瑕佸悎骞跺崟鍏冩牸鐨� prop
-const GROUP_PROP = ['title', 'full_name', 'metric_define', 'calcu_method'];
+const GROUP_PROP = ['title', 'full_name', 'metrics_define', 'calcu_method'];
const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
if (GROUP_PROP.includes(column.property)) {
return {
diff --git a/src/views/project/yw/systemManage/supervisorPrompt/SupervisorPrompt.vue b/src/views/project/yw/systemManage/supervisorPrompt/SupervisorPrompt.vue
index 6d4ed28..9f447a8 100644
--- a/src/views/project/yw/systemManage/supervisorPrompt/SupervisorPrompt.vue
+++ b/src/views/project/yw/systemManage/supervisorPrompt/SupervisorPrompt.vue
@@ -13,10 +13,7 @@
<pre class="pre-wrap" v-else>{{ item }}</pre>
</template>
- <!-- <i
- @click="copyInfo(metricItem?.metric_prompt)"
- class="ywifont ywicon-copy text-blue-400 !text-[25px] cursor-pointer absolute bottom-10 right-10"
- ></i> -->
+
</div>
</el-card>
</template>
diff --git a/src/views/types/metric/index.ts b/src/views/types/metrics/index.ts
similarity index 93%
rename from src/views/types/metric/index.ts
rename to src/views/types/metrics/index.ts
index 3a41287..347f0d7 100644
--- a/src/views/types/metric/index.ts
+++ b/src/views/types/metrics/index.ts
@@ -5,7 +5,7 @@
Important = 2,
Core = 3,
}
-export const eMetric_Ops = {
+export const eMetrics_Ops = {
[eMetricOps.Unlimited]: '闄愬埗',
[eMetricOps.Ordinary]: '鏅��',
[eMetricOps.Important]: '閲嶈',
--
Gitblit v1.9.3