From 533610403a4640268fa0feb54203aa32a72678b6 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 27 十一月 2024 16:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/point/index.vue | 132 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 16 deletions(-)
diff --git a/src/views/data/point/index.vue b/src/views/data/point/index.vue
index a7e20cf..5d63b34 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,7 +32,7 @@
placeholder="请输入测点Tag"
clearable
@keyup.enter="handleQuery"
- class="!w-240px"
+ class="!w-200px"
/>
</el-form-item>
<el-form-item>
@@ -53,15 +53,47 @@
<Icon icon="ep:plus" class="mr-5px" />
新增
</el-button>
+ <el-button
+ type="warning"
+ plain
+ @click="handleImport"
+ v-hasPermi="['data:point:import']"
+ >
+ <Icon icon="ep:upload" /> 导入
+ </el-button>
+ <el-button
+ type="success"
+ plain
+ @click="handleExport"
+ :loading="exportLoading"
+ v-hasPermi="['data:point:export']"
+ >
+ <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="110" 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" width="50"/>
+ <el-table-column fixed label="测点编码" header-align="center" align="left" min-width="130" prop="pointNo" />
+ <el-table-column label="测点名称" header-align="center" align="left" min-width="220" 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" />
@@ -74,35 +106,38 @@
</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="100"/>
+ <el-table-column label="测量单位" align="center" prop="unit" width="80"/>
<el-table-column label="单位转换" align="center" prop="unittransfactor" />
- <el-table-column label="默认值" align="center" prop="defaultValue" />
+ <el-table-column label="默认值" align="center" prop="defaultValue" width="100"/>
<el-table-column label="采集频率" align="center" prop="minfreqid" width="100"/>
- <el-table-column label="数据源类型" align="center" prop="sourceType" width="100"/>
- <el-table-column label="数据源名称" align="center" prop="sourceName" width="100"/>
+ <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="是否启用" 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="110" fixed="right" width="120">
+ <el-table-column label="操作" align="center" min-width="130" fixed="right" width="120">
<template #default="scope">
<el-button
link
+ size="mini"
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['data:point:update']"
>
编辑
</el-button>
+ <el-button link size="mini" type="primary" @click="chartHandle(scope.row)">数据</el-button>
<el-button
link
+ size="mini"
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['data:point:delete']"
@@ -124,11 +159,20 @@
<!-- 表单弹窗：添加/修改 -->
<DaPointForm ref="formRef" @success="getList" />
+ <DaPointChart ref="chartView" />
+
+ <!-- 用户导入对话框 -->
+ <PointImportForm ref="importFormRef" @success="getList" />
</template>
<script lang="ts" setup>
-import DaPointForm from './DaPointForm.vue'
import * as DaPoint from '@/api/data/da/point'
-import {DICT_TYPE} from "@/utils/dict";
+import {ref, reactive} from "vue";
+import download from "@/utils/download";
+import {DICT_TYPE, getDictOptions} 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'})
@@ -146,7 +190,6 @@
tagNo: undefined,
})
const queryFormRef = ref() // 搜索的表单
- const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
@@ -164,6 +207,12 @@
const handleQuery = () => {
queryParams.pageNo = 1
getList()
+ }
+
+ /** 查看数据操作 */
+ const chartView = ref()
+ const chartHandle = (raw: object) => {
+ chartView.value.open(raw)
}
/** 重置按钮操作 */
@@ -191,6 +240,57 @@
} catch {
}
}
+ /** 测点导入 */
+ const importFormRef = ref()
+ const handleImport = () => {
+ importFormRef.value.open()
+ }
+
+ /** 导出按钮操作 */
+ const exportLoading = ref(false)
+ const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await DaPoint.exportDaPoint(queryParams)
+ download.excel(data, '测点列表.xlsx')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+ }
+
+ let dataListSelections = reactive([])
+ // 多选
+ function selectionChangeHandle (val) {
+ dataListSelections = val
+ }
+ // 启用
+ async function enable() {
+ let ids = dataListSelections.map(item => {
+ return item.id
+ })
+ // 启用的二次确认
+ await message.enableConfirm(ids)
+
+ await DaPoint.enable(ids)
+ message.success(t('common.enableSuccess'))
+ await getList()
+ }
+ // 禁用
+ async function disable(){
+ let ids = dataListSelections.map(item => {
+ return item.id
+ })
+ // 启用的二次确认
+ await message.disableConfirm(ids,)
+
+ await DaPoint.disable(ids)
+ message.success(t('common.disableSuccess'))
+ await getList()
+ }
/** 初始化 **/
onMounted(async () => {
--
Gitblit v1.9.3