From 90b99bc34954476d6ccd56296800c86af754edcc Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 12 十二月 2024 10:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/index.vue | 21 +++++-----
src/api/data/da/point/index.ts | 5 ++
src/api/model/pre/item/index.ts | 1
src/views/model/mpk/file/index.vue | 17 ++++++--
src/views/data/point/DaPointForm.vue | 17 +++++++-
5 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/src/api/data/da/point/index.ts b/src/api/data/da/point/index.ts
index 366f331..3d48aa6 100644
--- a/src/api/data/da/point/index.ts
+++ b/src/api/data/da/point/index.ts
@@ -34,6 +34,11 @@
return request.get({ url: '/data/da/point/list', params })
}
+// 查询DaPoint simpleList
+export const getPointSimpleList = (params: DaPointPageReqVO) => {
+ return request.get({ url: '/data/da/point/simple-list', params })
+}
+
// 查询DaPoint详情
export const getDaPoint = (id: number) => {
return request.get({ url: `/data/da/point/info/${id}`})
diff --git a/src/api/model/pre/item/index.ts b/src/api/model/pre/item/index.ts
index e27d8c4..9856eac 100644
--- a/src/api/model/pre/item/index.ts
+++ b/src/api/model/pre/item/index.ts
@@ -69,6 +69,7 @@
export interface MmPredictItemPageReqVO extends PageParam {
itemno?: string,
itemname?: string,
+ modulename?: string,
}
// 查询MmPredictItem列表
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index 12536e0..5a1682b 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/src/views/data/point/DaPointForm.vue
@@ -292,7 +292,7 @@
filterable
placeholder="请选择">
<el-option
- v-for="(item, index) in pointList"
+ v-for="(item, index) in pointList2"
:key="index"
:label="item.pointName"
:value="item.pointNo"/>
@@ -326,6 +326,7 @@
import * as DaPoint from '@/api/data/da/point'
import * as TagApi from '@/api/data/channel/tag'
import {DICT_TYPE, getDictOptions, getIntDictOptions} from "@/utils/dict";
+import {getPointSimpleList} from "@/api/data/da/point";
defineOptions({name: 'DataDaPointForm'})
@@ -343,6 +344,13 @@
}])
const queryParams = reactive({
pointTypes: "MEASURE,CONSTANT",
+})
+const pointList2 = ref([{
+ pointName: '',
+ pointNo: ''
+}])
+const queryParams2 = reactive({
+ pointTypes: "MEASURE,CONSTANT,CALCULATE",
})
const operatorList = ref(['+', '-', '*', '/', '&', '|', '!', '>', '<'])
const formData = ref({
@@ -405,6 +413,7 @@
resetForm()
getSourceOption()
getPointList()
+ getPointList2()
// 修改时，设置数据
if (id) {
formLoading.value = true
@@ -574,7 +583,11 @@
}
const getPointList = async () => {
- pointList.value = await DaPoint.getPointList(queryParams)
+ pointList.value = await DaPoint.getPointSimpleList(queryParams)
+}
+
+const getPointList2 = async () => {
+ pointList2.value = await DaPoint.getPointSimpleList(queryParams2)
}
const getInfo = async (id) => {
diff --git a/src/views/model/mpk/file/index.vue b/src/views/model/mpk/file/index.vue
index 666a1f4..a3d2bde 100644
--- a/src/views/model/mpk/file/index.vue
+++ b/src/views/model/mpk/file/index.vue
@@ -24,10 +24,18 @@
label-width="68px"
@submit.prevent
>
- <el-form-item label="模型名称" prop="pyName">
+ <el-form-item label="模型名称" prop="pyChineseName">
+ <el-input
+ v-model="queryParams.pyChineseName"
+ placeholder="请输入模型名称"
+ clearable
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="模型文件" prop="pyName">
<el-input
v-model="queryParams.pyName"
- placeholder="请输入模型名称"
+ placeholder="请输入模型文件名称"
clearable
class="!w-240px"
/>
@@ -59,8 +67,8 @@
:data="list"
row-key="id"
>
- <el-table-column prop="pyChineseName" label="模型名称" header-align="center" align="center" min-width="100" />
- <el-table-column prop="pyName" label="模型文件" header-align="center" align="center" min-width="300"/>
+ <el-table-column prop="pyChineseName" label="模型名称" header-align="center" align="left" min-width="100" />
+ <el-table-column prop="pyName" label="模型文件" header-align="center" align="left" min-width="300"/>
<el-table-column prop="pyType" label="模型类型" :formatter="(r,c,v) => getDictLabel(DICT_TYPE.MODEL_TYPE,v)"/>
<el-table-column prop="menuName" label="所属菜单" min-width="120px"/>
<el-table-column prop="groupName" label="所属组" min-width="120px"/>
@@ -148,6 +156,7 @@
const queryParams = reactive({
page: 1,
limit: 10,
+ pyChineseName: '',
pyName: '',
label: ''
})
diff --git a/src/views/model/pre/item/index.vue b/src/views/model/pre/item/index.vue
index 185ec8b..0d2e89f 100644
--- a/src/views/model/pre/item/index.vue
+++ b/src/views/model/pre/item/index.vue
@@ -27,6 +27,15 @@
class="!w-240px"
/>
</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 +75,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" />
@@ -147,6 +147,7 @@
pageSize: 10,
itemno: undefined,
itemname: undefined,
+ modulename: undefined,
})
const isList = ref([
{
--
Gitblit v1.9.3