From 06e5e9e9c7aabcb5c155b25f84e5de2c935b2137 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 七月 2024 16:39:37 +0800
Subject: [PATCH] 新增数采检验功能
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
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 d55d012..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">
@@ -54,14 +55,14 @@
<el-form-item class="fomItemInput" label="鍙傜収X:">
<el-input v-model="domain.referx"></el-input>
</el-form-item>
+ <el-form-item class="fomItemInput" label="X:">
+ <el-input v-model="domain.x" onkeyup="value=value.replace(/[^-0-9]/g,'')"></el-input>
+ </el-form-item>
<el-form-item class="fomItemInput" label="鍙傜収Y:">
<el-input v-model="domain.refery"></el-input>
</el-form-item>
- <el-form-item class="fomItemInput" label="X:">
- <el-input v-model="domain.x"></el-input>
- </el-form-item>
<el-form-item class="fomItemInput" label="Y:">
- <el-input v-model="domain.y"></el-input>
+ <el-input v-model="domain.y" onkeyup="value=value.replace(/[^-0-9]/g,'')"></el-input>
</el-form-item>
<el-form-item>
<el-button style="position: absolute; bottom: -65px" @click.prevent="removeDomain(domain)" size="small">鍒犻櫎</el-button>
@@ -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() {
@@ -203,11 +205,15 @@
// 鍒犻櫎鍏紡formItem
const index = this.domains.indexOf(item)
if (index !== -1 && this.domains.length > 1) {
- this.$axios.get(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
- if(res.code == 200) {
- this.domains.splice(index, 1)
- }
- })
+ if(item.id){
+ this.$axios.delete(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
+ if(res.code == 200) {
+ this.domains.splice(index, 1)
+ }
+ })
+ } else {
+ this.domains.splice(index, 1)
+ }
} else {
this.$message.error('涓嶅厑璁稿垹闄ゆ渶鍚庝竴鏉℃暟鎹紒');
}
--
Gitblit v1.9.3