From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/components/view/a6-device-management.vue | 39 +++++++--------------------------------
1 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index b687008..0cc801f 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -225,20 +225,6 @@
</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>
@@ -382,20 +368,6 @@
</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>
@@ -449,7 +421,7 @@
</el-row>
</span>
</el-dialog>
- <dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
+ <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
</div>
</template>
@@ -463,6 +435,7 @@
},
data() {
return {
+ deviceId: '',
fileTypeOptions: [
{label: 'csv', value: '.csv'},
{label: 'db', value: '.db'},
@@ -556,7 +529,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
},
entityCopy: {},
upIndex: 0,
@@ -864,7 +838,7 @@
this.$message.error('鏈緭鍏ュ惎鐢ㄦ棩鏈�')
return
}
- if(!this.formData2.deviceStatus){
+ if(this.formData2.deviceStatus==='' || this.formData2.deviceStatus===null){
this.$message.error('鏈�夋嫨褰撳墠鐘舵��')
return
}
@@ -873,7 +847,7 @@
return
}
this.upLoad2 = true;
- this.formData2.insProductIds = this.formData2.insProductIds.join()
+ this.formData2.insProductIds = this.formData2.insProductIds?this.formData2.insProductIds.join():''
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
@@ -914,6 +888,7 @@
list2.push(obj)
})
this.tableList = list2
+ this.deviceId = row.id
},
closeDataVue () {
this.showData = false
--
Gitblit v1.9.3