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

Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

Browse Source
This commit is contained in:
GYYM
2024-12-05 21:34:10 +08:00
parent 9c0b9a7c93 69a4cbbbc2
commit 5a29403636
7 changed files with 167 additions and 127 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 导入模板下载
const downloadTemp = () => {
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-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')"

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

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

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

@@ -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,56 +78,84 @@ const spanMethod = ({
rowIndex,
columnIndex,
}: SpanMethodProps) => {
if (columnIndex === 0 ) { // 检查是否为第一列
if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
if (columnIndex === 0) {
if (rowIndex <= 1 || rowIndex === 7 || rowIndex == 20) {
return {
rowspan: 2, // 合并行数
colspan: 1, // 单元格列数
};
}else if (rowIndex === 8) { //
return {
rowspan: 8,
colspan: 1,
};
rowspan: 1,
colspan: 2,
}
else if (rowIndex === 16) { //
return {
rowspan: 4,
colspan: 1,
};
}
else if (rowIndex === 3 ||rowIndex === 6 ||rowIndex === 9 || rowIndex === 10|| rowIndex === 11
|| rowIndex === 12|| rowIndex === 13|| rowIndex === 14|| rowIndex === 15
|| rowIndex === 17 || rowIndex === 18|| rowIndex === 19
|| rowIndex === 22 ||rowIndex === 24) { // 检查是否为第四行
if (rowIndex === 2) {
return {
rowspan: 3, // 不显示该单元格
colspan: 2,
}
}
if (rowIndex === 3 || rowIndex === 4 || rowIndex === 6 || rowIndex >= 9 && rowIndex <= 15 || rowIndex >= 17 && rowIndex <= 19 || rowIndex === 22 || rowIndex === 24) {
return {
rowspan: 0, // 不显示该单元格
colspan: 0,
};
}
}
if (columnIndex === 1 || columnIndex === 2){
if (rowIndex === 2
|| rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
|| rowIndex === 16|| rowIndex === 18
|| rowIndex === 21) {
if (rowIndex === 5 || rowIndex === 23) {
return {
rowspan: 2,
colspan: 1,
};
}
else if (rowIndex === 3
|| rowIndex === 9|| rowIndex === 11|| rowIndex === 13|| rowIndex === 15
|| rowIndex === 17|| rowIndex === 19
|| rowIndex === 22) { // 检查是否为第四行
}
if (rowIndex === 8) {
return {
rowspan: 0, // 不显示该单元格
rowspan: 8,
colspan: 2,
}
}
if (rowIndex === 16) {
return {
rowspan: 4,
colspan: 2,
}
}
if (rowIndex === 21 || rowIndex === 22) {
return {
rowspan: 2,
colspan: 2,
}
}
}
if (columnIndex === 1) {
if (rowIndex <= 4 || rowIndex >= 7 && rowIndex <= 22) {
return {
rowspan: 0,
colspan: 0,
};
}
}
}
if (columnIndex === 2) {
if (rowIndex === 2 || rowIndex === 8 || rowIndex === 10 || rowIndex === 12 || rowIndex === 14 || rowIndex === 16 || rowIndex === 18 || rowIndex === 21) {
return {
rowspan: 2,
colspan: 1,
}
}
if (rowIndex === 3 || rowIndex === 9 || rowIndex === 11 || rowIndex === 13 || rowIndex === 15 || rowIndex === 17 || rowIndex === 19 || rowIndex === 22) {
return {
rowspan: 0,
colspan: 0,
}
}
}
if (columnIndex === 3) {
if (rowIndex === 2 || rowIndex === 8 || rowIndex === 10 || rowIndex === 12 || rowIndex === 14 || rowIndex === 16 || rowIndex === 18 || rowIndex === 21) {
return {
rowspan: 2,
colspan: 1,
}
}
if (rowIndex === 3 || rowIndex === 9 || rowIndex === 11 || rowIndex === 13 || rowIndex === 15 || rowIndex === 17 || rowIndex === 19 || rowIndex === 22) {
return {
rowspan: 0,
colspan: 0,
}
}
}
};

2
frontend/src/views/machine/testSource/components/testSourcePopup.vue
View File

@@ -123,7 +123,7 @@ const close = () => {
const save = () => {
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
console.log("11111111111111111")
if (valid) {
if (formContent.value.id) {
await updateTestSource(formContent.value);

22
frontend/src/views/plan/planList/index.vue
View File

@@ -55,6 +55,7 @@
:dialogTitle="dialogTitle"
:is-read-only="isReadOnly"
@update:visible="dialogFormVisible = $event"
ref='testSourcePopup'
/>
<!-- 查看误差体系详细信息 -->
<ErrorStandardDialog
@@ -62,6 +63,7 @@
:formData='detail_dialogForm'
:dialogTitle='detail_dialogTitle'
@update:visible='detail_dialogFormVisible = $event'
ref="errorStandardPopup"
/>
</div>
<devTransfer
@@ -177,7 +179,7 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
render: scope => {
return (
<div class='flx-flex-start'>
<el-button type='primary' link onClick={() => showData(scope.row.testSourceName)}>
<el-button type='primary' link onClick={() => showTestSource(scope.row.testSourceName)}>
{scope.row.testSourceName}
</el-button>
<moreButtons isShow={isVisible(scope.row)} ></moreButtons>
@@ -193,7 +195,7 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
fieldNames: { label: 'label', value: 'id' },
render: scope => {
return (
<el-button type='primary' link onClick={() => showData(scope.row.script_Id)}>
<el-button type='primary' link onClick={() => showTestScript(scope.row.script_Id)}>
{getScriptName(scope.row.script_Id)}
</el-button>
)
@@ -278,15 +280,25 @@ function isVisible(row: Plan.PlanAndSourceBO) {
else
return true
}
const errorStandardPopup = ref()
function showData(row: string) {
detail_dialogTitle.value = row
detail_dialogFormVisible.value = true // 显示对话框
errorStandardPopup.value?.open(row, row)
// router.push({
// path: "/machine/device",
// query: { id: row }
// });
}
const testSourcePopup = ref()
function showTestSource(row: string) {
//testSourcePopup.value?.open('view', row,'模拟式')
}
function showTestScript(row: string) {
}
function handleFiles(event: Event) {