Commit 7b6ec82253e0db843625d561a9b07ecff5160d47
Merge branch 'fix/DEFECT-1844' into 'main_dev'
fix: 修复告警列表设置滚动停留时间无效 See merge request yunteng/thingskit-scada!203
Showing
1 changed file
with
4 additions
and
4 deletions
@@ -53,7 +53,7 @@ const initFetchAlarmList = async () => { | @@ -53,7 +53,7 @@ const initFetchAlarmList = async () => { | ||
53 | })) | 53 | })) |
54 | 54 | ||
55 | initOptions.alarmList = resp.items || [] | 55 | initOptions.alarmList = resp.items || [] |
56 | - initOptions.interval = interval || 0 | 56 | + initOptions.interval = interval * 1000 || 0 |
57 | initOptions.scroll = autoPlay || false | 57 | initOptions.scroll = autoPlay || false |
58 | initOptions.polling = polling || 30 | 58 | initOptions.polling = polling || 30 |
59 | } | 59 | } |
@@ -87,10 +87,10 @@ onMounted(async () => { | @@ -87,10 +87,10 @@ onMounted(async () => { | ||
87 | <div class="seamless-scroll w-full h-full flex justify-center items-center overflow-y-scroll"> | 87 | <div class="seamless-scroll w-full h-full flex justify-center items-center overflow-y-scroll"> |
88 | <ScrollList | 88 | <ScrollList |
89 | v-if="initOptions.alarmList.length" | 89 | v-if="initOptions.alarmList.length" |
90 | - v-model="initOptions.scroll" :single-wait-time="initOptions.interval" :list="initOptions.alarmList" | ||
91 | - :is-rem-unit="true" :delay="10" :wheel="true" hover | 90 | + v-model="initOptions.scroll" :single-wait-time="initOptions.interval" :single-height="58" :list="initOptions.alarmList" |
91 | + :delay="10" hover | ||
92 | > | 92 | > |
93 | - <div v-for="(item, index) in initOptions.alarmList" :key="index" class="flex flex-col items-start p-2 border-gray-600 border-b border-solid border-t-transparent border-l-transparent border-r-transparent"> | 93 | + <div v-for="(item, index) in initOptions.alarmList" :key="index" class="flex flex-col items-start p-2 border-gray-600 border-t border-solid border-b-transparent border-l-transparent border-r-transparent"> |
94 | <div class="text-xs mb-2"> | 94 | <div class="text-xs mb-2"> |
95 | <span>设备:</span> | 95 | <span>设备:</span> |
96 | <span class="ml-1">{{ item.deviceAlias || item.deviceName }}</span> | 96 | <span class="ml-1">{{ item.deviceAlias || item.deviceName }}</span> |