From 196b113ea00f009c2fc59068e6fcff6e1d144ba9 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期五, 22 八月 2025 11:17:30 +0800
Subject: [PATCH] 1

---
 src/views/basesetting/machine.vue |   54 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 841687d..f5d3e80 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -27,18 +27,15 @@
           @on-load="onLoad"
         >
           <template #menu-left>
-            <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
-
-
-            <el-upload :show-file-list="false" class="upload-demo"
-                action="/api/blade-mdm/machine/import"
-                       :on-change="handleChange">
-              <el-button type="primary" plain size="default">瀵煎叆</el-button>
-            </el-upload>
-
-
-
-            <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
+            <div class="menuLeft">
+              <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
+              <el-upload :show-file-list="false" class="upload-demo"
+                  action="/api/blade-mdm/machine/import"
+                        :on-change="handleChange">
+                <el-button type="primary" plain size="default">瀵煎叆</el-button>
+              </el-upload>
+              <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
+            </div>
           </template>
           <template #menu="scope">
             <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
@@ -300,11 +297,27 @@
             }]
           },
           {
+            label: '绋嬪簭涓存椂鐩綍',
+            prop: 'progTempDir',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+          },
+          {
             label: '绋嬪簭涓嬪彂鐩綍',
             prop: 'progSendDir',
             type: 'input',
             span: 12,
             dataType: 'string',
+          },
+          {
+            label: '涓嬪彂鐩綍淇濆瓨鏃堕棿',
+            prop: 'sendDirExpiryHours',
+            placeholder:"(灏忔椂)",
+            max:24,
+            min:1,
+            type: 'number',
+            span: 12,
           },
           {
             label: '绋嬪簭鍥炰紶鐩綍',
@@ -313,13 +326,16 @@
             span: 12,
             dataType: 'string',
           },
-		  {
-            label: '绋嬪簭涓存椂鐩綍',
-            prop: 'progTempDir',
-            type: 'input',
+          {
+            label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
+            prop: 'receiveDirExpiryHours',
+             max:24,
+            min:1,
+            placeholder:"(灏忔椂)",
+            type: 'number',
             span: 12,
-            dataType: 'string',
           },
+		      
           {
             label: '澶囨敞',
             prop: 'remark',
@@ -525,4 +541,8 @@
   margin-left: 6px;
   margin-right: 6px;
 }
+.menuLeft {
+  display: flex;
+  align-items: center;
+}
 </style>

--
Gitblit v1.9.3