develop_cloud #1

Merged
dashixiong merged 234 commits from develop_cloud into main-cloud 2026-02-11 02:06:04 +00:00
104 changed files with 11515 additions and 30 deletions
Showing only changes of commit 2742f874ce - Show all commits

View File

@ -25,17 +25,19 @@
</el-radio-group>
</el-form-item>
<div style="display: flex">
<el-form-item label="点位" prop="pointName" :rules="[{ required: true, message: '请输入点位' }]" style="width: 200px;margin-right: 50px">
<el-form-item label="点位" prop="pointName" :rules="[{ required: true, message: '请输入点位' }]" style="margin-right: 50px">
<el-autocomplete
v-model="form.pointName"
placeholder="请输入点位"
clearable
:fetch-suggestions="querySearchAsync"
@select="handleSelect"
></el-autocomplete>
</el-form-item>
<el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="width: 200px;margin-right: 50px">
<el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="margin-right: 50px">
<el-cascader
v-model="form.child"
style="width:230px"
:props="{ multiple: true }"
:show-all-levels="false"
:options="childOptions"
@ -269,7 +271,7 @@ export default {
return this.$message.error('请输入正确的点位');
}
if(this.isDtdc && (this.form.child.length === 0 || this.form.child.length > 5 )){
return this.$message.error('请选择二级设备且不能超过5个');
return this.$message.error('请选择单体电池且不能超过5个');
}
this.loading = true
const{siteIds,dataUnit,categoryName,pointName,dataRange:[start='',end=''],child}=this.form