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 @@
参数信息
-
+
[]>([
},
{
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"
>
-
-
+
+
-
+
@@ -78,9 +78,8 @@ const spanMethod = ({
rowIndex,
columnIndex,
}: SpanMethodProps) => {
-
if (columnIndex === 0 ) { // 检查是否为第一列
-
+
if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
return {
rowspan: 2, // 合并行数