From cad872748998544099f55750b4ec20a1604c9953 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 18 十一月 2024 08:44:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/channel/opcua/tag/index.vue | 6 ++++++
src/views/model/pre/item/MmPredictItemChart.vue | 8 ++++----
src/api/model/mcs/index.ts | 4 ++++
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/api/model/mcs/index.ts b/src/api/model/mcs/index.ts
index 503dcf4..4f55207 100644
--- a/src/api/model/mcs/index.ts
+++ b/src/api/model/mcs/index.ts
@@ -24,3 +24,7 @@
export const getPreDataItemChart = (data: PreDataItemChartReqVO) => {
return request.post({ url: '/model/api/mcs/predict-data/item-chart', data })
}
+
+export const exportPredictValue = (params) => {
+ return request.download({ url: '/model/api/mcs/predict-data/exportValue', params })
+}
diff --git a/src/views/data/channel/opcua/tag/index.vue b/src/views/data/channel/opcua/tag/index.vue
index 524f4b5..21937ef 100644
--- a/src/views/data/channel/opcua/tag/index.vue
+++ b/src/views/data/channel/opcua/tag/index.vue
@@ -67,6 +67,12 @@
<Icon icon="ep:download" />导出
</el-button>
</el-form-item>
+ <el-form-item label="更新当前值" label-width="100px">
+ <el-switch
+ v-model="queryParams.currentValue"
+ active-color="#13ce66"
+ inactive-color="#ff4949"/>
+ </el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
diff --git a/src/views/model/pre/item/MmPredictItemChart.vue b/src/views/model/pre/item/MmPredictItemChart.vue
index 3fd55b5..b4dca60 100644
--- a/src/views/model/pre/item/MmPredictItemChart.vue
+++ b/src/views/model/pre/item/MmPredictItemChart.vue
@@ -217,15 +217,15 @@
const exportLoading = ref(false)
const handleExport = async () => {
chartParams.itemId = dataForm.value.id;
- chartParams.startTime = dataForm.value.startTime;
- chartParams.endTime = dataForm.value.endTime;
+ chartParams.startTime = dataForm.value.startTime?dataForm.value.startTime:"";
+ chartParams.endTime = dataForm.value.endTime?dataForm.value.endTime:"";
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
- /*const data = await DaPoint.exportDaPointValue(chartParams)
- download.excel(data, dataForm.value.pointName + '.xls')*/
+ const data = await McsApi.exportPredictValue(chartParams)
+ download.excel(data, dataForm.value.itemName + '.xls')
} catch {
} finally {
exportLoading.value = false
--
Gitblit v1.9.3