From ef1cfb20de167cef6865677669fbd7fc66295a62 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 20 七月 2024 19:02:54 +0800
Subject: [PATCH] 设备数采配置 对应后端添加了几个字段
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 7 +++++--
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a339685..2060de5 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1005,8 +1005,9 @@
},
methods: {
getDataAcquisitionDevice(){
+
this.dataAcquisitionLoading = true
- this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode).then(res=>{
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
this.dataAcquisitionLoading = false
if(res.code!=200){
return
@@ -2175,7 +2176,9 @@
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ entrustCode: this.insOrder.entrustCode,
+ sampleCode: this.currentSample.sampleCode
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index 0f5b5d3..a37163d 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -14,7 +14,8 @@
<el-table :data="tableList.slice((page.current - 1) * page.size, page.current * page.size)"
border tooltip-effect="dark" style="width: 100%;" height="100%">
<el-table-column type="index" label="搴忓彿" align="center" width="65"></el-table-column>
- <el-table-column prop="insProductItem" align="center" label="妫�楠岄」鐩�">
+ <el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠岄」"></el-table-column>
+ <el-table-column prop="insProductItem" align="center" label="妫�楠岄」瀛愰」">
</el-table-column>
<el-table-column prop="section" label="鎿嶄綔" width="120">
<template slot-scope="scope">
@@ -101,6 +102,7 @@
this.tableList.forEach(i => {
let data = i.insProductItem.split(',')
i.insProductItem = data[data.length - 1]
+ i.inspectionItemSubclass = data[data.length - 2]
})
},
data() {
@@ -204,7 +206,7 @@
const index = this.domains.indexOf(item)
if (index !== -1 && this.domains.length > 1) {
if(item.id){
- this.$axios.get(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
+ this.$axios.delete(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
if(res.code == 200) {
this.domains.splice(index, 1)
}
--
Gitblit v1.9.3