1
0
forked from dyf/dyf-vue-ui

merge upstream

This commit is contained in:
2025-09-18 11:29:07 +08:00

View File

@ -101,13 +101,13 @@
<span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span> <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
</template> </template>
</div> </div>
<div class="label">报警地点</div> <div class="label">报警地点</div>
<div class="alearmADD"> <div class="alearmADD">
{{ item.location }} {{ item.location }}
</div> </div>
<div v-if="item.treatmentState === 0" class="dl_bot d_fl"> <div v-if="item.treatmentState === 0" class="dl_bot d_fl">
<div>时长:{{ item.durationTime }}</div> <div v-if="item.durationTime">时长:{{ item.durationTime }}</div>
<div>解除: {{ item.finishTime.split(' ')[1] || '' }}</div> <div v-if="item.finishTime">解除: {{ item.finishTime.split(' ')[1] || '' }}</div>
</div> </div>
</div> </div>
</el-card> </el-card>
@ -219,8 +219,11 @@ const getList = async () => {
queryTime2: endTime queryTime2: endTime
}; };
const res = await listAlarm(queryParams.value); const res = await listAlarm(queryParams.value);
alarmList.value = res.rows; if (res.rows) {
total.value = res.total; alarmList.value = res.rows;
total.value = res.total;
}
loading.value = false; loading.value = false;
} }
// 设备类型 // 设备类型
@ -258,7 +261,7 @@ const handleQuery = () => {
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
dateRange.value = ['', '']; dateRange.value = ['', ''];
queryFormRef.value?.resetFields(); queryFormRef.value?.resetFields();
handleQuery(); handleQuery();
} }
@ -268,9 +271,10 @@ onMounted(() => {
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep .el-collapse{ :deep .el-collapse {
border-top:none border-top: none
} }
:deep .el-collapse-item__header { :deep .el-collapse-item__header {
display: none; display: none;
} }