From 4f3099cc50854f71cf067cf4de206fc02399a6b5 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 11 Jul 2023 15:53:01 +0800
Subject: [PATCH] fix: bug#10750

---
 src/views/Log/Access/index.vue                         |  2 +-
 src/views/Log/System/index.vue                         |  2 +-
 .../rule-engine/Alarm/Configuration/Save/Log/indev.vue |  2 +-
 .../Alarm/Log/TabComponent/{indev.vue => index.vue}    | 10 +++++-----
 src/views/rule-engine/Alarm/Log/index.vue              |  2 +-
 src/views/system/Department/device/index.vue           |  4 ++--
 yarn.lock                                              |  4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename src/views/rule-engine/Alarm/Log/TabComponent/{indev.vue => index.vue} (98%)

diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 2820b324..6e09407d 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <pro-search :columns="columns" target="search" @search="handleSearch" />
+        <pro-search :columns="columns" target="search-access" @search="handleSearch" />
         <j-pro-table
             ref="tableRef"
             model="TABLE"
diff --git a/src/views/Log/System/index.vue b/src/views/Log/System/index.vue
index d8b7ba2a..791c63af 100644
--- a/src/views/Log/System/index.vue
+++ b/src/views/Log/System/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <pro-search :columns="columns" target="search" @search="handleSearch" />
+        <pro-search :columns="columns" target="search-system" @search="handleSearch" />
         <j-pro-table
             ref="tableRef"
             model="TABLE"
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 d4ca0792..15d197f3 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/indev.vue'
+import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/index.vue'
 import { useRoute } from 'vue-router';
 const route = useRoute();
 const id = route.query?.id
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
similarity index 98%
rename from src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
rename to src/views/rule-engine/Alarm/Log/TabComponent/index.vue
index f68a7736..b1cb38ef 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
@@ -2,25 +2,25 @@
     <div class="alarm-log-card">
         <pro-search
             :columns="columns"
-            target="alarm-log"
+            :target="`alarm-log-${props.type}`"
             v-if="['all', 'detail'].includes(props.type)"
             @search="search"
         />
         <pro-search
             :columns="produtCol"
-            target="alarm-log"
+            :target="`alarm-log-${props.type}`"
             v-if="['product', 'other'].includes(props.type)"
             @search="search"
         />
         <pro-search
             :columns="deviceCol"
-            target="alarm-log"
+            target="alarm-log-device"
             v-if="props.type === 'device'"
             @search="search"
         />
         <pro-search
             :columns="orgCol"
-            target="alarm-log"
+            target="alarm-log-org"
             v-if="props.type === 'org'"
             @search="search"
         />
@@ -257,7 +257,7 @@ const deviceCol = [
         key: 'targetName',
         search: {
             type: 'select',
-            opstions: async () => {
+            options: async () => {
                 const res = await getDeviceList();
                 if (res.status === 200) {
                     return res.result.map((item: any) => ({
diff --git a/src/views/rule-engine/Alarm/Log/index.vue b/src/views/rule-engine/Alarm/Log/index.vue
index da7e6983..f886b287 100644
--- a/src/views/rule-engine/Alarm/Log/index.vue
+++ b/src/views/rule-engine/Alarm/Log/index.vue
@@ -10,7 +10,7 @@ import { useAlarmStore } from '@/store/alarm';
 import { storeToRefs } from 'pinia';
 import { queryLevel } from '@/api/rule-engine/config';
 import { Store } from 'jetlinks-store';
-import  TableComponents  from './TabComponent/indev.vue';
+import  TableComponents  from './TabComponent/index.vue';
 const list = [
     {
         key: 'all',
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 26450235..cf8c8eaa 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -274,10 +274,10 @@ const columns = [
         search: {
             rename: 'productId$product-info',
             type: 'select',
-            handleValue(value: string) {
+            handleValue(value: string, data: any) {
                 return value && value.length ? [{
                     column: 'id',
-                    termType: 'in',
+                    termType: data.termType === 'not' ? 'nin' : 'in',
                     value: `${value.toString()}`
                 }] : undefined;
             },
diff --git a/yarn.lock b/yarn.lock
index 0aa3c5d9..08dbfb6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
 
 jetlinks-ui-components@^1.0.24:
   version "1.0.24"
-  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#0be30b811e9a31e6089b2c970110d32117b23f3c"
-  integrity sha512-XZ8hhozMh5vFLWVWswHjE3rknDJK+PyYJt8GaVOI86LY5RDl/tnbasgXCZHtyWjPJvJFSWiqqblHUJvJKSUVtQ==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#a8ee3d4a76f6545920810a0bd1d76cda8143713b"
+  integrity sha512-W9CNHLJTrTko/T522J0S6AHbCT2xHwljPXBsWkHCZ+LsB6vQtb4tT7CMKVMJvki2IlzjoynebXE7uzV/0LfV/A==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"