误差体系
This commit is contained in:
@@ -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);
|
||||
};
|
||||
|
||||
// 文件上传
|
||||
|
||||
@@ -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')"
|
||||
|
||||
@@ -98,7 +98,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
|
||||
},
|
||||
{
|
||||
prop: 'devChns',
|
||||
label: '设备通道数',
|
||||
label: '通道数',
|
||||
minWidth: 110,
|
||||
|
||||
},
|
||||
|
||||
@@ -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,7 +78,6 @@ const spanMethod = ({
|
||||
rowIndex,
|
||||
columnIndex,
|
||||
}: SpanMethodProps) => {
|
||||
|
||||
if (columnIndex === 0 ) { // 检查是否为第一列
|
||||
|
||||
if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
|
||||
|
||||
Reference in New Issue
Block a user