From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/device/components/firmwareManage.vue | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/views/device/components/firmwareManage.vue b/src/views/device/components/firmwareManage.vue
index 9c397ea..aa0b3e7 100644
--- a/src/views/device/components/firmwareManage.vue
+++ b/src/views/device/components/firmwareManage.vue
@@ -25,12 +25,12 @@
</el-button>
</template>
</avue-crud>
- <el-dialog title="固件上传" append-to-body v-model="firmwareUploadBox" width="40%" height="60%">
+ <el-dialog title="固件上传" class="ztzf-dialog-mange" append-to-body v-model="firmwareUploadBox" width="40%" height="60%">
<el-form
ref="form"
+ class="ztzf-form-search"
:model="importForm"
v-loading="loadingForm"
- label-width="80px"
style="width: 80%; margin-left: 10%"
:rules="rules"
>
@@ -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,16 @@
<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-item>
- <el-button type="primary" @click="onConfirm">确定</el-button>
- <el-button @click="onCancel">取消</el-button>
- </el-form-item>
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <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>
</basic-container>
</template>
@@ -101,12 +103,12 @@
option: {
lazy: true,
tree: true,
- height: 'atuo',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchGutter: 30,
+ searchMenuPosition: 'left',
+ searchMenuSpan: 4,
border: true,
index: true,
viewBtn: true,
@@ -115,11 +117,13 @@
excelBtn: false,
dialogClickModal: false,
grid: false,
+
+ height: 'auto',
+ calcHeight: 20,
column: [
{
label: '设备名称',
prop: 'device_name',
- editDisabled: true,
// search: true,
// searchSpan: 5,
labelWidth: 130,
@@ -134,12 +138,12 @@
],
},
{
- label: '固件文件名称',
+ label: '文件名称',
prop: 'file_name',
labelWidth: 130,
search: true,
- searchSpan: 8,
- searchLabelWidth: 120,
+ searchSpan: 4,
+ // searchLabelWidth: 120,
editDisabled: true,
rules: [
{
@@ -431,3 +435,8 @@
/* color: aqua; */
}
</style>
+<style scoped lang="scss">
+.upload-demo {
+ height: 30px;
+}
+</style>
--
Gitblit v1.9.3