From cede521babc248ed553b5a45d3ee7ef5fd2a51d6 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 17 六月 2025 18:52:19 +0800
Subject: [PATCH] 接口响应时间和一些loading状态
---
src/views/model/pre/item/MmPredictItemForm.vue | 353 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 232 insertions(+), 121 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index c48cbd5..5b363ca 100644
--- a/src/views/model/pre/item/MmPredictItemForm.vue
+++ b/src/views/model/pre/item/MmPredictItemForm.vue
@@ -1,5 +1,5 @@
<template>
- <Dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
+ <Dialog v-model="dialogVisible" :title="dialogTitle" width="75%">
<el-form
ref="formRef"
v-loading="formLoading"
@@ -101,16 +101,69 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="dataForm.itemtypename === 'MergeItem'">
- <el-col :span="12">
- <el-form-item label="预测长度" prop="mmPredictItem.predictlength">
- <el-input
- @change="clearExpressionList"
- v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
- maxlength="5"/>
- </el-form-item>
- </el-col>
- </el-row>
+ <div v-if="dataForm.itemtypename === 'MergeItem'">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="预测长度" prop="mmPredictItem.predictlength">
+ <el-input
+ v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
+ maxlength="5"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="真实数据点">
+ <el-select
+ v-model="dataForm.pointId"
+ filterable
+ clearable
+ placeholder="请选择">
+ <el-option
+ v-for="item in pointList"
+ :key="item.id"
+ :label="item.pointName"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-divider content-position="left">累计配置</el-divider>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="是否累计" prop="iscumulant">
+ <el-select v-model="dataForm.iscumulant" placeholder="请选择" @change="(value) => iscumulantChange(dataForm)">
+ <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-col :span="6">
+ <el-form-item label="累计除数" prop="cumuldivisor">
+ <el-input-number v-model="dataForm.cumuldivisor" style="width: 100%" :disabled="dataForm.iscumulant !== 1"
+ :min="1" :max="60"
+ :controls="false"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="累计测点">
+ <el-select
+ v-model="dataForm.cumulpoint" :disabled="dataForm.iscumulant !== 1"
+ filterable
+ clearable
+ placeholder="请选择">
+ <el-option
+ v-for="item in pointList.filter(e => e.pointType === 'CUMULATE')"
+ :key="item.id"
+ :label="item.pointName"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
<el-divider content-position="left" v-if="dataForm.itemtypename === 'NormalItem'">模型信息
</el-divider>
<el-row :gutter="8" v-if="dataForm.itemtypename === 'NormalItem'">
@@ -131,6 +184,7 @@
:on-error="uploadModelError"
:action="uploadUrl"
:show-file-list="false"
+ v-loading="updateModelLoading"
:http-request="httpRequest">
<el-button type="primary" @click="setReplaceModelOnly(false)">
<Icon icon="ep:upload"/>
@@ -246,18 +300,49 @@
</el-table-column>
<el-table-column label="数据点" align="center">
<template #default="scope">
- <el-select
+ <el-select-v2
v-model="scope.row.pointid"
- filterable
+ :options="pointList || []"
+ placeholder="请选择"
+ :props="{value:'id',label:'pointName'}"
clearable
+ filterable
@change="(value) => changeOutputPoint(value,scope.row)"
- placeholder="请选择">
+ :fit-input-width="false"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="是否累计" align="center" width="150px">
+ <template #default="scope">
+ <el-select v-model="scope.row.iscumulant" placeholder="请选择" @change="(value) => iscumulantChange(scope.row)">
<el-option
- v-for="item in pointList"
- :key="item.id"
- :label="item.pointName"
- :value="item.id"/>
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="累计除数" align="center" width="100px">
+ <template #default="scope">
+ <el-input-number v-model="scope.row.cumuldivisor" style="width: 100%"
+ :min="1" :max="60" :disabled="scope.row.iscumulant !== 1"
+ :controls="false"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="累计数据点" align="center">
+ <template #default="scope">
+ <el-select-v2
+ v-model="scope.row.cumulpoint"
+ :options="pointList.filter(e => e.pointType === 'CUMULATE') || []"
+ placeholder="请选择"
+ :props="{value:'id',label:'pointName'}"
+ clearable
+ filterable
+ :fit-input-width="false"
+ :disabled="scope.row.iscumulant !== 1"
+ />
</template>
</el-table-column>
<el-table-column prop="" label="操作" width="80" align="center">
@@ -283,7 +368,7 @@
<el-table-column prop="valuetype" label="类型" align="center" min-width="150"/>
<el-table-column prop="" label="值" align="center" min-width="200">
<template #default="scope">
- <el-input size="mini" v-model="scope.row.value" maxlength="1000"
+ <el-input v-model="scope.row.value" maxlength="1000"
:disabled="scope.row.key === 'pyFile'"
style="width:100%;height:100%"/>
</template>
@@ -314,36 +399,24 @@
</el-table-column>
<el-table-column prop="" label="参数名称" align="center">
<template #default="scope">
- <el-select v-if="scope.row.modelparamtype === 'NormalItem'"
+ <el-select-v2 v-if="scope.row.modelparamtype === 'NormalItem'"
v-model="scope.row.modelparamid"
+ :options="modelparamListMap['NormalItem'] || []"
placeholder="请选择"
+ :props="{value:'value',label:'label',options:'children'}"
+ clearable
filterable
- @change="changeModelparam(scope.row)"
- style="width: 100%">
- <el-option-group
- v-for="group in modelparamListMap['NormalItem']"
- :key="group.value"
- :label="group.label"
- >
- <el-option
- v-for="item in group.children"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-option-group>
- </el-select>
- <el-select v-else
+ :fit-input-width="false"
+ />
+ <el-select-v2 v-else
v-model="scope.row.modelparamid"
+ :options="modelparamListMap[scope.row.modelparamtype] || []"
+ placeholder="请选择"
+ :props="{value:'id',label:'name'}"
+ clearable
filterable
- @change="changeModelparam(scope.row)"
- placeholder="请选择">
- <el-option
- v-for="(item, index) in modelparamListMap[scope.row.modelparamtype]"
- :key="index"
- :label="item.name"
- :value="item.id"/>
- </el-select>
+ :fit-input-width="false"
+ />
</template>
</el-table-column>
<el-table-column prop="" label="参数长度" width="120" align="center">
@@ -357,14 +430,12 @@
<template #default="scope">
<el-button
@click="addRow(scope.$index, dataForm.mmModelParamList)"
- type="text"
- size="mini">
+ type="text">
添加
</el-button>
<el-button
@click="deleteRow(scope.$index, scope.row, dataForm.mmModelParamList)"
- type="text"
- size="mini">
+ type="text">
删除
</el-button>
</template>
@@ -386,11 +457,11 @@
v-model="scope.row.point"
placeholder="请选择"
filterable
- :no-data-text="'无数据（预测长度：' + dataForm.mmPredictItem.predictlength + '；管网：' + moduleList.find(e => e.id === dataForm.dmModuleItem.moduleid)?.modulename + '）'"
+ :no-data-text="'无数据（管网：' + moduleList.find(e => e.id === dataForm.dmModuleItem.moduleid)?.modulename + '）'"
@change="changeNormalItemSelect"
style="width: 100%">
<el-option-group
- v-for="group in modelparamListMap['NormalItem'].filter(e => e.predictlength == dataForm.mmPredictItem.predictlength && e.moduleid === dataForm.dmModuleItem.moduleid)"
+ v-for="group in modelparamListMap['NormalItem'].filter(e => e.moduleid === dataForm.dmModuleItem.moduleid)"
:key="group.value"
:label="group.label"
>
@@ -459,6 +530,7 @@
import * as DaPoint from '@/api/data/da/point'
import {useUpload} from '@/api/model/pre/item'
import * as ScheduleModelApi from '@/api/model/sche/model'
+import {getPointSimpleList} from "@/api/data/da/point";
const {uploadUrl, httpRequest} = useUpload()
@@ -478,11 +550,11 @@
const pointList = ref([])
const pointMap = ref({})
const modelparamListMap = ref({})
-const modelparamMap = ref({})
const expressionList = ref([])
const fileList = ref([])
const operatorList = ['+', '-']
const replaceModelOnly = ref(false)
+const updateModelLoading = ref(false)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@@ -505,7 +577,7 @@
predictphase: undefined,
workchecked: 0,
unittransfactor: undefined,
- saveindex: undefined
+ saveindex: undefined,
},
dmModuleItem: {
id: undefined,
@@ -544,7 +616,11 @@
num: undefined
},
mmModelArithSettingsList: [],
- mmModelParamList: []
+ mmModelParamList: [],
+ pointId: undefined,
+ iscumulant: 0,
+ cumuldivisor: undefined,
+ cumulpoint: undefined,
})
const formRules = reactive({
'mmPredictItem.itemname': [{required: true, message: '预测项名不能为空', trigger: 'blur'}],
@@ -560,6 +636,7 @@
trigger: 'blur'
}],
'mmPredictItem.status': [{required: true, message: '是否启用不能为空', trigger: 'blur'}],
+ 'iscumulant': [{required: true, message: '是否累计不能为空', trigger: 'blur'}],
'dmModuleItem.moduleid': [{required: true, message: '管网不能为空', trigger: 'blur'}],
'dmModuleItem.itemorder': [{required: true, message: '排序不能为空', trigger: 'blur'}],
'mmPredictItem.predictlength': [{required: true, message: '预测长度不能为空', trigger: 'blur'}],
@@ -597,7 +674,7 @@
mpkProjectList.value = await ProjectApi.list()
// 获取数据点列表
- pointNoList.value = await DaPoint.getPointList(queryParams)
+ pointNoList.value = await DaPoint.getPointSimpleList(queryParams)
if (pointNoList.value.length > 0) {
pointList.value = []
pointNoList.value.forEach(function (value) {
@@ -626,6 +703,13 @@
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
+ //校验累计配置
+ if (dataForm.value.iscumulant === 1) {
+ if (dataForm.value.cumuldivisor == undefined) {
+ message.error("累计除数不为空")
+ return
+ }
+ }
//校验模型输出
if (dataForm.value.itemtypename === 'NormalItem') {
if (dataForm.value.mmItemOutputList == undefined || dataForm.value.mmItemOutputList.length <= 0) {
@@ -633,15 +717,39 @@
return
}
- let flag = false
dataForm.value.mmItemOutputList.forEach(e => {
- if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === '' || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))) {
- message.error("模型输出数据异常")
- flag = true
- return
+ if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === ''
+ || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))
+ || (e.iscumulant === 1 && e.cumuldivisor == undefined)
+ ) {
+ message.error("输出数据异常")
+ throw new Error('输出数据异常');
}
})
- if (flag) return
+
+
+ // 校验是否有预测长度参数
+ const predictLength = dataForm.value.mmModelArithSettingsList?.find(e => e.key === 'predictLength')?.value;
+ if (predictLength === undefined) {
+ message.error("缺少模型设置参数【predictLength(预测长度)】")
+ return
+ }
+ dataForm.value.mmPredictItem.predictlength = predictLength
+
+ //校验模型输入
+ dataForm.value.mmModelParamList.forEach(e => {
+ if (e.modelparamid == undefined || e.modelparamid == '') {
+ message.error("输入数据异常")
+ throw new Error('输入数据异常');
+ }
+ // ind_ascii类型输出的序号必须是1，且所在端口序号最大为1（一个ind_ascii类型输入独占一个端口）
+ if (e.modelparamtype === 'IND_ASCII') {
+ if (e.modelparamorder != 1 || dataForm.value.mmModelParamList.filter(p => p.modelparamportorder === e.modelparamportorder).length != 1) {
+ message.error("输入数据异常：IND_ASCII类型输入独占一个端口")
+ throw new Error('输入数据异常：IND_ASCII类型输入独占一个端口');
+ }
+ }
+ })
}
if (dataForm.value.itemtypename === 'MergeItem') {
if (expressionList.value == undefined || expressionList.value.length <= 1) {
@@ -651,7 +759,7 @@
let flag = false
expressionList.value.forEach((e,index) => {
- if (e.point == undefined || e.point === '' || e.operator == undefined || (e.operator === '' && index != expressionList.value.length - 1)) {
+ if (e.point == undefined || e.point === '' || ((e.operator == undefined || e.operator === '') && index != expressionList.value.length - 1)) {
message.error("表达式数据异常")
flag = true
return
@@ -659,7 +767,6 @@
})
if (flag) return
}
-
// 提交请求
formLoading.value = true
@@ -675,13 +782,7 @@
} else {
dataForm.value.mmPredictMergeItem.expression = ''
}
- if (dataForm.value.mmModelArithSettingsList) {
- for (let item of dataForm.value.mmModelArithSettingsList) {
- if (item.key === 'predictLength') {
- dataForm.value.mmPredictItem.predictlength = item.value
- }
- }
- }
+
if (formType.value === 'create') {
await MmPredictItem.createMmPredictItem(data)
message.success(t('common.createSuccess'))
@@ -744,6 +845,7 @@
}
function beforeUpload(file) {
+ updateModelLoading.value = true
let fileName = file.name
let first = fileName.lastIndexOf('.')
let nameLength = fileName.length
@@ -755,63 +857,65 @@
}
function uploadModelSuccess(response, file, fileList) {
- if (response.code === 0) {
- message.success(t('上传成功'))
- dataForm.value.mmModelArithSettingsList = []
- if (!replaceModelOnly.value) {
- dataForm.value.mmModelParamList = []
- }
- dataForm.value.mmPredictModel.modelpath = ''
- dataForm.value.mmPredictModel.modelparamstructure = ''
- if (response.data.loadFieldSetList && response.data.loadFieldSetList[0].propertyList) {
- response.data.loadFieldSetList[0].propertyList.forEach(function (value) {
- //匹配 data数字
- if (!/^data\d+$/.test(value.key)) {
- dataForm.value.mmModelArithSettingsList.push({
- key: value.key,
- name: value.name,
- valuetype: value.valueType,
- value: value.value
- })
- }
- })
- }
- dataForm.value.mmPredictModel.modelname = response.data.originalFilename
- dataForm.value.mmPredictModel.classname = response.data.className
- dataForm.value.mmPredictModel.methodname = response.data.methodName
- if (response.data.paramPathList) {
- dataForm.value.mmPredictModel.modelpath = response.data.paramPathList[0]
- }
- if (response.data.paramsArray) {
- dataForm.value.mmPredictModel.modelparamstructure = response.data.paramsArray.join(',')
- }
- if (response.data.paramsCount && !replaceModelOnly.value) {
- for (let i = 0; i < response.data.paramsCount; i++) {
- dataForm.value.mmModelParamList.push({
- modelparamportorder: (i + 1),
- modelparamorder: (i + 1),
- modelparamtype: '',
- modelparamid: '',
- modelparamname: '',
- datalength: 0
+ try {
+ if (response.code === 0) {
+ message.success(t('上传成功'))
+ dataForm.value.mmModelArithSettingsList = []
+ if (!replaceModelOnly.value) {
+ dataForm.value.mmModelParamList = []
+ }
+ dataForm.value.mmPredictModel.modelpath = ''
+ dataForm.value.mmPredictModel.modelparamstructure = ''
+ if (response.data.loadFieldSetList && response.data.loadFieldSetList[0].propertyList) {
+ response.data.loadFieldSetList[0].propertyList.forEach(function (value) {
+ //匹配 data数字
+ if (!/^data\d+$/.test(value.key)) {
+ dataForm.value.mmModelArithSettingsList.push({
+ key: value.key,
+ name: value.name,
+ valuetype: value.valueType,
+ value: value.value
+ })
+ }
})
}
+ dataForm.value.mmPredictModel.modelname = response.data.originalFilename
+ dataForm.value.mmPredictModel.classname = response.data.className
+ dataForm.value.mmPredictModel.methodname = response.data.methodName
+ if (response.data.paramPathList) {
+ dataForm.value.mmPredictModel.modelpath = response.data.paramPathList[0]
+ }
+ if (response.data.paramsArray) {
+ dataForm.value.mmPredictModel.modelparamstructure = response.data.paramsArray.join(',')
+ }
+ if (response.data.paramsCount && !replaceModelOnly.value) {
+ for (let i = 0; i < response.data.paramsCount; i++) {
+ dataForm.value.mmModelParamList.push({
+ modelparamportorder: (i + 1),
+ modelparamorder: (i + 1),
+ modelparamtype: '',
+ modelparamid: '',
+ modelparamname: '',
+ datalength: 0
+ })
+ }
+ }
+ if (response.data.settingConfigMap && response.data.settingConfigMap.settingMap) {
+ dataForm.value.mmPredictModel.settingmap = JSON.stringify(response.data.settingConfigMap.settingMap)
+ }
+ } else {
+ message.error('上传失败！' + response.msg)
+ return
}
- if (response.data.settingConfigMap && response.data.settingConfigMap.settingMap) {
- dataForm.value.mmPredictModel.settingmap = JSON.stringify(response.data.settingConfigMap.settingMap)
- }
- } else {
- message.error('上传失败！' + response.msg)
- return
+ fileList = []
+ }finally {
+ updateModelLoading.value = false
}
- fileList = []
+
}
function uploadModelError(file, err, fileList) {
-}
-
-function changeModelparam(row) {
- row.modelparamname = modelparamMap[row.modelparamid]
+ updateModelLoading.value = false
}
function changeItemtype(value) {
@@ -883,6 +987,10 @@
row.resultIndex = 0
}
}
+function iscumulantChange(row) {
+ row.cumuldivisor = undefined
+ row.cumulpoint = undefined
+}
function orderRow(rows) {
let modelparamorder = 0
@@ -943,7 +1051,7 @@
predictphase: '',
workchecked: 0,
unittransfactor: '',
- saveindex: ''
+ saveindex: '',
},
dmModuleItem: {
id: '',
@@ -979,7 +1087,10 @@
itemid: '',
expression: '',
num: ''
- }
+ },
+ iscumulant: 0,
+ cumuldivisor: undefined,
+ cumulpoint: '',
}
formRef.value?.resetFields()
}
--
Gitblit v1.9.3