From f158183de34c89d791b445ff2f810e2976ddde63 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 九月 2024 11:17:33 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.8.100:29418/iailab-plat-ui-vue3
---
src/views/model/pre/predict/index.vue | 159 +++++++++--------
src/views/model/pre/predict/MmPredictItemForm.vue | 361 ++++++++++++++++++++++-----------------
src/api/model/pre/predict/index.ts | 2
3 files changed, 290 insertions(+), 232 deletions(-)
diff --git a/src/api/model/pre/predict/index.ts b/src/api/model/pre/predict/index.ts
index 2059286..26d2bb2 100644
--- a/src/api/model/pre/predict/index.ts
+++ b/src/api/model/pre/predict/index.ts
@@ -40,7 +40,7 @@
modelname: string,
itemid: string,
arithid: string,
- trainsamplength: string,
+ trainsamplength: number,
predictsamplength: string,
isonlinetrain: string,
modelpath: string,
diff --git a/src/views/model/pre/predict/MmPredictItemForm.vue b/src/views/model/pre/predict/MmPredictItemForm.vue
index fbc3506..b3806b7 100644
--- a/src/views/model/pre/predict/MmPredictItemForm.vue
+++ b/src/views/model/pre/predict/MmPredictItemForm.vue
@@ -10,21 +10,22 @@
<el-divider content-position="left">基本信息</el-divider>
<el-row>
<el-col :span="12">
- <el-form-item label="预测项名" prop="itemname">
+ <el-form-item label="预测项名">
<el-input v-model="dataForm.mmPredictItem.itemname" placeholder="预测项名"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="编号" prop="itemno">
+ <el-form-item label="编号">
<el-input v-model="dataForm.mmPredictItem.itemno" placeholder="编号" maxlength="50"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="类型" prop="itemtypeid">
- <el-select v-model="dataForm.mmPredictItem.itemtypeid" @change="changeItemtype"
- placeholder="请选择">
+ <el-form-item label="类型">
+ <el-select
+ v-model="dataForm.mmPredictItem.itemtypeid" @change="changeItemtype"
+ placeholder="请选择">
<el-option
v-for="item in itemTypeList"
:key="item.id"
@@ -34,15 +35,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="粒度" prop="granularity">
- <el-input v-model="dataForm.mmPredictItem.granularity" placeholder="粒度"
- maxlength="5"/>
+ <el-form-item label="粒度">
+ <el-input
+ v-model="dataForm.mmPredictItem.granularity" placeholder="粒度"
+ maxlength="5"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="是否检查" prop="workchecked">
+ <el-form-item label="是否检查">
<el-select v-model="dataForm.mmPredictItem.workchecked" placeholder="请选择">
<el-option
v-for="item in isList"
@@ -53,7 +55,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="是否启用" prop="status">
+ <el-form-item label="是否启用">
<el-select v-model="dataForm.dmModuleItem.status" placeholder="请选择">
<el-option
v-for="item in isList"
@@ -66,7 +68,7 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="管网" prop="moduleid">
+ <el-form-item label="管网">
<el-select v-model="dataForm.dmModuleItem.moduleid" placeholder="请选择">
<el-option
v-for="item in moduleList"
@@ -77,19 +79,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="类别" prop="categoryid">
+ <el-form-item label="类别">
<el-input v-model="dataForm.dmModuleItem.categoryid" placeholder="类别" maxlength="64"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="排序" prop="itemorder">
+ <el-form-item label="排序">
<el-input v-model="dataForm.dmModuleItem.itemorder" placeholder="排序" maxlength="36"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="数据点" prop="pointid">
+ <el-form-item label="数据点">
<el-select
v-model="dataForm.mmItemOutput.pointid"
filterable
@@ -104,24 +106,25 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="保存点位" prop="saveindex">
- <el-select v-model="dataForm.mmPredictItem.saveindex" placeholder="请选择">
- <el-option
- v-for="item in saveIndexList"
- :key="item.code"
- :label="item.name"
- :value="item.code"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
+ <!-- <el-row>
+ <el-col :span="12">
+ <el-form-item label="保存点位">
+ <el-select v-model="dataForm.mmPredictItem.saveindex" placeholder="请选择">
+ <el-option
+ v-for="item in saveIndexList"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>-->
<el-row v-if="dataForm.itemtypename === 'MergeItem'">
<el-col :span="12">
- <el-form-item label="预测长度" prop="predictlength">
- <el-input v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
- maxlength="5"/>
+ <el-form-item label="预测长度">
+ <el-input
+ v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
+ maxlength="5"/>
</el-form-item>
</el-col>
</el-row>
@@ -129,21 +132,23 @@
</el-divider>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="24">
- <el-form-item label="模型名称" prop="modelname">
- <el-input v-model="dataForm.mmPredictModel.modelname" placeholder="模型名称"
- maxlength="50"/>
+ <el-form-item label="模型名称">
+ <el-input
+ v-model="dataForm.mmPredictModel.modelname" placeholder="模型名称"
+ maxlength="50"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="编号" prop="modelno" v-if="!!dataForm.id">
- <el-input v-model="dataForm.mmPredictModel.modelno" placeholder="编号" maxlength="32"
- disabled/>
+ <el-form-item label="编号" v-if="!!dataForm.id">
+ <el-input
+ v-model="dataForm.mmPredictModel.modelno" placeholder="编号" maxlength="32"
+ disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="12">
- <el-form-item label="上传模型" prop="itemorder">
+ <el-form-item label="上传模型">
<el-upload
class="upload-demo"
:limit="1"
@@ -154,14 +159,15 @@
:action="uploadModelUrl">
<el-button size="small" type="primary" @click="setReplaceModelOnly(0)">点击上传
</el-button>
- <el-button size="small" type="primary" @click="setReplaceModelOnly(1)"
- v-if="!!dataForm.id">只替换模型
+ <el-button
+ size="small" type="primary" @click="setReplaceModelOnly(1)"
+ v-if="!!dataForm.id">只替换模型
</el-button>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="结果" prop="resultstrid">
+ <el-form-item label="结果">
<el-select v-model="dataForm.mmPredictModel.resultstrid" placeholder="请选择">
<el-option
v-for="item in resultstridList"
@@ -174,35 +180,38 @@
</el-row>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="24">
- <el-form-item label="路径" prop="modelpath">
- <el-input v-model="dataForm.mmPredictModel.modelpath" placeholder="路径" maxlength="32"
- disabled/>
+ <el-form-item label="路径">
+ <el-input
+ v-model="dataForm.mmPredictModel.modelpath" placeholder="路径" maxlength="32"
+ disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="24">
- <el-form-item label="类名" prop="classname">
- <el-input v-model="dataForm.mmPredictModel.classname" placeholder="类名" maxlength="32"
- disabled/>
+ <el-form-item label="类名">
+ <el-input
+ v-model="dataForm.mmPredictModel.classname" placeholder="类名" maxlength="32"
+ disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="12">
- <el-form-item label="方法名" prop="methodname">
- <el-input v-model="dataForm.mmPredictModel.methodname" placeholder="方法名"
- maxlength="32" disabled/>
+ <el-form-item label="方法名">
+ <el-input
+ v-model="dataForm.mmPredictModel.methodname" placeholder="方法名"
+ maxlength="32" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="参数" prop="modelparamstructure">
- <el-input v-model="dataForm.mmPredictModel.modelparamstructure" placeholder="参数"
- maxlength="32" disabled/>
+ <el-form-item label="参数">
+ <el-input
+ v-model="dataForm.mmPredictModel.modelparamstructure" placeholder="参数"
+ maxlength="32" disabled/>
</el-form-item>
</el-col>
</el-row>
-
<el-table
v-if="dataForm.itemtypename === 'NormalItem'"
:data="dataForm.mmModelArithSettingsList"
@@ -221,6 +230,7 @@
<el-divider content-position="left" v-if="dataForm.itemtypename === 'NormalItem'">输入参数
</el-divider>
<el-table
+ v-if="dataForm.itemtypename === 'NormalItem'"
:data="dataForm.mmModelParamList"
border
style="width: 100%; margin-top: 5px;">
@@ -228,8 +238,9 @@
<el-table-column prop="modelparamorder" label="序号" width="60" align="center"/>
<el-table-column prop="" label="类型" width="200" align="center">
<template #default="scope">
- <el-select v-model="scope.row.modelparamtype"
- @change="changeModelparamtype(value, scope.row)" placeholder="请选择">
+ <el-select
+ v-model="scope.row.modelparamtype"
+ @change="changeModelparamtype(value, scope.row)" placeholder="请选择">
<el-option
v-for="item in dataForm.modelparamtypeList"
:key="item"
@@ -255,11 +266,12 @@
</el-table-column>
<el-table-column prop="" label="参数长度" width="120" align="center">
<template #default="scope">
- <el-input v-model="scope.row.datalength" maxlength="50"
- style="width:100%;hight:100%"/>
+ <el-input
+ v-model="scope.row.datalength" maxlength="50"
+ style="width:100%;height:100%"/>
</template>
</el-table-column>
- <el-table-column prop="" label="操作" width="100" align="center">
+ <el-table-column prop="" label="操作" width="140" align="center">
<template #default="scope">
<el-button
@click="addRow(scope.$index, dataForm.mmModelParamList)"
@@ -279,6 +291,7 @@
<el-divider content-position="left" v-if="dataForm.itemtypename === 'MergeItem'">表达式
</el-divider>
<el-table
+ v-if="dataForm.itemtypename === 'MergeItem'"
:data="expressionList"
border
style="width: 100%; margin-top: 5px;">
@@ -320,7 +333,7 @@
<el-table-column
prop=""
label="操作"
- width="100"
+ width="140"
align="center">
<template #default="scope">
<el-button
@@ -368,8 +381,10 @@
const moduleList = ref([])
const resulttableList = ref([])
const resultstridList = ref([])
+const pointNoList = ref([])
const pointList = ref([])
const pointMap = ref({})
+const predictList = ref([])
const predictItemList = ref([])
const modelparamList = ref([])
const modelparamListMap = ref([])
@@ -393,7 +408,7 @@
code: 1,
name: '是'
}])
-const saveIndexList = ref([
+/*const saveIndexList = ref([
{
code: '2',
name: 'T+2'
@@ -405,66 +420,66 @@
{
code: 'n',
name: 'T+n'
- }])
+ }])*/
const dataForm = ref({
- id: '',
- itemtypename: '',
+ id: undefined,
+ itemtypename: undefined,
mmPredictItem: {
- id: '',
- itemno: '',
- itemname: '',
- caltypeid: '',
- itemtypeid: '',
- predictlength: '',
- granularity: '',
- status: '',
- isfuse: '',
- predictphase: '',
- workchecked: 0,
- unittransfactor: '',
- saveindex: ''
+ id: undefined,
+ itemno: undefined,
+ itemname: undefined,
+ caltypeid: undefined,
+ itemtypeid: undefined,
+ predictlength: undefined,
+ granularity: undefined,
+ status: undefined,
+ isfuse: undefined,
+ predictphase: undefined,
+ workchecked: '',
+ unittransfactor: undefined,
+ saveindex: undefined
},
dmModuleItem: {
- id: '',
- moduleid: '',
- itemid: '',
- itemorder: '',
- status: 1,
- categoryid: ''
+ id: undefined,
+ moduleid: undefined,
+ itemid: undefined,
+ itemorder: undefined,
+ status: undefined,
+ categoryid: undefined
},
mmItemOutput: {
- id: '',
- itemid: '',
- pointid: '',
- resulttableid: '3cc2b483-3a01-40f7-a419-0c260210d8eb',
- tagname: '',
- outputorder: 1
+ id: undefined,
+ itemid: undefined,
+ pointid: undefined,
+ resulttableid: undefined,
+ tagname: undefined,
+ outputorder: undefined
},
mmPredictModel: {
- id: '',
- modelno: '',
- modelname: '',
- itemid: '',
- arithid: '',
- trainsamplength: '',
- predictsamplength: '',
- isonlinetrain: '',
- modelpath: '',
- isnormal: '',
- normalmax: '',
- normalmin: '',
- status: 1,
- classname: '',
- methodname: '',
- modelparamstructure: '',
- resultstrid: '',
- settingmap: ''
+ id: undefined,
+ modelno: undefined,
+ modelname: undefined,
+ itemid: undefined,
+ arithid: undefined,
+ trainsamplength: undefined,
+ predictsamplength: undefined,
+ isonlinetrain: undefined,
+ modelpath: undefined,
+ isnormal: undefined,
+ normalmax: undefined,
+ normalmin: undefined,
+ status: undefined,
+ classname: undefined,
+ methodname: undefined,
+ modelparamstructure: undefined,
+ resultstrid: undefined,
+ settingmap: undefined
},
mmPredictMergeItem: {
- id: '',
- itemid: '',
- expression: '',
- num: ''
+ id: undefined,
+ itemid: undefined,
+ expression: undefined,
+ num: undefined
},
modelparamtypeList: ['DATAPOINT', 'PREDICTITEM', 'DAYWORKPROCESSPLAN', 'MONTHWORKPROCESSPLAN', 'ST_PLAN_NQ', 'ST_PLAN_BQ', 'ST_PLAN_NQ_HI', 'ST_PLAN_BQ_HI'],
mmModelArithSettingsList: [],
@@ -477,22 +492,26 @@
const formRef = ref() // 表单 Ref
/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, itemtypename?: string) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
- resetForm()
+ dataForm.value.itemtypename = itemtypename || 'NormalItem'
+ console.info(dataForm.value.itemtypename)
+ // resetForm()
+ resetFields(dataForm.value)
setDefaultFields()
- // getItemTypeList()
- // getModuleList()
+ getItemTypeList()
+ getModuleList()
getPointList()
- // getModelparamList()
- // getResulttableList()
- // getResultstridList()
+ getModelparamList()
+ getResulttableList()
+ getResultstridList()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
+ debugger
getInfo(id)
} finally {
formLoading.value = false
@@ -512,6 +531,24 @@
formLoading.value = true
try {
const data = dataForm.value as unknown as MmPredictItem.MmPredictItemVO
+ debugger
+ if (expressionList.value && expressionList.value.length > 0) {
+ let expression = ''
+ for (let i = 0; i < expressionList.value.length; i++) {
+ let value = expressionList.value[i]
+ expression = expression + value.point + (i === (expressionList.value.length - 1) ? '' : value.operator)
+ }
+ dataForm.value.mmPredictMergeItem.expression = expression
+ } else {
+ dataForm.value.mmPredictMergeItem.expression = ''
+ }
+ if (dataForm.value.mmModelArithSettingsList) {
+ for (let item of dataForm.value.mmModelArithSettingsList) {
+ if (item.key === 'lenpredict') {
+ dataForm.value.mmPredictItem.predictlength = item.value
+ }
+ }
+ }
if (formType.value === 'create') {
await MmPredictItem.createMmPredictItem(data)
message.success(t('common.createSuccess'))
@@ -527,13 +564,26 @@
}
}
-function getInfo(id) {
- debugger
- const res = MmPredictItem.getMmPredictItem(id)
- console.info(res)
+const resetFields = (obj) => {
+ for (let key in obj) {
+ if (key === 'itemtypename') {
+ continue
+ }
+ if (obj[key] instanceof Array) {
+ obj[key] = []
+ } else if (obj[key] instanceof Object) {
+ resetFields(obj[key])
+ } else {
+ obj[key] = ''
+ }
+ }
+}
+
+const getInfo = async (id) => {
+ dataForm.value = await MmPredictItem.getMmPredictItem(id)
expressionList.value = []
- if (res.mmPredictMergeItem && res.mmPredictMergeItem.expression) {
- let expression = res.mmPredictMergeItem.expression
+ if (dataForm.value.mmPredictMergeItem && dataForm.value.mmPredictMergeItem.expression) {
+ let expression = dataForm.value.mmPredictMergeItem.expression
do {
let indexPlus = expression.indexOf('+')
let indexSub = expression.indexOf('-')
@@ -541,7 +591,7 @@
let endIndex = (indexSub == -1 || (indexPlus < indexSub && indexPlus !== -1)) ? indexPlus : indexSub
expressionList.value.push({
point: expression.substring(0, endIndex),
- operator: expression.substr(endIndex, 1)
+ operator: expression.substring(endIndex, 1)
})
expression = expression.substring(endIndex + 1)
} else {
@@ -589,7 +639,7 @@
value: value.value
})
}
- }, this)
+ })
}
dataForm.value.mmPredictModel.classname = response.data.className
dataForm.value.mmPredictModel.methodname = response.data.methodName
@@ -630,6 +680,7 @@
function changeItemtype(value) {
dataForm.value.itemtypename = itemTypeMap[value]
+ console.info(dataForm.value.itemtypename)
}
function changeModelparamtype(value, row) {
@@ -678,52 +729,52 @@
}
// 获取预测项类型列表
-function getItemTypeList() {
+const getItemTypeList = async () => {
itemTypeList.value = []
- itemTypeList.value = MmItemType.getItemTypeList()
+ itemTypeList.value = await MmItemType.getItemTypeList()
itemTypeList.value.forEach(function (value) {
itemTypeMap[value.id] = value.itemtypename
})
if (!dataForm.value.id) {
- // dataForm.value.mmPredictItem.itemtypeid = itemTypeList[0].id
+ dataForm.value.mmPredictItem.itemtypeid = itemTypeList.value[0].id
}
}
// 获取管网列表
-function getModuleList() {
+const getModuleList = async () => {
moduleList.value = []
- moduleList.value = DmModule.getModuleList()
+ moduleList.value = await DmModule.getModuleList()
}
-function getResulttableList() {
+const getResulttableList = async () => {
resulttableList.value = []
- resulttableList.value = MmResultTable.getResulttableList()
+ resulttableList.value = await MmResultTable.getResulttableList()
}
-function getResultstridList() {
+const getResultstridList = async () => {
resultstridList.value = []
- resultstridList.value = MmResultTable.getResultstridList()
+ resultstridList.value = await MmResultTable.getResultstridList()
}
-function getPointList() {
+const getPointList = async () => {
pointLoading.value = true
- pointList.value = DaPoint.getPointList(queryParams)
- if (pointList.value.length > 0) {
- pointList.value.forEach(function (value) {
+ pointNoList.value = await DaPoint.getPointList(queryParams)
+ if (pointNoList.value.length > 0) {
+ pointNoList.value.forEach(function (value) {
pointList.value.push(value)
pointMap[value.id] = value.pointname
})
}
}
-function getModelparamList() {
+const getModelparamList = async () => {
modelparamListMap.value = []
modelparamList.value = []
predictItemList.value = []
- pointList.value = DaPoint.getPointList(queryParams)
+ pointNoList.value = await DaPoint.getPointList(queryParams)
let paramList = []
- if (pointList.value.length > 0) {
- pointList.value.forEach(function (value) {
+ if (pointNoList.value.length > 0) {
+ pointNoList.value.forEach(function (value) {
paramList.push({
id: value.id,
code: value.pointno,
@@ -735,10 +786,10 @@
modelparamListMap['DATAPOINT'] = paramList;
}
- let predictRes = MmPredictItem.getMmPredictItemList
+ predictList.value = await MmPredictItem.getMmPredictItemList()
paramList = []
- if (predictRes.value.length > 0) {
- predictRes.forEach(function (value) {
+ if (predictList.value.length > 0) {
+ predictList.value.forEach(function (value) {
paramList.push({
id: value.id,
code: value.itemno,
@@ -746,7 +797,7 @@
type: 'PREDICTITEM'
})
if (value.id !== dataForm.value.id) {
- predictItemList.push({
+ predictItemList.value.push({
id: value.id,
code: value.itemno,
name: value.itemname
@@ -757,10 +808,10 @@
modelparamListMap['PREDICTITEM'] = paramList;
}
- const dayParams = {
+ /*const dayParams = {
'processType': '日计划'
}
- let dayScheduleRes = ScheduleModelApi.getScheduleWorkPrecessList(dayParams)
+ let dayScheduleRes = await ScheduleModelApi.getScheduleWorkPrecessList(dayParams)
paramList = []
if (dayScheduleRes !== null) {
dayScheduleRes.forEach(function (value) {
@@ -778,7 +829,7 @@
const monthParams = {
'processType': '月计划'
}
- let monthScheduleRes = ScheduleModelApi.getScheduleWorkPrecessList(monthParams)
+ let monthScheduleRes = await ScheduleModelApi.getScheduleWorkPrecessList(monthParams)
paramList = []
if (monthScheduleRes !== null) {
monthScheduleRes.forEach(function (value) {
@@ -791,12 +842,11 @@
modelparamMap[value.id] = value.aliasName
})
modelparamListMap['MONTHWORKPROCESSPLAN'] = paramList;
- }
+ }*/
}
-function setDefaultFields() {
+const setDefaultFields = () => {
dataForm.value.mmPredictItem.workchecked = 0
- dataForm.value.mmPredictItem.predictlength = 60
dataForm.value.mmPredictItem.status = 1
dataForm.value.mmPredictItem.isfuse = 0
dataForm.value.mmPredictItem.predictphase = 0
@@ -816,7 +866,7 @@
}
/** 重置表单 */
-const resetForm = () => {
+/*const resetForm = () => {
dataForm.value = {
mmModelArithSettingsList: [],
mmModelParamList: [],
@@ -834,7 +884,7 @@
status: '',
isfuse: '',
predictphase: '',
- workchecked: 0,
+ workchecked: '',
unittransfactor: '',
saveindex: ''
},
@@ -882,13 +932,12 @@
}
}
formRef.value?.resetFields()
-}
+}*/
onMounted(() => {
init()
})
function init() {
-
}
</script>
diff --git a/src/views/model/pre/predict/index.vue b/src/views/model/pre/predict/index.vue
index f9c37e2..9157fad 100644
--- a/src/views/model/pre/predict/index.vue
+++ b/src/views/model/pre/predict/index.vue
@@ -28,11 +28,11 @@
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
- <Icon icon="ep:search" class="mr-5px" />
+ <Icon icon="ep:search" class="mr-5px"/>
搜索
</el-button>
<el-button @click="resetQuery">
- <Icon icon="ep:refresh" class="mr-5px" />
+ <Icon icon="ep:refresh" class="mr-5px"/>
重置
</el-button>
<el-button
@@ -41,7 +41,7 @@
@click="openForm('create')"
v-hasPermi="['model:pre-predict:create']"
>
- <Icon icon="ep:plus" class="mr-5px" />
+ <Icon icon="ep:plus" class="mr-5px"/>
新增
</el-button>
</el-form-item>
@@ -51,28 +51,28 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
- <el-table-column label="编号" align="center" prop="itemno" />
- <el-table-column label="预测项名" align="center" prop="itemname" />
-<!-- <el-table-column label="类型ID" align="center" prop="itemtypeid" />-->
- <el-table-column label="类型名称" align="center" prop="itemtypename" />
- <el-table-column label="粒度" align="center" prop="granularity" />
- <el-table-column label="是否融合" align="center" prop="isfuse" />
- <el-table-column label="是否检查" align="center" prop="workchecked" />
-<!-- <el-table-column label="模块ID" align="center" prop="moduleid" />-->
- <el-table-column label="排序" align="center" prop="itemorder" />
- <el-table-column label="是否启用" align="center" prop="status" />
-<!-- <el-table-column label="类别ID" align="center" prop="categoryid" />-->
-<!-- <el-table-column label="数据点ID" align="center" prop="pointid" />-->
- <el-table-column label="数据点名称" align="center" prop="tagname" />
-<!-- <el-table-column label="存放表ID" align="center" prop="resulttableid" />-->
- <el-table-column label="存放表" align="center" prop="tablename" />
+ <el-table-column label="编号" align="center" prop="itemno"/>
+ <el-table-column label="预测项名" align="center" prop="itemname"/>
+ <!-- <el-table-column label="类型ID" align="center" prop="itemtypeid" />-->
+ <el-table-column label="类型名称" align="center" prop="itemtypename"/>
+ <el-table-column label="粒度" align="center" prop="granularity"/>
+ <el-table-column label="是否融合" align="center" prop="isfuse"/>
+ <el-table-column label="是否检查" align="center" prop="workchecked"/>
+ <!-- <el-table-column label="模块ID" align="center" prop="moduleid" />-->
+ <!-- <el-table-column label="排序" align="center" prop="itemorder" />-->
+ <el-table-column label="是否启用" align="center" prop="status"/>
+ <!-- <el-table-column label="类别ID" align="center" prop="categoryid" />-->
+ <!-- <el-table-column label="数据点ID" align="center" prop="pointid" />-->
+ <el-table-column label="数据点名称" align="center" prop="tagname"/>
+ <!-- <el-table-column label="存放表ID" align="center" prop="resulttableid" />-->
+ <el-table-column label="存放表" align="center" prop="tablename"/>
<el-table-column label="操作" align="center" min-width="110" fixed="right">
<template #default="scope">
<el-button
link
type="primary"
- @click="openForm('update', scope.row.id)"
+ @click="openForm('update', scope.row.id, scope.row.itemtypename)"
v-hasPermi="['model:pre-predict:update']"
>
编辑
@@ -98,7 +98,7 @@
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
- <MmPredictItemForm ref="formRef" @success="getList" />
+ <MmPredictItemForm ref="formRef" @success="getList"/>
</template>
<script lang="ts" setup>
@@ -107,67 +107,76 @@
defineOptions({name: 'DataMmPredictItem'})
- const message = useMessage() // 消息弹窗
- const {t} = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const {t} = useI18n() // 国际化
- const loading = ref(true) // 列表的加载中
- const total = ref(0) // 列表的总页数
- const list = ref([]) // 列表的数据
- const queryParams = reactive({
- pageNo: 1,
- pageSize: 10,
- itemno: undefined,
- itemname: undefined,
- })
- const queryFormRef = ref() // 搜索的表单
- const exportLoading = ref(false) // 导出的加载中
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ itemno: undefined,
+ itemname: undefined,
+})
+const isList = ref([
+ {
+ code: 0,
+ name: '否'
+ },
+ {
+ code: 1,
+ name: '是'
+ }])
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
- /** 查询列表 */
- const getList = async () => {
- loading.value = true
- try {
- const page = await MmPredictItem.getMmPredictItemPage(queryParams)
- list.value = page.list
- total.value = page.total
- } finally {
- loading.value = false
- }
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const page = await MmPredictItem.getMmPredictItemPage(queryParams)
+ list.value = page.list
+ total.value = page.total
+ } finally {
+ loading.value = false
}
+}
- /** 搜索按钮操作 */
- const handleQuery = () => {
- queryParams.pageNo = 1
- getList()
- }
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+}
- /** 重置按钮操作 */
- const resetQuery = () => {
- queryFormRef.value.resetFields()
- handleQuery()
- }
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
- /** 添加/修改操作 */
- const formRef = ref()
- const openForm = (type: string, id?: number) => {
- formRef.value.open(type, id)
- }
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number, itemtypename?: string) => {
+ formRef.value.open(type, id, itemtypename)
+}
- /** 删除按钮操作 */
- const handleDelete = async (id: number) => {
- try {
- // 删除的二次确认
- await message.delConfirm()
- // 发起删除
- await MmPredictItem.deleteMmPredictItem(id)
- message.success(t('common.delSuccess'))
- // 刷新列表
- await getList()
- } catch {
- }
- }
-
- /** 初始化 **/
- onMounted(async () => {
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await MmPredictItem.deleteMmPredictItem(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
await getList()
- })
+ } catch {
+ }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+ await getList()
+})
</script>
--
Gitblit v1.9.3