From 8bfd657326eb9d4bd9b63920cfe3bd362cea4445 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 10 Oct 2025 20:59:07 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.4' into prod
---
src/views/device/components/firmwareManage.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/device/components/firmwareManage.vue b/src/views/device/components/firmwareManage.vue
index d51c078..291bfd8 100644
--- a/src/views/device/components/firmwareManage.vue
+++ b/src/views/device/components/firmwareManage.vue
@@ -28,7 +28,7 @@
<el-dialog title="固件上传" class="ztzf-dialog-mange" append-to-body v-model="firmwareUploadBox" width="40%" height="60%">
<el-form
ref="form"
- class="ztzf-form-mange"
+ class="ztzf-form-search"
:model="importForm"
v-loading="loadingForm"
style="width: 80%; margin-left: 10%"
@@ -39,7 +39,7 @@
</el-form-item>
<!-- 上传 -->
- <el-form-item label="固件文件" label-width="80px" prop="file">
+ <el-form-item label="固件文件" prop="file">
<el-upload
class="upload-demo"
action="#"
@@ -50,7 +50,7 @@
:before-upload="beforeUploadFile"
>
<i class="el-icon-upload"></i>
- <div class="el-upload__text" style="height: 50px"><em>点击上传</em></div>
+ <div class="el-upload__text" style="height: 50px"> <el-button>点击上传</el-button></div>
</el-upload>
</el-form-item>
<el-form-item label="是否可用" prop="status">
@@ -59,14 +59,14 @@
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="说明" label-width="80px" prop="release_note">
+ <el-form-item label="说明" prop="release_note">
<el-input type="textarea" v-model="importForm.release_note" clearable></el-input>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="onConfirm">确定</el-button>
- <el-button @click="onCancel">取消</el-button>
+ <el-button type="primary" @click="onConfirm" icon="el-icon-circle-check">确定</el-button>
+ <el-button @click="onCancel" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
</el-dialog>
@@ -434,4 +434,8 @@
/* color: aqua; */
}
</style>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.upload-demo {
+ height: 30px;
+}
+</style>
--
Gitblit v1.9.3