From 05c1d398fec8ea11ec086e8f68145135c4c4f101 Mon Sep 17 00:00:00 2001
From: jiejie <2405793769@qq.com>
Date: Fri, 29 Dec 2023 15:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Eserver=5Ftype=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=9D=A5=E5=88=A4=E6=96=AD=E8=AE=BE=E5=A4=87=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/info/DtDeviceInfo.data.ts          |  1 +
 .../equipmentManage/info/DtDeviceInfo.data.ts | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
index 3703c2b..7d99e9a 100644
--- a/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
+++ b/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
@@ -9,6 +9,7 @@ export const columns: BasicColumn[] = [
     title: '所属站点',
     align: "center",
     dataIndex: 'deviceOwnerId_dictText'
+    
   },
   {
     title: '类型',
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
index 74324b6..9daec69 100644
--- a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
@@ -173,6 +173,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'isAudit_dictText',
     width: 120,
   },
+  {
+    title: '服务器类型',
+    align: 'center',
+    dataIndex: 'serverType_dictText',
+    // width: 120,
+  },
   {
     title: '用户名',
     align: 'center',
@@ -296,7 +302,7 @@ export const searchFormSchema: FormSchema[] = [
   // },
   {
     label: '数据协议',
-    field: 'protocol',
+    field: 'dataProtocol',
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'dt_device_data_protocol,protocol_name,protocol_type',
@@ -305,7 +311,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     label: '网络协议',
-    field: 'protocol',
+    field: 'netProtocol',
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'dt_device_net_protocol,protocol_name,protocol_type',
@@ -482,6 +488,18 @@ export const formSchema: FormSchema[] = [
       return [{ required: true, message: '入网许可证不能为空!' }];
     },
   },
+  {
+    label: '服务器类型',
+    field: 'serverType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'device_server_type',
+      stringToNumber: true,
+    },
+    // dynamicRules: ({ model, schema }) => {
+    //   return [{ required: true, message: '入网许可证不能为空!' }];
+    // },
+  },
   {
     label: '用户名',
     field: 'username',