From 1d46a8b994db5cc8da6cd8957e04a9ba7272bae7 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:44:56 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx |  108 +++++++++++++++++++++++++++---------------------------
 1 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx b/zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx
index 9e7ee21..da63720 100644
--- a/zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx
+++ b/zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx
@@ -116,6 +116,60 @@
             width: 48,
         },
         {
+            title: '璁惧绫诲瀷',
+            dataIndex: 'type',
+            valueType: 'text',
+            hidden: false,
+            width: 140,
+            filterDropdown: (props) => <TextFilter
+                name='type'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
+            title: '璁惧鍙�',
+            dataIndex: 'deviceNo',
+            valueType: 'text',
+            hidden: false,
+            width: 140,
+            filterDropdown: (props) => <TextFilter
+                name='deviceNo'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
+            title: '婧愭暟鎹�',
+            dataIndex: 'originData',
+            valueType: 'text',
+            hidden: false,
+            width: 140,
+            ellipsis: true,
+            filterDropdown: (props) => <TextFilter
+                name='originData'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
+            title: '婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁',
+            dataIndex: 'wcsData',
+            valueType: 'text',
+            hidden: false,
+            width: 140,
+            ellipsis: true,
+            filterDropdown: (props) => <TextFilter
+                name='wcsData'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
             title: '缂栧彿',
             dataIndex: 'uuid',
             valueType: 'text',
@@ -234,60 +288,6 @@
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='memo'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '璁惧绫诲瀷',
-            dataIndex: 'type',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='type'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '璁惧鍙�',
-            dataIndex: 'deviceNo',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='deviceNo'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '婧愭暟鎹�',
-            dataIndex: 'originData',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            ellipsis: true,
-            filterDropdown: (props) => <TextFilter
-                name='originData'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁',
-            dataIndex: 'wcsData',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            ellipsis: true,
-            filterDropdown: (props) => <TextFilter
-                name='wcsData'
                 {...props}
                 actionRef={actionRef}
                 setSearchParam={setSearchParam}

--
Gitblit v1.9.1