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/keyEquipment/monthly/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhitan-vue/src/views/keyEquipment/monthly/index.vue b/zhitan-vue/src/views/keyEquipment/monthly/index.vue
index af4344b..596993d 100644
--- a/zhitan-vue/src/views/keyEquipment/monthly/index.vue
+++ b/zhitan-vue/src/views/keyEquipment/monthly/index.vue
@@ -18,7 +18,7 @@
v-model="queryParams.dataTime"
type="month"
:clearable="false"
- value-format="yyyy-MM"
+ value-format="YYYY-MM"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
--
Gitblit v1.9.3