From 8b40f521b99ba9e5af7bb38587e4a4a4a0599193 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 02 一月 2025 09:41:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/index.vue | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/views/model/pre/item/index.vue b/src/views/model/pre/item/index.vue
index ffc12bd..c1b6f60 100644
--- a/src/views/model/pre/item/index.vue
+++ b/src/views/model/pre/item/index.vue
@@ -7,6 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
+ @submit.prevent
>
<el-form-item label="编号" prop="itemno">
<el-input
@@ -21,6 +22,28 @@
<el-input
v-model="queryParams.itemname"
placeholder="请输入预测项名"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="类型" prop="itemtypeid">
+ <el-select
+ v-model="queryParams.itemtypeid"
+ placeholder="请选择"
+ clearable
+ class="!w-240px">
+ <el-option
+ v-for="item in itemTypeList"
+ :key="item.id"
+ :label="item.itemtypename"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="管网名称" prop="modulename">
+ <el-input
+ v-model="queryParams.modulename"
+ placeholder="请输入管网名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -65,16 +88,7 @@
<dict-tag :type="DICT_TYPE.PRED_GRANULARITY" :value="scope.row.granularity" />
</template>
</el-table-column>
- <el-table-column label="是否融合" align="center" prop="isfuse">
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.isfuse" />
- </template>
- </el-table-column>
- <el-table-column label="是否检查" align="center" prop="workchecked">
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.workchecked" />
- </template>
- </el-table-column>
+ <el-table-column label="管网名称" align="center" prop="modulename" />
<el-table-column label="是否启用" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.status" />
@@ -86,7 +100,7 @@
<dict-tag :type="DICT_TYPE.ITEM_RUN_STATUS" :value="scope.row.runStatus" />
</template>
</el-table-column>
- <el-table-column label="运行耗时(s)" align="center" prop="duration"/>
+ <el-table-column label="运行耗时(ms)" align="center" prop="duration"/>
<el-table-column label="操作" align="center" min-width="120" fixed="right">
<template #default="scope">
<el-button
@@ -130,6 +144,7 @@
<script lang="ts" setup>
import MmPredictItemForm from './MmPredictItemForm.vue'
import MmPredictItemChart from './MmPredictItemChart.vue'
+import * as MmItemType from '@/api/model/pre/type'
import * as MmPredictItem from '@/api/model/pre/item'
import {DICT_TYPE} from "@/utils/dict";
@@ -138,6 +153,7 @@
const message = useMessage() // 消息弹窗
const {t} = useI18n() // 国际化
+const itemTypeList = ref([])
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
@@ -146,6 +162,8 @@
pageSize: 10,
itemno: undefined,
itemname: undefined,
+ itemtypeid: undefined,
+ modulename: undefined,
})
const isList = ref([
{
@@ -212,5 +230,7 @@
/** 初始化 **/
onMounted(async () => {
await getList()
+ // 获取预测项类型列表
+ itemTypeList.value = await MmItemType.getItemTypeList()
})
</script>
--
Gitblit v1.9.3