From 10bed5a3e0f35e28f75d66bdbcd7b5e5c86524a3 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 14 Jul 2023 14:21:48 +0800
Subject: [PATCH] fix: bug#16279

---
 .../Alarm/Configuration/Save/Base/index.vue   |   5 +
 .../Alarm/Configuration/Save/Log/indev.vue    |   9 +-
 .../Alarm/Configuration/Save/index.vue        |  10 +-
 .../Alarm/Log/TabComponent/index.vue          | 185 ++++++------------
 .../Alarm/Log/TabComponent/util.ts            |   0
 5 files changed, 78 insertions(+), 131 deletions(-)
 create mode 100644 src/views/rule-engine/Alarm/Log/TabComponent/util.ts

diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
index ede6e22c..f7941de7 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -90,10 +90,14 @@ const route = useRoute();
 let selectDisable = ref(false);
 const alarmConfigurationStore = useAlarmConfigurationStore();
 let { configurationData } = storeToRefs(alarmConfigurationStore);
+
+const emit = defineEmits(['change'])
+
 const queryData = () => {
     if (route.query?.id) {
         detail(route.query?.id).then((res) => {
             if (res.status === 200) {
+                emit('change', res?.result?.targetType)
                 form.value = res?.result;
                 // form.level = res?.result?.level;
                 // form.name = res?.result?.name;
@@ -205,6 +209,7 @@ const handleSave = async () => {
             if (res.status === 200) {
                 onlyMessage('操作成功,请配置关联的场景联动');
                 loading.value = false;
+              emit('change', form.value.targetType)
                 if (res.result?.id) {
                     menuStory.jumpPage(
                         'rule-engine/Alarm/Configuration/Save',
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue b/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
index 15d197f3..80f3ed62 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <TabComponent type="detail" :id="id"/>
+        <TabComponent :id="id" :type="type"/>
     </div>
 </template>
 
@@ -9,6 +9,13 @@ import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/index.vue'
 import { useRoute } from 'vue-router';
 const route = useRoute();
 const id = route.query?.id
+
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'detail'
+  }
+})
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
index 011e2721..a011c493 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
@@ -3,13 +3,13 @@
         <j-card>
             <j-tabs :activeKey="activeKey" @change="changeTabs">
                 <j-tab-pane key="1" tab="基础配置">
-                    <Base v-if="activeKey === '1'" />
+                    <Base v-if="activeKey === '1'" @change="typeChange" />
                 </j-tab-pane>
                 <j-tab-pane key="2" tab="关联场景联动">
                     <Scene></Scene>
                 </j-tab-pane>
                 <j-tab-pane key="3" tab="告警记录">
-                    <Log v-if="activeKey === '3'" />
+                    <Log v-if="activeKey === '3'" :type="type" />
                 </j-tab-pane>
             </j-tabs>
         </j-card>
@@ -31,6 +31,12 @@ const changeTabs = (e: any) => {
     }
 };
 const activeKey = ref('1');
+const type = ref('detail')
+
+const typeChange = (_type: string) => {
+  console.log(_type)
+  type.value = _type
+}
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
index 6fd18e41..f45429f1 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
@@ -1,35 +1,11 @@
 <template>
     <div class="alarm-log-card">
         <pro-search
-            :columns="columns"
+            :columns="newColumns"
             :target="`alarm-log-${props.type}`"
-            v-if="['all', 'detail'].includes(props.type)"
-            @search="search"
-        />
-        <pro-search
-            :columns="productCol"
-            :target="`alarm-log-${props.type}`"
-            v-else-if="props.type === 'product'"
-            @search="search"
-        />
-        <pro-search
-            :columns="deviceCol"
-            target="alarm-log-device"
-            v-else-if="props.type === 'device'"
-            @search="search"
-        />
-        <pro-search
-            :columns="orgCol"
-            target="alarm-log-org"
-            v-else-if="props.type === 'org'"
-            @search="search"
-        />
-        <pro-search
-            :columns="otherCol"
-            :target="`alarm-log-${props.type}`"
-            v-else-if="props.type === 'other'"
             @search="search"
         />
+
         <FullPage>
             <JProTable
                 :columns="columns"
@@ -246,123 +222,76 @@ const columns = [
         },
     },
 ];
-const productCol = [
-    ...columns,
-    {
-        title: '产品名称',
-        dataIndex: 'sourceId',
-        key: 'sourceId',
-        search: {
-            type: 'select',
-            options: async () => {
-                const resp = await handleSearch({
-                  sorts: [{ name: 'alarmTime', order: 'desc' }],
-                  terms: [{
-                    column: "targetType",
-                    termType: "eq",
-                    type: "and",
-                    value: "product",
-                  }]
-                });
-                if (resp.status === 200) {
-                    return resp.result.data.map((item: any) => ({
-                        label: item.sourceName,
-                        value: item.sourceId,
-                    }));
-                }
-                return [];
-            },
-        },
-    },
-];
-const deviceCol = [
-    ...columns,
-    {
-        title: '设备名称',
-        dataIndex: 'sourceId',
-        key: 'sourceId',
-        search: {
-          type: 'select',
-          options: async () => {
-            const resp = await handleSearch({
-              sorts: [{ name: 'alarmTime', order: 'desc' }],
-              terms: [{
-                column: "targetType",
-                termType: "eq",
-                type: "and",
-                value: "device",
-              }]
-            });
-            if (resp.status === 200) {
-              return resp.result.data.map((item: any) => ({
-                label: item.sourceName,
-                value: item.sourceId,
-              }));
-            }
-            return [];
-          },
-        },
-    },
-];
-const orgCol = [
-    ...columns,
-    {
-        title: '组织名称',
-        dataIndex: 'sourceId',
-        key: 'sourceId',
-        search: {
-          type: 'select',
-          options: async () => {
-            const resp = await handleSearch({
-              sorts: [{ name: 'alarmTime', order: 'desc' }],
-              terms: [{
-                column: "targetType",
-                termType: "eq",
-                type: "and",
-                value: "org",
-              }]
-            });
-            if (resp.status === 200) {
-              return resp.result.data.map((item: any) => ({
-                label: item.sourceName,
-                value: item.sourceId,
-              }));
-            }
-            return [];
-          },
-        },
-    },
-];
 
-const otherCol = [
-  ...columns,
-  {
-    title: '场景名称',
+const newColumns = computed(() => {
+
+  const otherColumns = {
+    title: '产品名称',
     dataIndex: 'targetId',
     key: 'targetId',
     search: {
       type: 'select',
       options: async () => {
-        const resp = await handleSearch({
-          sorts: [{ name: 'alarmTime', order: 'desc' }],
-          terms: [{
+        const termType = [
+          {
             column: "targetType",
             termType: "eq",
             type: "and",
-            value: "other",
-          }]
+            value: props.type,
+          }
+        ]
+
+        if (props.id) {
+          termType.push({
+            termType: 'eq',
+            column: 'alarmConfigId',
+            value: props.id,
+            type: 'and',
+          },)
+        }
+
+        const resp: any = await handleSearch({
+          sorts: [{ name: 'alarmTime', order: 'desc' }],
+          terms: termType
         });
+        const listMap: Map<string, any> = new Map()
+
         if (resp.status === 200) {
-          return resp.result.data.map((item: any) => ({
-            label: item.targetName,
-            value: item.targetId,
-          }));
+          resp.result.data.forEach(item => {
+            if (item.targetId) {
+              listMap.set(item.targetId, {
+                label: item.targetName,
+                value: item.targetId,
+              })
+            }
+
+          })
+
+          return [...listMap.values()]
+
         }
         return [];
       },
     },
-  },
-]
+  }
+
+  switch(props.type) {
+    case 'device':
+      otherColumns.title = '设备名称'
+          break;
+    case 'org':
+      otherColumns.title = '组织名称'
+      break;
+    case 'other':
+      otherColumns.title = '场景名称'
+      break;
+  }
+
+  return ['all', 'detail'].includes(props.type) ? columns : [
+    otherColumns,
+    ...columns,
+  ]
+})
 
 let params: any = ref({
     sorts: [{ name: 'alarmTime', order: 'desc' }],
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/util.ts b/src/views/rule-engine/Alarm/Log/TabComponent/util.ts
new file mode 100644
index 00000000..e69de29b