From ed92b6ff3471a393a1a7da19c52fd24952d5a7f5 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 15 Apr 2026 17:52:35 +0800
Subject: [PATCH] =?UTF-8?q?style(usermachine):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/example/usermachine/machineList.vue | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/example/usermachine/machineList.vue b/jnpf-java-boot/jnpf-web/src/views/example/usermachine/machineList.vue
index 77c861d..78b3c29 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/usermachine/machineList.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/usermachine/machineList.vue
@@ -10,17 +10,18 @@
     <!-- 搜索区域 -->
     <el-row :gutter="20" style="margin-bottom: 15px; padding: 0 10px;">
       <el-col :span="16">
-        <el-input
-          v-model="listQuery.selectKey"
-          placeholder="请输入机台编码或机台名称"
-          clearable
-          label="检索条件"
-          @keyup.enter.native="initData"
-        >
-          <i slot="prefix" class="el-icon-search"></i>
-        </el-input>
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 10px;">检索条件</span>
+          <el-input
+            v-model="listQuery.selectKey"
+            placeholder="请输入机台编码或机台名称"
+            clearable
+            @keyup.enter.native="initData"
+            style="width: calc(100% - 80px);"
+          ></el-input>
+        </div>
       </el-col>
-      <el-col :span="8" style="text-align: right;">
+      <el-col :span="8">
         <el-button type="primary" icon="el-icon-search" @click="initData">查询</el-button>
         <el-button icon="el-icon-refresh-right" @click="reset">重置</el-button>
       </el-col>
@@ -50,8 +51,8 @@
     </div>
     
     <div slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">取 消</el-button>
       <el-button type="primary" @click="handleConfirm">确 定</el-button>
+      <el-button @click="handleClose">取 消</el-button>
     </div>
   </el-dialog>
 </template>