From 4383bfcc87a7726f39391eb78d830aca160d8efd Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 30 九月 2024 10:07:52 +0800
Subject: [PATCH] bug修复

---
 WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue |   80 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue b/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
index d7345e9..65f1f75 100644
--- a/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
+++ b/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
@@ -24,7 +24,7 @@
       cnName: "璁惧淇℃伅",
       name: "deviceInfo",
       url: "/DeviceInfo/",
-      sortName: "CreateDate",
+      sortName: "createDate",
     });
     const editFormFields = ref({
       deviceCode: "",
@@ -33,7 +33,7 @@
       deviceStatus: "",
       deviceIp: "",
       devicePort: "",
-      devicePlcType:"",
+      devicePlcType: "",
       deviceRemark: "",
     });
     const editFormOptions = ref([
@@ -54,13 +54,17 @@
           title: "璁惧绫诲瀷",
           required: true,
           field: "deviceType",
-          type: "string",
+          type: "select",
+          dataKey: "deviceType",
+          data: [],
         },
         {
           title: "璁惧鐘舵��",
           required: true,
           field: "deviceStatus",
-          type: "string",
+          type: "select",
+          dataKey: "deviceStatus",
+          data: [],
         },
       ],
       [
@@ -75,7 +79,9 @@
           title: "PLC绫诲瀷",
           required: true,
           field: "devicePlcType",
-          type: "string",
+          type: "select",
+          dataKey: "devicePlcType",
+          data: [],
         },
         {
           title: "澶囨敞",
@@ -92,8 +98,20 @@
     const searchFormOptions = ref([
       [
         { title: "璁惧缂栧彿", field: "deviceCode" },
-        { title: "璁惧绫诲瀷", field: "deviceType" },
-        { title: "璁惧鐘舵��", field: "deviceStatus" },
+        {
+          title: "璁惧绫诲瀷",
+          field: "deviceType",
+          type: "select",
+          dataKey: "deviceType",
+          data: [],
+        },
+        {
+          title: "璁惧鐘舵��",
+          field: "deviceStatus",
+          type: "select",
+          dataKey: "deviceStatus",
+          data: [],
+        },
       ],
     ]);
     const columns = ref([
@@ -128,6 +146,7 @@
         type: "string",
         width: 150,
         align: "left",
+        bind: { key: "deviceType", data: [] },
       },
       {
         field: "deviceStatus",
@@ -135,6 +154,7 @@
         type: "string",
         width: 90,
         align: "left",
+        bind: { key: "deviceStatus", data: [] },
       },
       {
         field: "deviceIp",
@@ -156,6 +176,7 @@
         type: "string",
         width: 120,
         align: "left",
+        bind: { key: "devicePlcType", data: [] },
       },
       {
         field: "creater",
@@ -167,8 +188,8 @@
       {
         field: "createDate",
         title: "鍒涘缓鏃堕棿",
-        type: "int",
-        width: 90,
+        type: "datetime",
+        width: 160,
         align: "left",
       },
       {
@@ -182,7 +203,7 @@
         field: "modifyDate",
         title: "淇敼鏃堕棿",
         type: "datetime",
-        width: 80,
+        width: 160,
         align: "left",
       },
       {
@@ -195,7 +216,7 @@
     ]);
     const detail = ref({
       cnName: "璁惧鍗忚淇℃伅",
-      table: "Dt_DeviceProtocol",
+      table: "DeviceProtocol",
       columns: [
         {
           field: "id",
@@ -249,6 +270,7 @@
           title: "鏁版嵁绫诲瀷",
           type: "string",
           width: 90,
+          require: true,
           align: "left",
           edit: { type: "" },
         },
@@ -256,17 +278,26 @@
           field: "deviceProDataLength",
           title: "鏁版嵁闀垮害",
           type: "int",
-          width: 120,
-          hidden: true,
+          width: 90,
+          require: true,
+          align: "left",
+          edit: { type: "" },
+        },
+        {
+          field: "deviceProParamName",
+          title: "鍙傛暟鍚嶇О",
+          type: "string",
+          width: 150,
+          require: true,
           align: "left",
           edit: { type: "" },
         },
         {
           field: "deviceProParamType",
-          title: "鍙傛暟鍚嶇О",
+          title: "鍙傛暟绫诲瀷",
           type: "string",
-          width: 80,
-          hidden: true,
+          width: 150,
+          require: true,
           align: "left",
           edit: { type: "" },
         },
@@ -275,6 +306,7 @@
           title: "鍙傛暟璇存槑",
           type: "string",
           width: 130,
+          require: true,
           align: "left",
           edit: { type: "" },
         },
@@ -287,10 +319,17 @@
           sortable: true,
         },
         {
+          field: "creater",
+          title: "鍒涘缓浜�",
+          type: "string",
+          width: 90,
+          align: "left",
+        },
+        {
           field: "createDate",
           title: "鍒涘缓鏃堕棿",
-          type: "dateTime",
-          width: 80,
+          type: "datetime",
+          width: 160,
           align: "left",
         },
         {
@@ -304,12 +343,11 @@
           field: "modifyDate",
           title: "淇敼鏃堕棿",
           type: "datetime",
-          width: 90,
+          width: 160,
           align: "left",
-          sortable: true,
         },
       ],
-      sortName: "CreateDate",
+      sortName: "createDate",
       key: "id",
     });
     return {

--
Gitblit v1.9.3