From a6a09d72e056232122258be9bd6adcf013c37aa2 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 5 Sep 2024 10:51:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=BA=94=E7=94=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=AF=E6=8A=A5=E8=A7=84=E5=88=99=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/falseAlermRule.vue             | 24 ++++++++++++--
 .../menuManagement/locale/en-US.ts            |  3 ++
 .../menuManagement/locale/zh-CN.ts            |  3 ++
 .../menuManagement/menuManagement.vue         | 31 ++++++++++---------
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue
index 0f5ceaf146..054659f691 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script async lang="ts" setup>
-  import { useRouter } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { Message, TableData } from '@arco-design/web-vue';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -97,6 +97,7 @@
   const { t } = useI18n();
   const appStore = useAppStore();
   const router = useRouter();
+  const route = useRoute();
   const currentProjectId = computed(() => appStore.currentProjectId);
   const addVisible = ref(false);
   const addLoading = ref(false);
@@ -207,6 +208,18 @@
       dataIndex: 'enable',
       width: 143,
       permission: ['PROJECT_APPLICATION_API:UPDATE'],
+      filterConfig: {
+        options: [
+          {
+            value: true,
+            label: t('common.enable'),
+          },
+          {
+            value: false,
+            label: t('common.close'),
+          },
+        ],
+      },
     },
     {
       title: 'project.menu.rule.label',
@@ -456,7 +469,14 @@
   }
 
   onMounted(() => {
-    setLoadListParams({ projectId: currentProjectId.value });
+    const { status } = route.query;
+    const enabledStatus = status === 'all' ? [] : [true];
+    setLoadListParams({
+      projectId: currentProjectId.value,
+      filter: {
+        enable: [enabledStatus],
+      },
+    });
     fetchData();
   });
 </script>
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts
index f257ac5ab2..3592f544f8 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts
@@ -107,4 +107,7 @@ export default {
   'project.menu.rule.deleteRule': 'Confirm to delete {size} false alert rules?',
   'project.menu.rule.deleteRuleTip':
     'After deletion, it only takes effect on newly executed test reports. Please be cautious!',
+  'project.menu.rule.hasBeenEnabled': 'Have been enabled',
+  'project.menu.rule.bar': 'number',
+  'project.menu.rule.ruleAlertList': 'List of false alarm rules',
 };
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts
index 898ee3c80a..7b91b03a59 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts
@@ -94,4 +94,7 @@ export default {
   'project.menu.rule.enableRuleTip': '启用后，接口返回结果会优先进行误报规则匹配。',
   'project.menu.rule.deleteRule': '确认删除 {size} 条误报规则吗？',
   'project.menu.rule.deleteRuleTip': '删除后，仅对新执行的测试报告生效，请谨慎操作！',
+  'project.menu.rule.hasBeenEnabled': '已启用',
+  'project.menu.rule.bar': '条',
+  'project.menu.rule.ruleAlertList': '误报规则列表',
 };
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
index 7e7b823386..74766a67e3 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
@@ -130,19 +130,15 @@
       <div v-if="record.type === 'API_ERROR_REPORT_RULE'" class="flex w-[100%] flex-row items-center">
         <!--接口测试 误报规则 -->
         <div class="error-report">
-          <a-input-number
-            v-model="allValueMap['FAKE_ERROR_NUM']"
-            class="w-[120px]"
-            disabled
-            :placeholder="t('project.menu.pleaseConfig')"
-          >
-            <template #append>
-              <div>{{ t('project.menu.count') }}</div>
-            </template>
-          </a-input-number>
+          {{ t('project.menu.rule.hasBeenEnabled') }}
+          <span class="text-[rgb(var(--primary-5))]" @click="pushFar(true)">
+            <!-- TODO 待测试字段后台还没有补充 -->
+            {{ allValueMap['ENABLE_FAKE_ERROR_NUM'] || 0 }}
+          </span>
+          {{ t('project.menu.rule.bar') }}
         </div>
-        <div class="ml-[8px] cursor-pointer text-[rgb(var(--primary-7))]" @click="pushFar">
-          {{ t('project.menu.API_ERROR_REPORT_RULE') }}
+        <div class="ml-[8px] cursor-pointer font-medium text-[rgb(var(--primary-5))]" @click="pushFar(false)">
+          {{ t('project.menu.rule.ruleAlertList') }}
         </div>
         <a-tooltip :content="t('project.menu.API_ERROR_REPORT_RULE_TIP')" position="right">
           <div>
@@ -479,7 +475,7 @@
 
   const noTitleColumns = [
     {
-      title: '',
+      title: 'project.menu.name',
       dataIndex: 'module',
       slotName: 'module',
       width: 221,
@@ -845,8 +841,13 @@
     relatedCaseDrawerVisible.value = true;
   };
   // 跳转到误报规则列表页
-  const pushFar = () => {
-    router.push({ name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MENU_MANAGEMENT_ERROR_REPORT_RULE });
+  const pushFar = (isEnable: boolean) => {
+    router.push({
+      name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MENU_MANAGEMENT_ERROR_REPORT_RULE,
+      query: {
+        status: isEnable ? 'enable' : 'all',
+      },
+    });
   };
 
   // 获取执行资源池的名称