|
|
|
@ -197,7 +197,7 @@ |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="采集数据来源"> |
|
|
|
<el-select multiple v-model="modalData.collectionSourceList" style="width: 221px"> |
|
|
|
<el-select multiple v-model="modalData.collectionSourceList" style="width: 260px"> |
|
|
|
<el-option label="采集数据01" value="value0"></el-option> |
|
|
|
<el-option label="采集数据02" value="value1"></el-option> |
|
|
|
<el-option label="采集数据03" value="value2"></el-option> |
|
|
|
@ -212,7 +212,7 @@ |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="采集数据方式"> |
|
|
|
<el-select multiple v-model="modalData.collectionMethodList" style="width: 221px"> |
|
|
|
<el-select multiple v-model="modalData.collectionMethodList" style="width: 180px"> |
|
|
|
<el-option label="PLC" value="plc"></el-option> |
|
|
|
<el-option label="文件" value="file"></el-option> |
|
|
|
<el-option label="图片" value="image"></el-option> |
|
|
|
@ -1097,10 +1097,10 @@ |
|
|
|
this.$message.warning('请选择采集条件路径!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length)) { |
|
|
|
this.$message.warning('采集数据的来源、方式不对应!') |
|
|
|
return |
|
|
|
} |
|
|
|
// if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length)) { |
|
|
|
// this.$message.warning('采集数据的来源、方式不对应!') |
|
|
|
// return |
|
|
|
// } |
|
|
|
this.modalData.collectionSource = this.modalData.collectionSourceList.join(',') |
|
|
|
this.modalData.collectionMethod = this.modalData.collectionMethodList.join(',') |
|
|
|
this.modalData.collectionCondition = this.modalData.collectionConditionList.join(',') |
|
|
|
|