diff --git a/src/router/routes.ts b/src/router/routes.ts
index 544bbfd..ede603b 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -31,7 +31,7 @@
   {
     path: "/logs",
     name: "Logs",
-    component: () => import('../views/user/logs/index.vue'), // 用户-日志
+    component: () => import('../views/user/deviceLogs/index.vue'), // 用户-日志
   },
   {
     path: "/monitor",

diff --git a/src/router/routes.ts b/src/router/routes.ts
index 544bbfd..ede603b 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -31,7 +31,7 @@
   {
     path: "/logs",
     name: "Logs",
-    component: () => import('../views/user/logs/index.vue'), // 用户-日志
+    component: () => import('../views/user/deviceLogs/index.vue'), // 用户-日志
   },
   {
     path: "/monitor",
diff --git a/src/views/user/deviceLogs/index.vue b/src/views/user/deviceLogs/index.vue
new file mode 100644
index 0000000..f8edabe
--- /dev/null
+++ b/src/views/user/deviceLogs/index.vue
@@ -0,0 +1,78 @@
+<!-- 用户-日志列表 -->
+<template>
+    <NavBar title="日志" />
+    <div class="container">
+        <div class="alarm" v-for="(item, index) in alarmList" :key="index">
+         <p class="time">{{ item.logtimeStr }}</p>
+         <p class="status" :style="`color:${item.descn.includes('正常')  ?  '#ccc' : '#F5193E'}`">{{ item.descn }}</p>
+        </div>
+        <t-loading theme="dots" size="40px" layout="vertical" :loading="showLoading" />
+    <t-loading size="40px" layout="vertical" :indicator="false" text="没有更多啦" :loading="!showLoading" />
+    </div>
+    <t-back-top v-show="backTopVisible" text="顶部" theme="round" />
+  </template>
+  <script lang="ts" name="Home" setup>
+  import NavBar from "../../../components/navBar/navBar.vue";
+  import { getDeviceLogs } from '../../../api/user'
+  const backTopVisible = ref(false); // 回到顶部显隐
+  const showLoading = ref(true)
+  const listQuery = ref({
+    pageNo:1,
+    pageSize:20
+  })
+  const total = ref(0)
+  // 监听页面滚动
+  window.onscroll = function () {
+    if (window.scrollY > 200) {
+      //scrollY距离顶部的距离
+      backTopVisible.value = true;
+    } else {
+      backTopVisible.value = false;
+    }
+    //变量windowHeight是可视区的高度
+  const windowHeight = document.body.clientHeight;
+  //变量scrollHeight是滚动条的总高度
+  const scrollHeight = document.body.scrollHeight;
+  //滚动条到底部的条件
+  console.log(window.scrollY, windowHeight, scrollHeight - 60);
+  
+  if (Number(window.scrollY) + windowHeight >= scrollHeight - 60) {
+    showLoading.value = true
+    onBottom()
+  }
+  };
+
+  // 获取日志列表
+const alarmList = ref<any[]>([])
+const getLogsList = () => {
+  showLoading.value = true
+  getDeviceLogs(listQuery.value).then(res => {
+    alarmList.value = alarmList.value.concat(res.data.records)
+    total.value = res.data.total
+    showLoading.value = false
+  })
+}
+  function onBottom() { // 触底加载
+  if ((listQuery.value.pageNo * listQuery.value.pageSize) < total.value) {
+    listQuery.value.pageNo++
+    getLogsList()
+  } 
+}
+
+  onMounted(() => {
+    getLogsList()
+  });
+  </script>
+  <style lang="scss" scoped>
+  .container{
+    padding-top: 58px;
+    background-color: #fff;
+    .alarm{
+        display: flex;
+        justify-content: space-between;
+        padding: 10px 20px;
+        font-size: 18px;
+    }
+  }
+  </style>
+  
\ No newline at end of file