From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/deepanalysis/deepAnalysis.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
index 13b56e8..24eeeae 100644
--- a/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
+++ b/zhitan-vue/src/views/deepanalysis/deepAnalysis.vue
@@ -18,15 +18,23 @@
</el-select>
</el-form-item>
<el-form-item label="鏃堕棿閫夋嫨" prop="dataTime">
- <el-date-picker v-if="form.timeType == 'YEAR'" v-model="form.dataTime" type="year" />
+ <el-date-picker v-if="form.timeType == 'YEAR'" v-model="form.dataTime" type="year" :clearable="false" />
<el-date-picker
v-else-if="form.timeType == 'MONTH'"
v-model="form.dataTime"
type="month"
format="YYYY-MM"
value-format="YYYY-MM"
+ :clearable="false"
/>
- <el-date-picker v-else v-model="form.dataTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+ <el-date-picker
+ v-else
+ v-model="form.dataTime"
+ :clearable="false"
+ type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -141,7 +149,8 @@
getFlowCharts({
energyType: form.value.energyType,
nodeId: "",
- queryTime: form.value.dataTime,
+ queryTime: proxy.dayjs(new Date(form.value.dataTime)).format("YYYY-MM-DD"),
+ dataTime: proxy.dayjs(new Date(form.value.dataTime)).format("YYYY-MM-DD"),
timeType: form.value.timeType,
modelCode: proxy.$route.query.modelCode,
}).then((res) => {
@@ -298,6 +307,7 @@
display: flex;
justify-content: space-between;
padding-top: 12px;
+ padding: 12px 14px 0;
.card-list-item {
width: 24%;
@@ -365,6 +375,7 @@
display: flex;
justify-content: space-between;
padding-top: 12px;
+ padding: 12px 14px 0;
.card-list-item {
width: 24%;
--
Gitblit v1.9.3