From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/arc/ArcData.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/data/arc/ArcData.vue b/src/views/data/arc/ArcData.vue
index 3e769da..31400a9 100644
--- a/src/views/data/arc/ArcData.vue
+++ b/src/views/data/arc/ArcData.vue
@@ -1,7 +1,7 @@
<template>
<el-drawer
v-model="drawer"
- size="60%"
+ size="50%"
title="归档数据"
:direction="direction"
:before-close="handleClose"
@@ -21,7 +21,7 @@
format="YYYY-MM-DD HH:mm:00"
value-format="YYYY-MM-DD HH:mm:00"
type="datetime"
- :clearable="false"
+ :clearable="true"
placeholder="选择日期时间"/>
</el-form-item>
<el-form-item label="结束时间">
@@ -30,7 +30,7 @@
format="YYYY-MM-DD HH:mm:00"
value-format="YYYY-MM-DD HH:mm:00"
type="datetime"
- :clearable="false"
+ :clearable="true"
placeholder="选择日期时间"/>
</el-form-item>
<el-form-item>
@@ -42,7 +42,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column
- prop="value"
+ prop="arcValue"
label="数据值"
header-align="center"
align="center"
@@ -93,7 +93,7 @@
pageSize: 10,
arcId:undefined,
startTime: undefined,
- endTime: getYMDHM0(new Date()),
+ endTime: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
@@ -139,7 +139,7 @@
queryParams.pageSize = 10
queryParams.arcId = ''
queryParams.startTime = ''
- queryParams.endTime = getYMDHM0(new Date())
+ queryParams.endTime = ''
}
const handleClose = (done: () => void) => {
--
Gitblit v1.9.3