综合查询相关接口不再使用中文categoryName统一使用deviceCategory

This commit is contained in:
白菜
2025-10-16 16:10:29 +08:00
parent fb0eda4565
commit f4e6821484
14 changed files with 130 additions and 141 deletions

View File

@ -22,16 +22,16 @@
</el-form-item>
<el-form-item
label="设备"
prop="categoryName"
prop="deviceCategory"
:rules="[{ required: true, message: '请选择设备' }]"
>
<el-radio-group v-model="form.categoryName" @input="changeSiteIds">
<el-radio-group v-model="form.deviceCategory" @input="changeSiteIds">
<el-radio
v-for="(key, index) in deviceCategoryList"
v-for="(item, index) in deviceCategoryList"
:key="index + 'sbListSearch'"
:label="key"
:label="item.code"
>
{{ key }}
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item>
@ -65,13 +65,6 @@
@select="handleSelect"
></el-autocomplete>
</el-form-item>
<!-- <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">-->
<!-- <el-radio-group v-model="form.dataUnit">-->
<!-- <el-radio :label="1">分钟</el-radio>-->
<!-- <el-radio :label="2">小时</el-radio>-->
<!-- <el-radio :label="3"></el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
</div>
<el-form-item>
<el-button type="primary" @click="submitForm">生成图表</el-button>
@ -118,7 +111,7 @@ export default {
components: { DateTimeSelect },
computed: {
isDtdc() {
return this.form.categoryName === "单体电池";
return this.form.deviceCategory === "BATTERY";
},
},
watch: {
@ -140,7 +133,6 @@ export default {
this.$refs.dateTimeSelect.init();
this.getDate();
});
// this.submitForm()
},
},
},
@ -154,7 +146,7 @@ export default {
dataRange: [], //时间选择范围
child: [],
siteIds: "", //当前选中的站点id 默认选中第一个站点
categoryName: "", //设备
deviceCategory: "", //设备
pointName: "", //点位
dataUnit: 1, //横坐标
},
@ -294,7 +286,7 @@ export default {
},
querySearchAsync(query, cb) {
console.log("查询数据", query);
if (!this.form.siteIds || !this.form.categoryName) {
if (!this.form.siteIds || !this.form.deviceCategory) {
this.$message({
type: "warning",
message: "请先选择站点和设备",
@ -303,7 +295,7 @@ export default {
}
pointFuzzyQuery({
siteIds: [this.form.siteIds],
categoryName: this.form.categoryName,
deviceCategory: this.form.deviceCategory,
pointName: query,
}).then((response) => {
const data = response?.data || [];
@ -342,7 +334,7 @@ export default {
const {
siteIds,
dataUnit,
categoryName,
deviceCategory,
pointName,
dataRange: [start = "", end = ""],
child,
@ -374,7 +366,7 @@ export default {
getPointValueList({
siteIds: [siteIds],
dataUnit,
categoryName,
deviceCategory,
pointName,
startDate,
endDate,