From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/a6-device/calibration.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/do/a6-device/calibration.vue b/src/components/do/a6-device/calibration.vue
index bff1387..b9e66c3 100644
--- a/src/components/do/a6-device/calibration.vue
+++ b/src/components/do/a6-device/calibration.vue
@@ -8,9 +8,9 @@
<el-button size="small" type="primary" @click="add('add')"
>娣诲姞鏍″噯璁板綍</el-button
>
- <el-button size="small" type="primary" @click="handleDown"
+ <!-- <el-button size="small" type="primary" @click="handleDown"
>瀵煎嚭Excel</el-button
- >
+ > -->
</div>
<div class="tables" style="margin-top: 10px;">
<el-table :data="tableData" height="calc(100vh - 20em)">
--
Gitblit v1.9.3