From ae52f9a7cca3ebe8803f720e5891a696714347db Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 04 十一月 2025 13:04:16 +0800
Subject: [PATCH] 基础数据产品-整改清单中，新增按照任意时段和区县进行统计的功能
---
src/views/fysp/data-product/components/ProdQueryOptCompare.vue | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/views/fysp/data-product/components/ProdQueryOptCompare.vue b/src/views/fysp/data-product/components/ProdQueryOptCompare.vue
index 0935f07..285fa87 100644
--- a/src/views/fysp/data-product/components/ProdQueryOptCompare.vue
+++ b/src/views/fysp/data-product/components/ProdQueryOptCompare.vue
@@ -3,17 +3,31 @@
<template #header>
<div><el-text tag="b" size="large">浜у搧鐢熸垚閫夐」</el-text></div>
</template>
- <el-form :inline="true" :model="formSearch">
- <FYOptionTopTask v-model:value="formSearch.topTask"></FYOptionTopTask>
- <FYOptionScene
- :allOption="false"
- :type="2"
- v-model:value="formSearch.scenetype"
- ></FYOptionScene>
- </el-form>
- <el-form :inline="true" :model="formSearch2">
- <FYOptionTopTask v-model:value="formSearch2.topTask"></FYOptionTopTask>
- </el-form>
+ <el-space fill>
+ <el-alert type="info" show-icon :closable="false">
+ <p>閫夋嫨鏈湡闇�瑕佺粺璁＄殑鎬讳换鍔″拰鍦烘櫙绫诲瀷</p>
+ </el-alert>
+ <el-form :inline="true" :model="formSearch">
+ <FYOptionTopTask v-model:value="formSearch.topTask"></FYOptionTopTask>
+ <FYOptionScene
+ :allOption="false"
+ :type="2"
+ v-model:value="formSearch.scenetype"
+ ></FYOptionScene>
+ </el-form>
+ </el-space>
+
+ <el-space fill>
+ <el-alert type="info" show-icon :closable="false">
+ <p>閫夋嫨闇�瑕佽繘琛屽姣旂殑鍘嗗彶鐗堟湰</p>
+ </el-alert>
+ <el-form :inline="true" :model="formSearch2">
+ <FYOptionTopTask
+ :beforeTask="formSearch.topTask"
+ v-model:value="formSearch2.topTask"
+ ></FYOptionTopTask>
+ </el-form>
+ </el-space>
<template #footer>
<el-row v-show="active" justify="end">
<el-button
@@ -68,8 +82,7 @@
'YYYY-MM-DD HH:mm:ss'
),
endTime: dayjs(formSearch.value.topTask.endtime)
- .add(1, 'day')
- .add(-1, 'second')
+ .endOf('day')
.format('YYYY-MM-DD HH:mm:ss'),
sceneTypeId: formSearch.value.scenetype.value,
sceneTypeName: formSearch.value.scenetype.label,
@@ -90,8 +103,7 @@
'YYYY-MM-DD HH:mm:ss'
),
endTime: dayjs(formSearch2.value.topTask.endtime)
- .add(1, 'day')
- .add(-1, 'second')
+ .endOf('day')
.format('YYYY-MM-DD HH:mm:ss'),
sceneTypeId: formSearch.value.scenetype.value,
sceneTypeName: formSearch.value.scenetype.label,
--
Gitblit v1.9.3