From d5207d8eaff6188ae0d79c07de17d0b8dbaed65a Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 06 一月 2025 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/index.vue | 90 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 11 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index af108ba..b11294c 100644
--- a/src/views/data/point/index.vue
+++ b/src/views/data/point/index.vue
@@ -14,7 +14,7 @@
placeholder="请输入测点编码"
clearable
@keyup.enter="handleQuery"
- class="!w-240px"
+ class="!w-200px"
/>
</el-form-item>
<el-form-item label="测点名称" prop="pointName">
@@ -23,7 +23,7 @@
placeholder="请输入测点名称"
clearable
@keyup.enter="handleQuery"
- class="!w-240px"
+ class="!w-200px"
/>
</el-form-item>
<el-form-item label="测点Tag" prop="tagNo">
@@ -32,8 +32,23 @@
placeholder="请输入测点Tag"
clearable
@keyup.enter="handleQuery"
- class="!w-240px"
+ class="!w-200px"
/>
+ </el-form-item>
+ <el-form-item label="采集质量" prop="collectQuality">
+ <el-select
+ v-model="queryParams.collectQuality"
+ placeholder="请选择"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.DATA_QUALITY)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
@@ -70,15 +85,30 @@
>
<Icon icon="ep:download" />导出
</el-button>
+ <el-button
+ type="success"
+ plain
+ @click="enable"
+ v-hasPermi="['data:point:update']"
+ >启用
+ </el-button>
+ <el-button
+ type="danger"
+ plain
+ @click="disable"
+ v-hasPermi="['data:point:update']"
+ >禁用
+ </el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
- <el-table border stripe v-loading="loading" :data="list">
- <el-table-column fixed label="测点编码" header-align="center" align="left" min-width="120" prop="pointNo" />
- <el-table-column label="测点名称" header-align="center" align="left" min-width="200" prop="pointName" />
+ <el-table border stripe v-loading="loading" :data="list" @selection-change="selectionChangeHandle">
+ <el-table-column type="selection" header-align="center" align="center" fixed="left" width="50"/>
+ <el-table-column fixed label="测点编码" header-align="center" align="left" min-width="130" prop="pointNo" />
+ <el-table-column fixed label="测点名称" header-align="center" align="left" min-width="240" prop="pointName" />
<el-table-column label="测点类型" align="center" prop="pointType" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.DATA_POINT_TYPE" :value="scope.row.pointType" />
@@ -91,7 +121,7 @@
</el-table-column>
<el-table-column label="值类型" align="center" prop="valueType" width="120">
<template #default="scope">
- <dict-tag :type="DICT_TYPE.VALUETYPE" :value="scope.row.valueType" />
+ <dict-tag :type="DICT_TYPE.MEASURE_VALUE_TYPE" :value="scope.row.valueType" />
</template>
</el-table-column>
<el-table-column label="测量单位" align="center" prop="unit" width="80"/>
@@ -101,14 +131,21 @@
<el-table-column label="数据源类型" align="center" prop="sourceType" min-width="100"/>
<el-table-column label="数据源名称" align="center" prop="sourceName" min-width="100"/>
<el-table-column label="测点Tag" header-align="center" align="left" prop="tagNo" min-width="150"/>
- <el-table-column label="是否启用" align="center" prop="isEnable" width="100">
+ <el-table-column label="采集质量" header-align="center" align="center" prop="collectQuality" width="100">
+ <template #default="scope">
+ <el-tag v-if="scope.row.collectQuality === 'Good'" size="small" type="success">{{scope.row.collectQuality}}</el-tag>
+ <el-tag v-if="scope.row.collectQuality === 'Bad'" size="small" type="danger">{{scope.row.collectQuality}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="采集时间" header-align="center" align="center" prop="collectTime" min-width="150"/>
+ <el-table-column label="是否启用" align="center" prop="isEnable" width="85">
<template #default="scope">
<el-tag v-if="scope.row.isEnable === 1" size="small">是</el-tag>
<el-tag v-else size="small" type="danger">否</el-tag>
</template>
</el-table-column>
- <el-table-column label="操作" align="center" min-width="130" fixed="right" width="160">
+ <el-table-column label="操作" align="center" min-width="130" fixed="right" width="120">
<template #default="scope">
<el-button
link
@@ -151,12 +188,13 @@
</template>
<script lang="ts" setup>
import * as DaPoint from '@/api/data/da/point'
-import {ref} from "vue";
+import {ref, reactive} from "vue";
import download from "@/utils/download";
-import {DICT_TYPE, getDictOptions} from "@/utils/dict";
+import {DICT_TYPE, getDictOptions, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
import DaPointForm from './DaPointForm.vue'
import DaPointChart from './DaPointChart.vue'
import * as UserApi from "@/api/system/user";
+import PointImportForm from './PointImportForm.vue'
defineOptions({name: 'DataPoint'})
@@ -172,6 +210,7 @@
pointNo: undefined,
pointName: undefined,
tagNo: undefined,
+ collectQuality: undefined,
})
const queryFormRef = ref() // 搜索的表单
@@ -245,6 +284,35 @@
exportLoading.value = false
}
}
+
+ let dataListSelections = reactive([])
+ // 多选
+ function selectionChangeHandle (val) {
+ dataListSelections = val
+ }
+ // 启用
+ async function enable() {
+ let ids = dataListSelections.map(item => {
+ return item.id
+ })
+ // 二次确认
+ await message.confirm('确认要开启所选测点？')
+ await DaPoint.enable(ids)
+ message.success(t('common.enableSuccess'))
+ await getList()
+ }
+ // 禁用
+ async function disable(){
+ let ids = dataListSelections.map(item => {
+ return item.id
+ })
+ // 二次确认
+ await message.confirm('确认要禁用所选测点？')
+ await DaPoint.disable(ids)
+ message.success(t('common.disableSuccess'))
+ await getList()
+ }
+
/** 初始化 **/
onMounted(async () => {
await getList()
--
Gitblit v1.9.3