From eeddc808a8d6428bfd1c2d6e21e4a71f5e9bdbef Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 13 十二月 2024 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/index.vue | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/views/model/pre/item/index.vue b/src/views/model/pre/item/index.vue
index 185ec8b..c1b6f60 100644
--- a/src/views/model/pre/item/index.vue
+++ b/src/views/model/pre/item/index.vue
@@ -27,6 +27,28 @@
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"
+ />
+ </el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px"/>
@@ -66,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" />
@@ -131,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";
@@ -139,6 +153,7 @@
const message = useMessage() // 消息弹窗
const {t} = useI18n() // 国际化
+const itemTypeList = ref([])
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
@@ -147,6 +162,8 @@
pageSize: 10,
itemno: undefined,
itemname: undefined,
+ itemtypeid: undefined,
+ modulename: undefined,
})
const isList = ref([
{
@@ -213,5 +230,7 @@
/** 初始化 **/
onMounted(async () => {
await getList()
+ // 获取预测项类型列表
+ itemTypeList.value = await MmItemType.getItemTypeList()
})
</script>
--
Gitblit v1.9.3