From 3e98e1a3901ddddc810b02a3e7e6f9f7fa4b4c06 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Mon, 7 Aug 2023 12:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/base-data/base.data.ts         | 16 ++++++++-
 .../device/management/management.data.ts      | 34 +++++++++++++++++++
 src/views/visualization/components/SBYXZT.vue |  3 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/views/base/base-data/base.data.ts b/src/views/base/base-data/base.data.ts
index dbe20fd2..82a2e9bc 100644
--- a/src/views/base/base-data/base.data.ts
+++ b/src/views/base/base-data/base.data.ts
@@ -75,6 +75,20 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {},
     colProps: { span: 8 },
   },
+  {
+    field: 'industry',
+    label: '农业类型',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const res = await getKeywordsIndustry()
+        return res
+      },
+      labelField: 'name',
+      valueField: 'key',
+    },
+    colProps: { span: 8 },
+  },
 ]
 
 export const accountFormSchema: FormSchema[] = [
@@ -111,7 +125,7 @@ export const accountFormSchema: FormSchema[] = [
 
   {
     field: 'industry_key',
-    label: '产业类型',
+    label: '农业类型',
     required: true,
     component: 'ApiSelect',
     componentProps: {
diff --git a/src/views/device/management/management.data.ts b/src/views/device/management/management.data.ts
index 5b788410..0149893b 100644
--- a/src/views/device/management/management.data.ts
+++ b/src/views/device/management/management.data.ts
@@ -139,6 +139,40 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 8 },
   },
+  {
+    field: 'sn',
+    label: '设备编号',
+    component: 'Input',
+    colProps: { span: 8 },
+  },
+  {
+    field: 'supplier_key',
+    label: '设备厂商',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const res = await getKeywords({ type_key: 'device-supplier' })
+        return res
+      },
+      labelField: 'name',
+      valueField: 'key',
+    },
+    colProps: { span: 8 },
+  },
+  {
+    field: 'project_key',
+    label: '项目',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const res = await getKeywords({ type_key: 'device-project' })
+        return res
+      },
+      labelField: 'name',
+      valueField: 'key',
+    },
+    colProps: { span: 8 },
+  },
 ]
 
 export const accountFormSchema: FormSchema[] = [
diff --git a/src/views/visualization/components/SBYXZT.vue b/src/views/visualization/components/SBYXZT.vue
index 76905ce3..937ebcb6 100644
--- a/src/views/visualization/components/SBYXZT.vue
+++ b/src/views/visualization/components/SBYXZT.vue
@@ -166,7 +166,8 @@
         })
         Object.keys(resData).map((e) => {
           const zindex = Data.list.findIndex(({ key }: any) => key == e)
-          Data.list[zindex].value = resData[e].slice(1)
+
+          if (zindex >= 0) Data.list[zindex].value = resData[e].slice(1)
         })
       }
       let timerTabIndex = 1