From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/measuringinstruments/distributionroom/distributionroom.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zhitan-vue/src/views/measuringinstruments/distributionroom/distributionroom.vue b/zhitan-vue/src/views/measuringinstruments/distributionroom/distributionroom.vue
index f5f8e00..a5596cf 100644
--- a/zhitan-vue/src/views/measuringinstruments/distributionroom/distributionroom.vue
+++ b/zhitan-vue/src/views/measuringinstruments/distributionroom/distributionroom.vue
@@ -12,12 +12,12 @@
<el-button type="primary" icon="Search" @click="handleQuery"> 鎼滅储 </el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="plus" @click="handleAdd">鏂板</el-button>
+ </el-form-item>
</el-form>
</div>
<div class="table-bg-style">
- <div class="ml20 mb20 theme-dark-mt20">
- <el-button type="primary" icon="Plus" @click="handleAdd">鏂板</el-button>
- </div>
<div class="table-box">
<el-table v-loading="loading" :data="energyTypeList">
<el-table-column label="缂栧彿" align="center" key="code" prop="code" :show-overflow-tooltip="true" />
--
Gitblit v1.9.3