From 1042bfdca194f9590c35b26dcf1e1eecde3b6f01 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 26 五月 2025 10:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3
---
src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue | 12 +++++-
src/utils/dict.ts | 2 +
src/views/model/pre/autoAdjust/index.vue | 1
src/views/data/point/DaPointForm.vue | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 104 insertions(+), 7 deletions(-)
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index eccb050..bfe5db5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -185,6 +185,8 @@
DATA_POINT_TYPE = 'data_point_type',
MINFREQID = 'minfreqid',
CUMULATEUNIT = 'cumulateUnit',
+ EXTREMALUNIT = 'extremal_unit',
+ EXTREMALTYPE = 'extremal_type',
MEASURE_VALUE_TYPE = 'measure_value_type',
NVR_ONLINE_STATUS = 'nvr_online_status',
CAMERA_BRAND = 'camera_brand',
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 94c85e5..43cb4f2 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -124,7 +124,7 @@
</el-form-item>
</el-col>
</el-row>
- <!--计量点-->
+ <!--测量点-->
<el-row v-if="formData.pointType === 'MEASURE'">
<el-col :span="24">
<el-form-item prop="sourceOption" label="数据源">
@@ -136,6 +136,7 @@
</el-form-item>
</el-col>
</el-row>
+ <!--测量点-->
<el-row v-if="formData.pointType === 'MEASURE'">
<el-col :span="12">
<el-form-item label="测量值类型" prop="measurePoint.valueType">
@@ -300,14 +301,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="累计长度" prop="cumulatePoint.length">
<el-input-number v-model="formData.cumulatePoint.length" style="width: 100%"
:min="1" :max="3000"
:controls="false"/>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="累计单位" prop="cumulatePoint.cumulateUnit">
<el-select
v-model="formData.cumulatePoint.cumulateUnit"
@@ -322,14 +323,83 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="除数" prop="cumulatePoint.divisor">
<el-input-number v-model="formData.cumulatePoint.divisor" style="width: 100%"
:min="1" :max="3000"
:controls="false"/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="是否累计负数" prop="cumulatePoint.isCumuNeg">
+ <el-select
+ v-model="formData.cumulatePoint.isCumuNeg"
+ placeholder="请选择是否累计负数"
+ >
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--极值点-->
+ <el-row :gutter="20" v-if="formData.pointType === 'EXTREMAL'">
+ <el-col :span="24">
+ <el-form-item label="瞬时测点" prop="extremalPoint.momentPoint">
+ <el-select
+ v-model="formData.extremalPoint.momentPoint"
+ filterable
+ placeholder="请选择">
+ <el-option
+ v-for="(item, index) in pointList2"
+ :key="index"
+ :label="item.pointName"
+ :value="item.pointNo"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="统计长度" prop="extremalPoint.length">
+ <el-input-number v-model="formData.extremalPoint.length" style="width: 100%"
+ :min="1" :max="1440 * 30"
+ :controls="false"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="统计单位" prop="extremalPoint.extremalUnit">
+ <el-select
+ v-model="formData.extremalPoint.extremalUnit"
+ placeholder="请选择统计单位"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.EXTREMALUNIT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="统计类型" prop="extremalPoint.extremalType">
+ <el-select
+ v-model="formData.extremalPoint.extremalType"
+ placeholder="请选择统计类型"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.EXTREMALTYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -406,6 +476,14 @@
momentPoint: '',
length: '',
divisor: ''
+ },
+ extremalPoint: {
+ id: '',
+ pointId: '',
+ momentPoint: '',
+ length: '',
+ extremalUnit: '',
+ extremalType: ''
}
})
const formRules = reactive({
@@ -418,6 +496,7 @@
"cumulatePoint.momentPoint": [{required: true, message: '累计测点不能为空', trigger: 'blur'}],
"cumulatePoint.length": [{required: true, message: '累计长度不能为空', trigger: 'blur'}],
"cumulatePoint.divisor": [{required: true, message: '除数不能为空', trigger: 'blur'}],
+ "extremalPoint.momentPoint": [{required: true, message: '测点不能为空', trigger: 'blur'}],
})
const formRef = ref() // 表单 Ref
@@ -539,7 +618,16 @@
momentPoint: '',
length: 60,
cumulateUnit: 'min',
+ isCumuNeg: 1,
divisor: 60
+ },
+ extremalPoint: {
+ id: '',
+ pointId: '',
+ momentPoint: '',
+ length: '',
+ extremalUnit: 'min',
+ extremalType: 'max'
}
}
formRef.value?.resetFields()
diff --git a/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue b/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue
index 84c81b7..390d72b 100644
--- a/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue
+++ b/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue
@@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="测点" prop="pointId">
+ <el-form-item label="影响用户" prop="pointId">
<el-select
v-model="formData.pointId"
filterable
@@ -51,7 +51,7 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="取值时间范围" prop="t">
+ <el-form-item label="△t（min）" prop="t">
<el-input-number v-model="formData.t" :min="1" clearable/>
</el-form-item>
</el-col>
@@ -119,6 +119,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="调整系数" prop="adjustCoefficient">
+ <el-input-number v-model="formData.adjustCoefficient"/>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -154,6 +159,7 @@
adjustDirection: undefined,
adjustValueRule: undefined,
adjustLength: 1,
+ adjustCoefficient: 1,
isEnable: 1,
})
const formRules = reactive({
@@ -167,6 +173,7 @@
adjustDirection: [{required: true, message: '调整方向不能为空', trigger: 'blur'}],
adjustValueRule: [{required: true, message: '调整值计算规则不能为空', trigger: 'blur'}],
adjustLength: [{required: true, message: '调整长度不能为空', trigger: 'blur'}],
+ adjustCoefficient: [{required: true, message: '调整系数不能为空', trigger: 'blur'}],
isEnable: [{required: true, message: '是否启用不能为空', trigger: 'blur'}],
})
const formRef = ref() // 表单 Ref
@@ -237,6 +244,7 @@
triggerValue: undefined,
adjustDirection: undefined,
adjustLength: 1,
+ adjustCoefficient: 1,
adjustValueRule: undefined,
isEnable: 1,
}
diff --git a/src/views/model/pre/autoAdjust/index.vue b/src/views/model/pre/autoAdjust/index.vue
index bc0a7ab..8ea554b 100644
--- a/src/views/model/pre/autoAdjust/index.vue
+++ b/src/views/model/pre/autoAdjust/index.vue
@@ -71,7 +71,6 @@
<dict-tag :type="DICT_TYPE.ADJUST_DIRECTION" :value="scope.row.adjustDirection" />
</template>
</el-table-column>
- <el-table-column label="调整长度" header-align="center" align="center" min-width="60" prop="adjustLength" />
<el-table-column label="是否启用" header-align="center" align="center" min-width="100" prop="isEnable" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.isEnable" />
--
Gitblit v1.9.3