From 12c6fb8eefddf8446ae008326e628652870c06c8 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 16 七月 2024 13:50:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-device-management.vue | 24 ++++--------------------
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 6 +++---
2 files changed, 7 insertions(+), 23 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 32d89ba..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
@@ -54,12 +54,12 @@
<el-form-item class="fomItemInput" label="鍙傜収X:">
<el-input v-model="domain.referx"></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" 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="Y:">
<el-input v-model="domain.y" onkeyup="value=value.replace(/[^-0-9]/g,'')"></el-input>
</el-form-item>
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index f7973f5..addc892 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -225,7 +225,7 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
<el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
<el-option v-for="item in fileTypeOptions"
:key="item.value"
@@ -233,7 +233,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
<el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
</el-form-item>
<el-form-item label="鍌ㄥ瓨鍦板潃:">
@@ -382,7 +382,7 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
<el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
<el-option v-for="item in fileTypeOptions"
:key="item.value"
@@ -390,7 +390,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
<el-input v-model="formData.collectUrl"></el-input>
</el-form-item>
<el-form-item label="鍌ㄥ瓨鍦板潃:">
@@ -818,14 +818,6 @@
this.$message.error('鏈緭鍏ユ牎鍑嗗懆鏈燂紙鏈堬級')
return
}
- if(!this.formData.fileType){
- this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
- return
- }
- if(!this.formData.collectUrl){
- this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
- return
- }
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
@@ -878,14 +870,6 @@
}
if(!this.formData2.calibrationDate){
this.$message.error('杈撳叆鏍″噯鍛ㄦ湡锛堟湀锛�')
- return
- }
- if(!this.formData2.fileType){
- this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
- return
- }
- if(!this.formData2.collectUrl){
- this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
return
}
this.upLoad2 = true;
--
Gitblit v1.9.3