From 39adf5d31e5eb1ff9093c62c6b509d0e10633fe3 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 18:12:22 +0800
Subject: [PATCH] 日志类型优化

---
 yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
index 1bc4401..a90f528 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
@@ -27,15 +27,20 @@
               </a-form-item>
             </a-col>
             <a-col :md="colMd" :sm="colSm">
-              <a-form-item label="鍒涘缓浜�">
-                <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤轰汉" />
+              <a-form-item label="鏉ユ簮">
+                <a-input v-model="queryParam.dataCapturePointCname" allow-clear placeholder="璇疯緭鍏ユ潵婧�" />
               </a-form-item>
             </a-col>
             <a-col :md="colMd" :sm="colSm">
+              <a-form-item label="鏉ユ簮浠g爜">
+                <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ユ潵婧愪唬鐮�" />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :md="colMd" :sm="colSm">
               <a-form-item label="澶囨敞">
                 <a-input v-model="queryParam.remarks" allow-clear placeholder="璇疯緭鍏ュ娉�" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :md="colMd" :sm="colSm">
                 <a-form-item label="宸ュ簭">
                   <a-select
@@ -156,12 +161,6 @@
           align: 'center',
           customRender: (text, record, index) => `${index + 1}`
         },
-        //  {
-        //   title: '褰撳墠璁惧',
-        //   align: 'center',
-        //   sorter: true,
-        //   dataIndex: 'equipmentName'
-        // },
         {
           title: '褰撳墠宸ュ簭',
           align: 'center',
@@ -174,12 +173,12 @@
           sorter: true,
           dataIndex: 'workPieceID'
         },
-        {
-          title: '澶囨敞',
-          align: 'center',
-          sorter: true,
-          dataIndex: 'remarks'
-        },
+        // {
+        //   title: '澶囨敞',
+        //   align: 'center',
+        //   sorter: true,
+        //   dataIndex: 'remarks'
+        // },
         {
           title: '鏃ュ織绫诲瀷',
           align: 'center',
@@ -187,7 +186,13 @@
           dataIndex: 'pieceLogTypeName'
         },
         {
-          title: '鍒涘缓浜�',
+          title: '鏉ユ簮',
+          align: 'center',
+          sorter: true,
+          dataIndex: 'dataCapturePointCname'
+        },
+        {
+          title: '鏉ユ簮浠g爜',
           align: 'center',
           sorter: true,
           dataIndex: 'createdUserName'

--
Gitblit v1.9.3