ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

误差体系

Browse Source
This commit is contained in:
sjl
2024-12-05 20:06:59 +08:00
parent 11c32ed360
commit f8a4d05f57
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/ImportExcel/index.vue
View File

@@ -77,7 +77,7 @@ const acceptParams = (params: ExcelParameterProps) => {
// Excel 导入模板下载 // Excel 导入模板下载
const downloadTemp = () => { const downloadTemp = () => {
if (!parameter.value.tempApi) return; if (!parameter.value.tempApi) return;
useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},true); useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},false);
}; };
// 文件上传 // 文件上传

2
frontend/src/views/machine/device/components/devicePopup.vue
View File

@@ -55,7 +55,7 @@
<el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/> <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
</el-form-item> </el-form-item>
<el-divider >参数信息</el-divider> <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-select v-model="formContent.devChns" clearable placeholder="请选择设备通道数">
<el-option <el-option
v-for="item in dictStore.getDictData('Dev_Chns')" v-for="item in dictStore.getDictData('Dev_Chns')"

2
frontend/src/views/machine/device/index.vue
View File

@@ -98,7 +98,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
}, },
{ {
prop: 'devChns', prop: 'devChns',
label: '设备通道数', label: '通道数',
minWidth: 110, minWidth: 110,
}, },

11
frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
View File

@@ -8,14 +8,14 @@
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
style="width: 100%" style="width: 100%"
:span-method="spanMethod" :span-method="spanMethod"
border :border="true"
class="custom-table" class="custom-table"
> >
<el-table-column label="被测量"> <el-table-column label="被测量">
<el-table-column prop="col1" width="120"/> <el-table-column prop="col1" width="150"/>
<el-table-column prop="col2" width="100"/> <el-table-column prop="col2" width="120" />
</el-table-column> </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="measurementType" label="测量类型" />
<el-table-column prop="condition" label="测量条件" /> <el-table-column prop="condition" label="测量条件" />
<el-table-column prop="maxErrorValue" label="最大误差" /> <el-table-column prop="maxErrorValue" label="最大误差" />
@@ -78,9 +78,8 @@ const spanMethod = ({
rowIndex, rowIndex,
columnIndex, columnIndex,
}: SpanMethodProps) => { }: SpanMethodProps) => {
if (columnIndex === 0 ) { // 检查是否为第一列 if (columnIndex === 0 ) { // 检查是否为第一列
if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行 if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
return { return {
rowspan: 2, // 合并行数 rowspan: 2, // 合并行数