From 656fcfd2d3d35aff12cbbec41f48cec99fdef1cb Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 18:50:01 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/device/components/firmwareManage.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/device/components/firmwareManage.vue b/src/views/device/components/firmwareManage.vue
index 0fe4c63..d51c078 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-mange"
:model="importForm"
v-loading="loadingForm"
- label-width="80px"
style="width: 80%; margin-left: 10%"
:rules="rules"
>
@@ -62,11 +62,13 @@
<el-form-item label="说明" label-width="80px" 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">确定</el-button>
+ <el-button @click="onCancel">取消</el-button>
+ </div>
+ </template>
</el-dialog>
</basic-container>
</template>
@@ -89,7 +91,7 @@
firmwareUploadBox: false,
form: {},
query: {},
- workspaceId: '',
+ workspaceId: '4a574d68-4ad3-48f7-9f16-3edbcd8056e1',
deviceName: '',
loading: true,
page: {
@@ -101,8 +103,6 @@
option: {
lazy: true,
tree: true,
- height: 'atuo',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
@@ -115,6 +115,9 @@
excelBtn: false,
dialogClickModal: false,
grid: false,
+
+ height: 'auto',
+ calcHeight: 20,
column: [
{
label: '设备名称',
@@ -317,8 +320,8 @@
},
// 初始化数据
init(data) {
- this.workspaceId = data.workspace_id;
- // this.workspaceId = '4a574d68-4ad3-48f7-9f16-3edbcd8056e1';
+ // this.workspaceId = data.workspace_id;
+ this.workspaceId = '4a574d68-4ad3-48f7-9f16-3edbcd8056e1';
this.deviceName = data.device_name;
this.onLoad(this.page);
},
@@ -431,3 +434,4 @@
/* color: aqua; */
}
</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3