From 04f8edb2ea9cf622ae982d25b415a4a1f7bbb111 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 16 七月 2024 14:51:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a6-device-management.vue | 39 +++++++++++++++++++
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 41 ++++++++------------
2 files changed, 54 insertions(+), 26 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 c4942dc..80b9a92 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
@@ -30,10 +30,10 @@
</el-pagination>
</div>
<el-dialog title="鏁伴噰閰嶇疆" :visible.sync="dialogVisible3" width="920px" :before-close="closeForm">
- <el-form :model="configForm" :rules="rules" label-position="top" size="small"
+ <el-form :model="configForm" label-position="top" size="small"
ref="configForm" label-width="100px" class="demo-ruleForm">
- <div class="fomItem1">
- <el-form-item class="fomItemInput" label="妫�娴嬬殑鏂囦欢绫诲瀷:" prop="fileType">
+ <!-- <div class="fomItem1"> -->
+ <!-- <el-form-item class="fomItemInput" label="妫�娴嬬殑鏂囦欢绫诲瀷:" prop="fileType">
<el-select v-model="configForm.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷">
<el-option v-for="item in fileTypeOptions"
:key="item.value"
@@ -46,22 +46,22 @@
</el-form-item>
<el-form-item class="fomItemInput" label="鍌ㄥ瓨鍦板潃:" prop="storageUrl">
<el-input v-model="configForm.storageUrl"></el-input>
- </el-form-item>
- </div>
+ </el-form-item> -->
+ <!-- </div> -->
<div class="fomItem1"
v-for="(domain, index) in domains"
:key="index">
<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>
@@ -110,17 +110,8 @@
current: 1,
size: 20,
},
- rules: {
- fileType: [{ required: true, message: '璇烽�夋嫨娲诲姩鍖哄煙', trigger: 'change' }],
- collectUrl: [{ required: true, message: '璇峰～鍐欓噰闆嗗湴鍧�', trigger: 'blur' }],
- storageUrl: [{ required: true, message: '璇峰～鍐欏偍瀛樺湴鍧�', trigger: 'blur' }],
- formula: [{ required: true, message: '璇峰～鍐欏叕寮�', trigger: 'blur' }],
- },
dialogVisible3:false,
configForm:{
- fileType: '',
- collectUrl: '',
- storageUrl: '',
formula: '',
},
domains: [
@@ -155,9 +146,6 @@
const data = res.data
if(data[0]) {
this.domains.splice(0, 1)
- this.$set(this.configForm, 'fileType', data[0].fileType)
- this.$set(this.configForm, 'collectUrl', data[0].collectUrl)
- this.$set(this.configForm, 'storageUrl', data[0].storageUrl)
this.$set(this.configForm, 'formula', data[0].formula)
data.forEach(i => {
this.domains.push({
@@ -181,14 +169,17 @@
}
})
this.domains.forEach(i => {
- i.fileType = this.configForm.fileType
- i.collectUrl = this.configForm.collectUrl
- i.storageUrl = this.configForm.storageUrl
+ if(i.x == '') {
+ i.x = null
+ }
+ if(i.y == '') {
+ i.y = null
+ }
i.formula = this.configForm.formula
i.deviceId = this.configForm.deviceId
i.insProductItem = this.configForm.insProductItem
})
- this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, {dataConfigList: JSON.parse(JSON.stringify(this.domains))},{headers: {
+ this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, {dataConfigList: this.domains},{headers: {
'Content-Type': 'application/json'
}}).then(res => {
this.dialogVisible3 = false
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index a5e0e51..addc892 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -162,7 +162,7 @@
</el-col>
<!-- 鍙宠竟甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
+ <el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
<el-form-item label="鎵�灞為儴闂�:">
<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
@@ -225,6 +225,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
+ <el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
+ <el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input :disabled="isUp" v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -368,6 +382,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
+ <el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
+ <el-input v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -435,6 +463,15 @@
},
data() {
return {
+ fileTypeOptions: [
+ {label: 'csv', value: '.csv'},
+ {label: 'db', value: '.db'},
+ {label: 'mdb', value: '.mdb'},
+ {label: 'word', value: '.docx'},
+ {label: 'excel', value: '.xlsx'},
+ {label: 'txt', value: '.txt'},
+ {label: 'png', value: '.png'},
+ ],
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
formData: {
--
Gitblit v1.9.3