From 44cb329de733d38d52a0afb38a0dda9448879358 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 14:54:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/structural/premises/index.vue | 2 --
src/api/structural/structureTestObjectPart.js | 2 +-
src/api/cnas/process/reportResults.js | 2 +-
src/views/structural/capabilityAndLaboratory/capability/index.vue | 6 +++---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/api/cnas/process/reportResults.js b/src/api/cnas/process/reportResults.js
index bfd2fd5..0dbeb96 100644
--- a/src/api/cnas/process/reportResults.js
+++ b/src/api/cnas/process/reportResults.js
@@ -6,7 +6,7 @@
return request({
url: "/processReport/exportProcessReport",
method: "get",
- data: data,
+ params: data,
});
}
diff --git a/src/api/structural/structureTestObjectPart.js b/src/api/structural/structureTestObjectPart.js
index 25d0186..c0a9f0d 100644
--- a/src/api/structural/structureTestObjectPart.js
+++ b/src/api/structural/structureTestObjectPart.js
@@ -28,7 +28,7 @@
export function deleteTestObjectPart(query) {
return request({
url: '/structureTestObjectPart/deleteTestObjectPart',
- method: 'post',
+ method: 'delete',
params: query
})
}
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 3047d19..8041f4a 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -33,9 +33,9 @@
v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="specimenName">
+ <el-form-item label="妫�楠屽璞�" prop="sample">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
+ v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item>
@@ -297,7 +297,7 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- specimenName: null
+ sample: null
},
radio: 0,
productLoad: false,
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index 708d06f..d7e6395 100644
--- a/src/views/structural/premises/index.vue
+++ b/src/views/structural/premises/index.vue
@@ -290,8 +290,6 @@
delParameter({ id: row.id }).then(res => {
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
})
}).catch(() => { })
},
--
Gitblit v1.9.3