From 4c52039964ab80f2cc48b9aca9dc2b7572e664ac Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:20:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE=E8=BF=9B=E8=A1=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 新增设备根据标签进行搜索功能
---
 .../Collector/Point/Save/SaveBACNet.vue       | 35 +++++-------
 .../device/Instance/components/TagSearch.vue  | 56 +++++++++++++++++++
 src/views/device/Instance/index.vue           |  8 +++
 3 files changed, 79 insertions(+), 20 deletions(-)
 create mode 100644 src/views/device/Instance/components/TagSearch.vue

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveBACNet.vue b/src/views/DataCollect/Collector/Point/Save/SaveBACNet.vue
index 1dcea8f4..cb8e4b74 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveBACNet.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveBACNet.vue
@@ -232,33 +232,28 @@ const Area = (_: any, value: any): Promise<any> =>
                 );
                 return pass ? resolve('') : reject('请配置点位死区');
             } else {
-                value.forEach((item: any) => {
-                    if (
-                        item.column ===
-                        `this['currentValue'] - this['lastValue']*init/100`
-                    ) {
-                        return reject('请配置点位死区');
-                    } else {
-                        return resolve('');
-                    }
+                const validate = value.find((item: any) => {
+                    item.column ===
+                        `this['currentValue'] - this['lastValue']*init/100`;
                 });
+                return validate ? reject('请配置点位死区') : resolve('');
             }
         }
     });
-const bacnetValueType = ref<string[]>([])
+const bacnetValueType = ref<string[]>([]);
 
 const getIdAndType = async () => {
-//   const res = await getBacnetPropertyId()
-//   if(res.success) {
-//     bacnetPropertyId.value = res.result
-//   }
-  const resp: any = await getBacnetValueType()
-  if(resp.success) {
-    bacnetValueType.value = resp.result
-  }
-}
+    //   const res = await getBacnetPropertyId()
+    //   if(res.success) {
+    //     bacnetPropertyId.value = res.result
+    //   }
+    const resp: any = await getBacnetValueType();
+    if (resp.success) {
+        bacnetValueType.value = resp.result;
+    }
+};
 
-getIdAndType()
+getIdAndType();
 const handleOk = async () => {
     const res: any = await formRef.value?.validate();
 
diff --git a/src/views/device/Instance/components/TagSearch.vue b/src/views/device/Instance/components/TagSearch.vue
new file mode 100644
index 00000000..6257d8df
--- /dev/null
+++ b/src/views/device/Instance/components/TagSearch.vue
@@ -0,0 +1,56 @@
+<template>
+    <j-input @click="show" v-model:value="presentation"> </j-input>
+    <j-modal v-if="showTagSearch" title="筛选条件" visible @cancel="showTagSearch = false" @ok="submitSearch">
+        <j-form layout="vertical">
+            <j-form-item label="设备标签:">
+                <j-row :gutter="16" v-for="(i,index) in searchValue" style="margin-bottom: 10px;">
+                    <j-col :span="10">
+                        <j-input placeholder="请输入标签key" v-model:value="i.key"></j-input>
+                    </j-col>
+                    <j-col :span="10">
+                        <j-input placeholder="请输入标签value" v-model:value="i.value"></j-input>
+                    </j-col>
+                    <j-col :span="4">
+                        <j-button type="link">
+                            <template #icon><AIcon type="MinusCircleOutlined" @click="deletePair(index)"/></template>
+                        </j-button>
+                    </j-col>
+                </j-row>
+            </j-form-item>
+            <j-button type="link" @click="addPair">
+              添加
+            </j-button>
+        </j-form>
+    </j-modal>
+</template>
+
+<script lang="ts" setup>
+const emit =  defineEmits(['change','update:value'])
+const showTagSearch = ref(false);
+const presentation = ref('');
+const searchValue = ref([{
+  key:'',
+  value:''
+}]);
+const show = () => {
+    showTagSearch.value = true;
+};
+const addPair = () =>{
+    searchValue.value.push({
+      key:'',
+      value:''
+    })
+}
+const deletePair = (index:number) =>{
+    searchValue.value.splice(index,1)
+}
+const submitSearch = () => {
+    searchValue.value.forEach((item:any,index:number)=>{
+      presentation.value = index === 0 ? item.key + '=' + item.value :presentation.value + ';' + item.key + '=' + item.value
+    })
+    emit('update:value',searchValue)
+    emit('change')
+    showTagSearch.value = false
+}
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 326b88bb..7ca86eca 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -334,6 +334,7 @@ import BatchDropdown from '@/components/BatchDropdown/index.vue';
 import { BatchActionsType } from '@/components/BatchDropdown/types';
 import { useRouterParams } from '@/utils/hooks/useParams';
 import { accessConfigTypeFilter } from '@/utils/setting';
+import TagSearch from './components/TagSearch.vue'
 
 const instanceRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
@@ -548,6 +549,13 @@ const columns = [
                 }),
         },
     },
+    {
+        key: 'id$dev-tag',
+        dataIndex: 'id$dev-tag',
+        title: '设备标签',
+        hideInTable: true,
+        search : {  type: 'component' , components:  TagSearch , termOptions:['eq'] }
+    },
     {
         title: '说明',
         dataIndex: 'describe',