From f8a4d05f57ffbf0cd47a5d86c75fd4aeb5041d41 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Thu, 5 Dec 2024 20:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AF=E5=B7=AE=E4=BD=93=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/ImportExcel/index.vue         |  2 +-
 .../views/machine/device/components/devicePopup.vue   |  2 +-
 frontend/src/views/machine/device/index.vue           |  2 +-
 .../errorSystem/components/errorStandardPopup.vue     | 11 +++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/ImportExcel/index.vue b/frontend/src/components/ImportExcel/index.vue
index 2d05bda..ab1a1d1 100644
--- a/frontend/src/components/ImportExcel/index.vue
+++ b/frontend/src/components/ImportExcel/index.vue
@@ -77,7 +77,7 @@ const acceptParams = (params: ExcelParameterProps) => {
 // Excel 导入模板下载
 const downloadTemp = () => {
   if (!parameter.value.tempApi) return;
-  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},true);
+  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},false);
 };
 
 // 文件上传
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index fb8f8a5..081803b 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -55,7 +55,7 @@
                                     <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
                                 </el-form-item>            
                         <el-divider >参数信息</el-divider>
-                                <el-form-item label="设备通道数" prop="devChns" >
+                                <el-form-item label="通道数" prop="devChns" >
                                     <el-select v-model="formContent.devChns"  clearable placeholder="请选择设备通道数">
                                     <el-option
                                     v-for="item in dictStore.getDictData('Dev_Chns')"
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index afcc6ce..c6d9775 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -98,7 +98,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
   },
   {
     prop: 'devChns',
-    label: '设备通道数',
+    label: '通道数',
     minWidth: 110,
 
   },
diff --git a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
index 2c42eea..c33e1c0 100644
--- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
@@ -8,14 +8,14 @@
                   :cell-style="{ textAlign: 'center' }" 
                   style="width: 100%"
                   :span-method="spanMethod" 
-                  border
+                  :border="true"
                   class="custom-table"
                   >
           <el-table-column label="被测量">
-            <el-table-column prop="col1" width="120"/>
-            <el-table-column prop="col2" width="100"/>
+            <el-table-column prop="col1" width="150"/>
+            <el-table-column prop="col2" width="120" />
           </el-table-column>
-          <el-table-column prop="deviceLevel" label="检测装置级别" />
+          <el-table-column prop="deviceLevel" label="检测装置级别" width="120"/>
           <el-table-column prop="measurementType" label="测量类型" />
           <el-table-column prop="condition" label="测量条件" />
           <el-table-column prop="maxErrorValue" label="最大误差" />
@@ -78,9 +78,8 @@ const spanMethod = ({
   rowIndex,
   columnIndex,
 }: SpanMethodProps) => {
- 
   if (columnIndex === 0  ) { // 检查是否为第一列
-  
+
     if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
       return {
         rowspan: 2, // 合并行数