diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
new file mode 100644
index 0000000..f11d959
--- /dev/null
+++ b/src/views/home/pipeline/components/map.vue
@@ -0,0 +1,237 @@
+<!--
+  Description: 闸井监测-地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="WellMap">
+import detailInfo from './detailInfoDialog.vue'
+import AMap from '@/components/map/index.vue'
+
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+// 地图实例
+const mapRef = ref()
+const publicPath = window.location.origin
+// console.log(publicPath, 'publicPath')
+// 展示图例数据
+const legendShowData = ref(['1', '2', '3', '0'])
+// 地图图例数据
+const legendData = ref([
+  {
+    name: '正常',
+    url: `${publicPath}/image/station/场站-正常.png`,
+    value: '1',
+  },
+  {
+    name: '异常',
+    url: `${publicPath}/image/station/场站-异常.png`,
+    value: '2',
+  },
+  {
+    name: '离线',
+    url: `${publicPath}/image/station/场站-离线.png`,
+    value: '3',
+  },
+  {
+    name: '未监控',
+    url: `${publicPath}/image/station/场站-未部署.png`,
+    value: '0',
+  },
+])
+// 控制图例
+const clickLegend = (type: string) => {
+  if (legendShowData.value.includes(type)) {
+    legendShowData.value = legendShowData.value.filter((item: string) => item !== type)
+  }
+  else {
+    legendShowData.value.push(type)
+  }
+  resetDraw()
+}
+// 初次加载标识
+const pageIsFirst = ref(true)
+// 绘制标记点
+const drawMarker = () => {
+  const style = [
+    {
+      url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+  ]
+  // （0：未监控，1：正常，2：异常，3：离线）
+  const styleDict = {
+    0: 3,
+    1: 0,
+    2: 1,
+    3: 2,
+  } as { [key: string]: number }
+  const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
+    lnglat: [item.lngGaode, item.latGaode],
+    name: item.ledgerName,
+    style: item.monitorState ? styleDict[item.monitorState] : 3,
+    id: item.id,
+    row: item,
+  }))
+  mapRef.value.addMassMarks({
+    path: data,
+    zIndex: 111,
+    zooms: [3, 20],
+    style,
+  })
+  //
+  if (pageIsFirst.value) {
+    mapRef.value.map.setCenter([116.397428, 39.90923])
+  }
+  else {
+    mapRef.value.map.setFitView()
+  }
+  mapRef.value.map.setZoom(10.5)
+}
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const massMarksClick = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.event.data.lnglat)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: data.event.data,
+    map: mapRef.value.map,
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setZoom(14)
+    mapRef.value.map.setCenter(data.event.data.lnglat)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+    })
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
+function resetDraw() {
+  mapRef.value.removeMassMarks()
+  if (detailRef.value) {
+    detailRef.value.close()
+  }
+  if ($props.data) {
+    // 清空标记点重新绘制
+    drawMarker()
+  }
+}
+// 地图绘制完毕
+const completeMap = () => {
+  console.log('地图绘制完毕')
+  // 绘制海量点
+  resetDraw()
+}
+defineExpose({ openInfoDetail, drawMarker, resetDraw })
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <!-- 地图 -->
+    <a-map ref="mapRef" @complete="completeMap" @massMarksClick="massMarksClick" />
+    <!-- 图例 -->
+    <!-- <div class="legend">
+      <div v-for="item in legendData" :key="item.value" class="legend-item" @click="clickLegend(item.value)">
+        <img v-show="legendShowData.includes(item.value)" class="img" :src="item.url">
+        <span v-show="!legendShowData.includes(item.value)" class="img" />
+        <span>{{ item.name }}</span>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+  position: relative;
+}
+
+.legend {
+  background: rgb(68 66 66 / 20%);
+  position: absolute;
+  z-index: 1;
+  left: 15px;
+  bottom: 10px;
+  padding: 0 10px;
+  border-radius: 8px;
+
+  .legend-item {
+    margin: 5px 0;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+
+    .img {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+</style>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
new file mode 100644
index 0000000..f11d959
--- /dev/null
+++ b/src/views/home/pipeline/components/map.vue
@@ -0,0 +1,237 @@
+<!--
+  Description: 闸井监测-地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="WellMap">
+import detailInfo from './detailInfoDialog.vue'
+import AMap from '@/components/map/index.vue'
+
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+// 地图实例
+const mapRef = ref()
+const publicPath = window.location.origin
+// console.log(publicPath, 'publicPath')
+// 展示图例数据
+const legendShowData = ref(['1', '2', '3', '0'])
+// 地图图例数据
+const legendData = ref([
+  {
+    name: '正常',
+    url: `${publicPath}/image/station/场站-正常.png`,
+    value: '1',
+  },
+  {
+    name: '异常',
+    url: `${publicPath}/image/station/场站-异常.png`,
+    value: '2',
+  },
+  {
+    name: '离线',
+    url: `${publicPath}/image/station/场站-离线.png`,
+    value: '3',
+  },
+  {
+    name: '未监控',
+    url: `${publicPath}/image/station/场站-未部署.png`,
+    value: '0',
+  },
+])
+// 控制图例
+const clickLegend = (type: string) => {
+  if (legendShowData.value.includes(type)) {
+    legendShowData.value = legendShowData.value.filter((item: string) => item !== type)
+  }
+  else {
+    legendShowData.value.push(type)
+  }
+  resetDraw()
+}
+// 初次加载标识
+const pageIsFirst = ref(true)
+// 绘制标记点
+const drawMarker = () => {
+  const style = [
+    {
+      url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+  ]
+  // （0：未监控，1：正常，2：异常，3：离线）
+  const styleDict = {
+    0: 3,
+    1: 0,
+    2: 1,
+    3: 2,
+  } as { [key: string]: number }
+  const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
+    lnglat: [item.lngGaode, item.latGaode],
+    name: item.ledgerName,
+    style: item.monitorState ? styleDict[item.monitorState] : 3,
+    id: item.id,
+    row: item,
+  }))
+  mapRef.value.addMassMarks({
+    path: data,
+    zIndex: 111,
+    zooms: [3, 20],
+    style,
+  })
+  //
+  if (pageIsFirst.value) {
+    mapRef.value.map.setCenter([116.397428, 39.90923])
+  }
+  else {
+    mapRef.value.map.setFitView()
+  }
+  mapRef.value.map.setZoom(10.5)
+}
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const massMarksClick = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.event.data.lnglat)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: data.event.data,
+    map: mapRef.value.map,
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setZoom(14)
+    mapRef.value.map.setCenter(data.event.data.lnglat)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+    })
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
+function resetDraw() {
+  mapRef.value.removeMassMarks()
+  if (detailRef.value) {
+    detailRef.value.close()
+  }
+  if ($props.data) {
+    // 清空标记点重新绘制
+    drawMarker()
+  }
+}
+// 地图绘制完毕
+const completeMap = () => {
+  console.log('地图绘制完毕')
+  // 绘制海量点
+  resetDraw()
+}
+defineExpose({ openInfoDetail, drawMarker, resetDraw })
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <!-- 地图 -->
+    <a-map ref="mapRef" @complete="completeMap" @massMarksClick="massMarksClick" />
+    <!-- 图例 -->
+    <!-- <div class="legend">
+      <div v-for="item in legendData" :key="item.value" class="legend-item" @click="clickLegend(item.value)">
+        <img v-show="legendShowData.includes(item.value)" class="img" :src="item.url">
+        <span v-show="!legendShowData.includes(item.value)" class="img" />
+        <span>{{ item.name }}</span>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+  position: relative;
+}
+
+.legend {
+  background: rgb(68 66 66 / 20%);
+  position: absolute;
+  z-index: 1;
+  left: 15px;
+  bottom: 10px;
+  padding: 0 10px;
+  border-radius: 8px;
+
+  .legend-item {
+    margin: 5px 0;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+
+    .img {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index afa5a3a..9d57f42 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -1,3 +1,340 @@
+<!--
+  Description: 管线监测
+  Author: 李亚光
+  Date: 2023-09-04
+ -->
+<script lang="ts" setup name="WellMonitor">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ArrowUpBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+// import { getStationList, getStationListPage } from '@/api/home/station/station'
+import { getDictByCode } from '@/api/system/dict'
+// 表格标识  地图或普通
+const mapRef = ref()
+const tableFlag = ref('normal')
+const mapLoading = ref(true)
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 地图数据
+const mapList = ref([])
+
+// 初始展示列
+const columns = ref<any>([
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '设备编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '设备类型', value: 'ledgerName', isRequired: true, align: 'center' },
+  { text: '关联管线', value: 'responsibleDeptName', isRequired: true, align: 'center' },
+  { text: '压力级制', value: 'wellTypeName', isRequired: true, align: 'center' },
+  { text: '管径(mm)', value: 'position', align: 'center' },
+  { text: '管材', value: '', isRequired: true, align: 'center' },
+  { text: '建设年代', value: '', align: 'center' },
+  { text: '详细位置', value: 'onStateName', isRequired: true, align: 'center' },
+  { text: '管理单位', value: 'monitorStateName', isRequired: true, align: 'center' },
+  { text: '使用状态', value: 'device', align: 'center', width: '90' },
+  { text: '监控状态', value: 'marker', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  tagNumber: '', // 闸井位号
+  ledgerName: '', // 闸井名称
+  ledgerCode: '', // 闸井编号
+  responsibleDept: '', // 管理单位
+  onState: '', // 使用状态
+  monitorState: '', // 监控状态
+} as { [key: string]: string | number })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  mapLoading.value = true
+  // 判断是否有查询条件(是地图展示20条  否地图展示所有)
+  const queryList = [] as Boolean[] // 长度大于2 即为是
+  for (const i in listQuery.value) {
+    if (listQuery.value[i]) {
+      queryList.push(true)
+    }
+  }
+  // getStationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  //   if (queryList.length > 2) {
+  //     mapList.value = list.value
+  //     setTimeout(() => {
+  //       if (tableFlag.value === 'map') {
+  //         mapRef.value.resetDraw()
+  //       }
+  mapLoading.value = false
+  //     }, 500)
+  //   }
+  // }).catch(() => {
+  //   loadingTable.value = false
+  //   if (queryList.length <= 2) {
+  //     mapLoading.value = false
+  //   }
+  // })
+  // if (queryList.length > 2) { return }
+  // // 获取地图全部数据
+  // getStationList(listQuery.value).then((res) => {
+  //   mapList.value = res.data
+  //   setTimeout(() => {
+  //     if (tableFlag.value === 'map') {
+  //       mapRef.value.resetDraw()
+  //     }
+  //     mapLoading.value = false
+  //   }, 500)
+  // }).catch(() => {
+  //   mapLoading.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    tagNumber: '', // 闸井位号
+    ledgerName: '', // 闸井名称
+    ledgerCode: '', // 闸井编号
+    responsibleDept: '', // 管理单位
+    onState: '', // 使用状态态
+    monitorState: '', // 监控状态
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+// 获取字典
+const wellTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 场站类型
+const onStateList = ref<{ id: string; name: string; value: string }[]>([]) // 使用状态
+const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
+const fetchDict = () => {
+  // 场站类型
+  getDictByCode('wellType').then((res) => {
+    wellTypeList.value = res.data
+  })
+  // 使用状态
+  getDictByCode('onState').then((res) => {
+    onStateList.value = res.data
+  })
+  // 监控状态
+  getDictByCode('monitorState').then((res) => {
+    monitorStateList.value = res.data
+  })
+}
+onMounted(() => {
+  fetchDict()
+  fetchData()
+})
+
+// 切换地图标识
+const switchMode = (type: string) => {
+  tableFlag.value = type
+}
+// 点击数据行
+const rowClick = (data: any) => {
+  if (tableFlag.value === 'normal') { return }
+  if (!data.lngGaode || !data.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  // 打开地图弹窗
+  mapRef.value.openInfoDetail({
+    lnglat: [data.lngGaode, data.latGaode],
+    id: data.id,
+    name: data.ledgerName,
+    row: data,
+  })
+}
+// 查看/编辑
+const $router = useRouter()
+const editRow = (type: string, row: any) => {
+  $router.push({
+    path: `/station/${type}`,
+    query: {
+      id: row.id,
+    },
+  })
+}
+</script>
+
 <template>
-  管线监测
+  <!-- 布局 -->
+  <app-container class="container">
+    <!-- 地图 -->
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="350" :data="mapList" />
+    <!-- 占位-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 350px;" />
+    <!-- 收起地图-图标 -->
+    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
+      <el-icon :size="25">
+        <arrow-up-bold />
+      </el-icon>
+    </div>
+    <!-- 筛选条件 -->
+    <search-area
+      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      @clear="reset"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerCode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="关联管线" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.pipeDiameter1" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+        ~
+        <el-input
+          v-model="listQuery.pipeDiameter2" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.constructEra1" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+        ~
+        <el-input v-model="listQuery.constructEra2" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="安装方式" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="使用状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="监控状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 筛选条件-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 114px;" />
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-left>
+        <!-- 操作 -->
+        <div v-if="tableFlag === 'normal'" style="margin-left: 15px;">
+          <el-button type="primary" plain :disabled="loadingTable" @click="switchMode('map')">
+            切换地图模式
+          </el-button>
+        </div>
+      </template>
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage" @rowClick="rowClick"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="75" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .map {
+    position: fixed;
+    z-index: 99;
+  }
+
+  .icon {
+    position: fixed;
+    top: 450px;
+    left: 50%;
+    // transform: translateX(-50%);
+    z-index: 901;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .search-area {
+    position: fixed;
+    z-index: 99;
+  }
+}
+</style>
+
+<style>
+.select {
+  width: 192px;
+}
+</style>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
new file mode 100644
index 0000000..f11d959
--- /dev/null
+++ b/src/views/home/pipeline/components/map.vue
@@ -0,0 +1,237 @@
+<!--
+  Description: 闸井监测-地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="WellMap">
+import detailInfo from './detailInfoDialog.vue'
+import AMap from '@/components/map/index.vue'
+
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+// 地图实例
+const mapRef = ref()
+const publicPath = window.location.origin
+// console.log(publicPath, 'publicPath')
+// 展示图例数据
+const legendShowData = ref(['1', '2', '3', '0'])
+// 地图图例数据
+const legendData = ref([
+  {
+    name: '正常',
+    url: `${publicPath}/image/station/场站-正常.png`,
+    value: '1',
+  },
+  {
+    name: '异常',
+    url: `${publicPath}/image/station/场站-异常.png`,
+    value: '2',
+  },
+  {
+    name: '离线',
+    url: `${publicPath}/image/station/场站-离线.png`,
+    value: '3',
+  },
+  {
+    name: '未监控',
+    url: `${publicPath}/image/station/场站-未部署.png`,
+    value: '0',
+  },
+])
+// 控制图例
+const clickLegend = (type: string) => {
+  if (legendShowData.value.includes(type)) {
+    legendShowData.value = legendShowData.value.filter((item: string) => item !== type)
+  }
+  else {
+    legendShowData.value.push(type)
+  }
+  resetDraw()
+}
+// 初次加载标识
+const pageIsFirst = ref(true)
+// 绘制标记点
+const drawMarker = () => {
+  const style = [
+    {
+      url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+  ]
+  // （0：未监控，1：正常，2：异常，3：离线）
+  const styleDict = {
+    0: 3,
+    1: 0,
+    2: 1,
+    3: 2,
+  } as { [key: string]: number }
+  const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
+    lnglat: [item.lngGaode, item.latGaode],
+    name: item.ledgerName,
+    style: item.monitorState ? styleDict[item.monitorState] : 3,
+    id: item.id,
+    row: item,
+  }))
+  mapRef.value.addMassMarks({
+    path: data,
+    zIndex: 111,
+    zooms: [3, 20],
+    style,
+  })
+  //
+  if (pageIsFirst.value) {
+    mapRef.value.map.setCenter([116.397428, 39.90923])
+  }
+  else {
+    mapRef.value.map.setFitView()
+  }
+  mapRef.value.map.setZoom(10.5)
+}
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const massMarksClick = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.event.data.lnglat)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: data.event.data,
+    map: mapRef.value.map,
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setZoom(14)
+    mapRef.value.map.setCenter(data.event.data.lnglat)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+    })
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
+function resetDraw() {
+  mapRef.value.removeMassMarks()
+  if (detailRef.value) {
+    detailRef.value.close()
+  }
+  if ($props.data) {
+    // 清空标记点重新绘制
+    drawMarker()
+  }
+}
+// 地图绘制完毕
+const completeMap = () => {
+  console.log('地图绘制完毕')
+  // 绘制海量点
+  resetDraw()
+}
+defineExpose({ openInfoDetail, drawMarker, resetDraw })
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <!-- 地图 -->
+    <a-map ref="mapRef" @complete="completeMap" @massMarksClick="massMarksClick" />
+    <!-- 图例 -->
+    <!-- <div class="legend">
+      <div v-for="item in legendData" :key="item.value" class="legend-item" @click="clickLegend(item.value)">
+        <img v-show="legendShowData.includes(item.value)" class="img" :src="item.url">
+        <span v-show="!legendShowData.includes(item.value)" class="img" />
+        <span>{{ item.name }}</span>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+  position: relative;
+}
+
+.legend {
+  background: rgb(68 66 66 / 20%);
+  position: absolute;
+  z-index: 1;
+  left: 15px;
+  bottom: 10px;
+  padding: 0 10px;
+  border-radius: 8px;
+
+  .legend-item {
+    margin: 5px 0;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+
+    .img {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index afa5a3a..9d57f42 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -1,3 +1,340 @@
+<!--
+  Description: 管线监测
+  Author: 李亚光
+  Date: 2023-09-04
+ -->
+<script lang="ts" setup name="WellMonitor">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ArrowUpBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+// import { getStationList, getStationListPage } from '@/api/home/station/station'
+import { getDictByCode } from '@/api/system/dict'
+// 表格标识  地图或普通
+const mapRef = ref()
+const tableFlag = ref('normal')
+const mapLoading = ref(true)
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 地图数据
+const mapList = ref([])
+
+// 初始展示列
+const columns = ref<any>([
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '设备编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '设备类型', value: 'ledgerName', isRequired: true, align: 'center' },
+  { text: '关联管线', value: 'responsibleDeptName', isRequired: true, align: 'center' },
+  { text: '压力级制', value: 'wellTypeName', isRequired: true, align: 'center' },
+  { text: '管径(mm)', value: 'position', align: 'center' },
+  { text: '管材', value: '', isRequired: true, align: 'center' },
+  { text: '建设年代', value: '', align: 'center' },
+  { text: '详细位置', value: 'onStateName', isRequired: true, align: 'center' },
+  { text: '管理单位', value: 'monitorStateName', isRequired: true, align: 'center' },
+  { text: '使用状态', value: 'device', align: 'center', width: '90' },
+  { text: '监控状态', value: 'marker', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  tagNumber: '', // 闸井位号
+  ledgerName: '', // 闸井名称
+  ledgerCode: '', // 闸井编号
+  responsibleDept: '', // 管理单位
+  onState: '', // 使用状态
+  monitorState: '', // 监控状态
+} as { [key: string]: string | number })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  mapLoading.value = true
+  // 判断是否有查询条件(是地图展示20条  否地图展示所有)
+  const queryList = [] as Boolean[] // 长度大于2 即为是
+  for (const i in listQuery.value) {
+    if (listQuery.value[i]) {
+      queryList.push(true)
+    }
+  }
+  // getStationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  //   if (queryList.length > 2) {
+  //     mapList.value = list.value
+  //     setTimeout(() => {
+  //       if (tableFlag.value === 'map') {
+  //         mapRef.value.resetDraw()
+  //       }
+  mapLoading.value = false
+  //     }, 500)
+  //   }
+  // }).catch(() => {
+  //   loadingTable.value = false
+  //   if (queryList.length <= 2) {
+  //     mapLoading.value = false
+  //   }
+  // })
+  // if (queryList.length > 2) { return }
+  // // 获取地图全部数据
+  // getStationList(listQuery.value).then((res) => {
+  //   mapList.value = res.data
+  //   setTimeout(() => {
+  //     if (tableFlag.value === 'map') {
+  //       mapRef.value.resetDraw()
+  //     }
+  //     mapLoading.value = false
+  //   }, 500)
+  // }).catch(() => {
+  //   mapLoading.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    tagNumber: '', // 闸井位号
+    ledgerName: '', // 闸井名称
+    ledgerCode: '', // 闸井编号
+    responsibleDept: '', // 管理单位
+    onState: '', // 使用状态态
+    monitorState: '', // 监控状态
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+// 获取字典
+const wellTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 场站类型
+const onStateList = ref<{ id: string; name: string; value: string }[]>([]) // 使用状态
+const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
+const fetchDict = () => {
+  // 场站类型
+  getDictByCode('wellType').then((res) => {
+    wellTypeList.value = res.data
+  })
+  // 使用状态
+  getDictByCode('onState').then((res) => {
+    onStateList.value = res.data
+  })
+  // 监控状态
+  getDictByCode('monitorState').then((res) => {
+    monitorStateList.value = res.data
+  })
+}
+onMounted(() => {
+  fetchDict()
+  fetchData()
+})
+
+// 切换地图标识
+const switchMode = (type: string) => {
+  tableFlag.value = type
+}
+// 点击数据行
+const rowClick = (data: any) => {
+  if (tableFlag.value === 'normal') { return }
+  if (!data.lngGaode || !data.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  // 打开地图弹窗
+  mapRef.value.openInfoDetail({
+    lnglat: [data.lngGaode, data.latGaode],
+    id: data.id,
+    name: data.ledgerName,
+    row: data,
+  })
+}
+// 查看/编辑
+const $router = useRouter()
+const editRow = (type: string, row: any) => {
+  $router.push({
+    path: `/station/${type}`,
+    query: {
+      id: row.id,
+    },
+  })
+}
+</script>
+
 <template>
-  管线监测
+  <!-- 布局 -->
+  <app-container class="container">
+    <!-- 地图 -->
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="350" :data="mapList" />
+    <!-- 占位-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 350px;" />
+    <!-- 收起地图-图标 -->
+    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
+      <el-icon :size="25">
+        <arrow-up-bold />
+      </el-icon>
+    </div>
+    <!-- 筛选条件 -->
+    <search-area
+      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      @clear="reset"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerCode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="关联管线" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.pipeDiameter1" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+        ~
+        <el-input
+          v-model="listQuery.pipeDiameter2" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.constructEra1" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+        ~
+        <el-input v-model="listQuery.constructEra2" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="安装方式" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="使用状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="监控状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 筛选条件-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 114px;" />
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-left>
+        <!-- 操作 -->
+        <div v-if="tableFlag === 'normal'" style="margin-left: 15px;">
+          <el-button type="primary" plain :disabled="loadingTable" @click="switchMode('map')">
+            切换地图模式
+          </el-button>
+        </div>
+      </template>
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage" @rowClick="rowClick"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="75" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .map {
+    position: fixed;
+    z-index: 99;
+  }
+
+  .icon {
+    position: fixed;
+    top: 450px;
+    left: 50%;
+    // transform: translateX(-50%);
+    z-index: 901;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .search-area {
+    position: fixed;
+    z-index: 99;
+  }
+}
+</style>
+
+<style>
+.select {
+  width: 192px;
+}
+</style>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index bbd356b..98f2b83 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -1,3 +1,160 @@
+<!--
+  Description: 规则引擎-报警规则管理
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="RuleAlarmManage">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警名称', value: 'deviceTypeName', align: 'center' },
+  { text: '报警等级', value: '', align: 'center' },
+  { text: '报警提示方式', value: '', align: 'center' },
+  { text: '状态', value: '', align: 'center' },
+  { text: '创建时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  报警规则管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="报警名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="报警等级" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="alarm-rule" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            报警类型管理
+          </el-button>
+          <el-button type="primary">
+            报警等级管理
+          </el-button>
+          <el-button type="primary">
+            新增
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small">
+                停用
+              </el-button>
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
new file mode 100644
index 0000000..f11d959
--- /dev/null
+++ b/src/views/home/pipeline/components/map.vue
@@ -0,0 +1,237 @@
+<!--
+  Description: 闸井监测-地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="WellMap">
+import detailInfo from './detailInfoDialog.vue'
+import AMap from '@/components/map/index.vue'
+
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+// 地图实例
+const mapRef = ref()
+const publicPath = window.location.origin
+// console.log(publicPath, 'publicPath')
+// 展示图例数据
+const legendShowData = ref(['1', '2', '3', '0'])
+// 地图图例数据
+const legendData = ref([
+  {
+    name: '正常',
+    url: `${publicPath}/image/station/场站-正常.png`,
+    value: '1',
+  },
+  {
+    name: '异常',
+    url: `${publicPath}/image/station/场站-异常.png`,
+    value: '2',
+  },
+  {
+    name: '离线',
+    url: `${publicPath}/image/station/场站-离线.png`,
+    value: '3',
+  },
+  {
+    name: '未监控',
+    url: `${publicPath}/image/station/场站-未部署.png`,
+    value: '0',
+  },
+])
+// 控制图例
+const clickLegend = (type: string) => {
+  if (legendShowData.value.includes(type)) {
+    legendShowData.value = legendShowData.value.filter((item: string) => item !== type)
+  }
+  else {
+    legendShowData.value.push(type)
+  }
+  resetDraw()
+}
+// 初次加载标识
+const pageIsFirst = ref(true)
+// 绘制标记点
+const drawMarker = () => {
+  const style = [
+    {
+      url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+  ]
+  // （0：未监控，1：正常，2：异常，3：离线）
+  const styleDict = {
+    0: 3,
+    1: 0,
+    2: 1,
+    3: 2,
+  } as { [key: string]: number }
+  const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
+    lnglat: [item.lngGaode, item.latGaode],
+    name: item.ledgerName,
+    style: item.monitorState ? styleDict[item.monitorState] : 3,
+    id: item.id,
+    row: item,
+  }))
+  mapRef.value.addMassMarks({
+    path: data,
+    zIndex: 111,
+    zooms: [3, 20],
+    style,
+  })
+  //
+  if (pageIsFirst.value) {
+    mapRef.value.map.setCenter([116.397428, 39.90923])
+  }
+  else {
+    mapRef.value.map.setFitView()
+  }
+  mapRef.value.map.setZoom(10.5)
+}
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const massMarksClick = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.event.data.lnglat)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: data.event.data,
+    map: mapRef.value.map,
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setZoom(14)
+    mapRef.value.map.setCenter(data.event.data.lnglat)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+    })
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
+function resetDraw() {
+  mapRef.value.removeMassMarks()
+  if (detailRef.value) {
+    detailRef.value.close()
+  }
+  if ($props.data) {
+    // 清空标记点重新绘制
+    drawMarker()
+  }
+}
+// 地图绘制完毕
+const completeMap = () => {
+  console.log('地图绘制完毕')
+  // 绘制海量点
+  resetDraw()
+}
+defineExpose({ openInfoDetail, drawMarker, resetDraw })
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <!-- 地图 -->
+    <a-map ref="mapRef" @complete="completeMap" @massMarksClick="massMarksClick" />
+    <!-- 图例 -->
+    <!-- <div class="legend">
+      <div v-for="item in legendData" :key="item.value" class="legend-item" @click="clickLegend(item.value)">
+        <img v-show="legendShowData.includes(item.value)" class="img" :src="item.url">
+        <span v-show="!legendShowData.includes(item.value)" class="img" />
+        <span>{{ item.name }}</span>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+  position: relative;
+}
+
+.legend {
+  background: rgb(68 66 66 / 20%);
+  position: absolute;
+  z-index: 1;
+  left: 15px;
+  bottom: 10px;
+  padding: 0 10px;
+  border-radius: 8px;
+
+  .legend-item {
+    margin: 5px 0;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+
+    .img {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index afa5a3a..9d57f42 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -1,3 +1,340 @@
+<!--
+  Description: 管线监测
+  Author: 李亚光
+  Date: 2023-09-04
+ -->
+<script lang="ts" setup name="WellMonitor">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ArrowUpBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+// import { getStationList, getStationListPage } from '@/api/home/station/station'
+import { getDictByCode } from '@/api/system/dict'
+// 表格标识  地图或普通
+const mapRef = ref()
+const tableFlag = ref('normal')
+const mapLoading = ref(true)
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 地图数据
+const mapList = ref([])
+
+// 初始展示列
+const columns = ref<any>([
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '设备编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '设备类型', value: 'ledgerName', isRequired: true, align: 'center' },
+  { text: '关联管线', value: 'responsibleDeptName', isRequired: true, align: 'center' },
+  { text: '压力级制', value: 'wellTypeName', isRequired: true, align: 'center' },
+  { text: '管径(mm)', value: 'position', align: 'center' },
+  { text: '管材', value: '', isRequired: true, align: 'center' },
+  { text: '建设年代', value: '', align: 'center' },
+  { text: '详细位置', value: 'onStateName', isRequired: true, align: 'center' },
+  { text: '管理单位', value: 'monitorStateName', isRequired: true, align: 'center' },
+  { text: '使用状态', value: 'device', align: 'center', width: '90' },
+  { text: '监控状态', value: 'marker', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  tagNumber: '', // 闸井位号
+  ledgerName: '', // 闸井名称
+  ledgerCode: '', // 闸井编号
+  responsibleDept: '', // 管理单位
+  onState: '', // 使用状态
+  monitorState: '', // 监控状态
+} as { [key: string]: string | number })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  mapLoading.value = true
+  // 判断是否有查询条件(是地图展示20条  否地图展示所有)
+  const queryList = [] as Boolean[] // 长度大于2 即为是
+  for (const i in listQuery.value) {
+    if (listQuery.value[i]) {
+      queryList.push(true)
+    }
+  }
+  // getStationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  //   if (queryList.length > 2) {
+  //     mapList.value = list.value
+  //     setTimeout(() => {
+  //       if (tableFlag.value === 'map') {
+  //         mapRef.value.resetDraw()
+  //       }
+  mapLoading.value = false
+  //     }, 500)
+  //   }
+  // }).catch(() => {
+  //   loadingTable.value = false
+  //   if (queryList.length <= 2) {
+  //     mapLoading.value = false
+  //   }
+  // })
+  // if (queryList.length > 2) { return }
+  // // 获取地图全部数据
+  // getStationList(listQuery.value).then((res) => {
+  //   mapList.value = res.data
+  //   setTimeout(() => {
+  //     if (tableFlag.value === 'map') {
+  //       mapRef.value.resetDraw()
+  //     }
+  //     mapLoading.value = false
+  //   }, 500)
+  // }).catch(() => {
+  //   mapLoading.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    tagNumber: '', // 闸井位号
+    ledgerName: '', // 闸井名称
+    ledgerCode: '', // 闸井编号
+    responsibleDept: '', // 管理单位
+    onState: '', // 使用状态态
+    monitorState: '', // 监控状态
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+// 获取字典
+const wellTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 场站类型
+const onStateList = ref<{ id: string; name: string; value: string }[]>([]) // 使用状态
+const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
+const fetchDict = () => {
+  // 场站类型
+  getDictByCode('wellType').then((res) => {
+    wellTypeList.value = res.data
+  })
+  // 使用状态
+  getDictByCode('onState').then((res) => {
+    onStateList.value = res.data
+  })
+  // 监控状态
+  getDictByCode('monitorState').then((res) => {
+    monitorStateList.value = res.data
+  })
+}
+onMounted(() => {
+  fetchDict()
+  fetchData()
+})
+
+// 切换地图标识
+const switchMode = (type: string) => {
+  tableFlag.value = type
+}
+// 点击数据行
+const rowClick = (data: any) => {
+  if (tableFlag.value === 'normal') { return }
+  if (!data.lngGaode || !data.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  // 打开地图弹窗
+  mapRef.value.openInfoDetail({
+    lnglat: [data.lngGaode, data.latGaode],
+    id: data.id,
+    name: data.ledgerName,
+    row: data,
+  })
+}
+// 查看/编辑
+const $router = useRouter()
+const editRow = (type: string, row: any) => {
+  $router.push({
+    path: `/station/${type}`,
+    query: {
+      id: row.id,
+    },
+  })
+}
+</script>
+
 <template>
-  管线监测
+  <!-- 布局 -->
+  <app-container class="container">
+    <!-- 地图 -->
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="350" :data="mapList" />
+    <!-- 占位-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 350px;" />
+    <!-- 收起地图-图标 -->
+    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
+      <el-icon :size="25">
+        <arrow-up-bold />
+      </el-icon>
+    </div>
+    <!-- 筛选条件 -->
+    <search-area
+      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      @clear="reset"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerCode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="关联管线" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.pipeDiameter1" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+        ~
+        <el-input
+          v-model="listQuery.pipeDiameter2" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.constructEra1" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+        ~
+        <el-input v-model="listQuery.constructEra2" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="安装方式" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="使用状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="监控状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 筛选条件-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 114px;" />
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-left>
+        <!-- 操作 -->
+        <div v-if="tableFlag === 'normal'" style="margin-left: 15px;">
+          <el-button type="primary" plain :disabled="loadingTable" @click="switchMode('map')">
+            切换地图模式
+          </el-button>
+        </div>
+      </template>
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage" @rowClick="rowClick"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="75" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .map {
+    position: fixed;
+    z-index: 99;
+  }
+
+  .icon {
+    position: fixed;
+    top: 450px;
+    left: 50%;
+    // transform: translateX(-50%);
+    z-index: 901;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .search-area {
+    position: fixed;
+    z-index: 99;
+  }
+}
+</style>
+
+<style>
+.select {
+  width: 192px;
+}
+</style>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index bbd356b..98f2b83 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -1,3 +1,160 @@
+<!--
+  Description: 规则引擎-报警规则管理
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="RuleAlarmManage">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警名称', value: 'deviceTypeName', align: 'center' },
+  { text: '报警等级', value: '', align: 'center' },
+  { text: '报警提示方式', value: '', align: 'center' },
+  { text: '状态', value: '', align: 'center' },
+  { text: '创建时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  报警规则管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="报警名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="报警等级" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="alarm-rule" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            报警类型管理
+          </el-button>
+          <el-button type="primary">
+            报警等级管理
+          </el-button>
+          <el-button type="primary">
+            新增
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small">
+                停用
+              </el-button>
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index ae7c9fa..b739dcd 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -1,3 +1,155 @@
+<!--
+  Description: 规则引擎-特殊报警规则管理
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="RuleAlarmSpecialManage">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '绑定点位', value: '', align: 'center' },
+  { text: '详细位置', value: '', align: 'center' },
+  { text: '报警规则', value: '', align: 'center' },
+  { text: '操作时间', value: '', align: 'center' },
+  { text: '操作人', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  特殊报警规则
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="alarm-rule-special" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新增
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index f405c06..901a74f 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -39,3 +39,7 @@
 export function getKaptcha() {
   return request.get(`${prefix}kaptcha/base64`)
 }
+// 用特定字符换取token
+export function getAdminToken(code: string) {
+  return request.get(`/sync/token?code=${code}`)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..1b7a06d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import { getAdminToken } from '@/api/system/login'
 
 const { isLoading } = useNProgress()
 
@@ -19,111 +20,218 @@
 })
 
 router.beforeEach(async (to, from, next) => {
-  console.log('to:', to.path)
-  const settingsStore = useSettingsStore()
-  const userStore = useUserStore()
-  const menuStore = useMenuStore()
-  const routeStore = useRouteStore()
-  settingsStore.app.enableProgress && (isLoading.value = true)
-  // 是否已登录
-  if (userStore.isLogin) {
-    if (to.name === 'login') { // 如果还要进入登录页，直接跳转
-      next()
-    }
-    else {
-      if (!userStore.hasUserInfo) {
-      // 获取用户信息
+  if (to.query.code && !sessionStorage.getItem('NoLoginIdentifier')) {
+    console.log('携带code跳转，需要免登录')
+    const data = encodeURIComponent(to.query.code as string)
+    sessionStorage.setItem('NoLoginIdentifier', '1')
+    try {
+      const res = await getAdminToken(data)
+      sessionStorage.removeItem('NoLoginIdentifier')
+      if (res.data) {
+        localStorage.setItem('token', res.data)
+        const settingsStore = useSettingsStore()
+        const userStore = useUserStore()
+        const menuStore = useMenuStore()
+        const routeStore = useRouteStore()
+        // const routeStore = useRouteStore()
+        userStore.token = res.data
         await userStore.getUserInfo()
 
-        console.log('index.ts-after userinfo', localStorage.token, userStore.username)
-      }
-      // 是否已根据权限动态生成并注册路由
-      if (routeStore.isGenerate) {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
         // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-        settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-        // 如果已登录状态下，进入登录页会强制跳转到控制台页面
-        if (to.name === 'login') {
-          next({
-            name: 'index',
-            replace: true,
-          })
-        }
-        // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-        else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
-          if (menuStore.sidebarMenus.length > 0) {
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
             next({
-              path: menuStore.sidebarMenusFirstDeepestPath,
+              name: 'dashboard',
               replace: true,
             })
           }
-          // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
           else {
             next()
           }
         }
-        // 正常访问页面
         else {
-          next()
-        }
-      }
-      else {
-        // 生成动态路由
-        switch (settingsStore.app.routeBaseOn) {
-          case 'frontend':
-            await routeStore.generateRoutesAtFront(asyncRoutes)
-            break
-          case 'backend':
-            await routeStore.generateRoutesAtBack()
-            break
-          case 'filesystem':
-            await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
-            // 文件系统生成的路由，需要手动生成导航数据
-            switch (settingsStore.menu.baseOn) {
-              case 'frontend':
-                await menuStore.generateMenusAtFront()
-                break
-              case 'backend':
-                await menuStore.generateMenusAtBack()
-                break
-            }
-            break
-        }
-        // 注册并记录路由数据
-        // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-        const removeRoutes: Function[] = []
-        routeStore.flatRoutes.forEach((route) => {
-          if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
           }
-        })
-        // 添加静态路由
-        if (settingsStore.app.routeBaseOn !== 'filesystem') {
-          routeStore.flatSystemRoutes.forEach((route) => {
-            removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
           })
         }
-        routeStore.setCurrentRemoveRoutes(removeRoutes)
-        // 动态路由生成并注册后，重新进入当前路由
+        next()
+      }
+      else {
         next({
-          path: to.path,
-          query: to.query,
-          replace: true,
+          name: 'login',
         })
       }
     }
+    catch (error) {
+      sessionStorage.removeItem('NoLoginIdentifier')
+      next({
+        name: 'login',
+      })
+    }
   }
   else {
-    // 未登录跳转到登录
-    if (to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath,
-        },
-      })
+    sessionStorage.removeItem('NoLoginIdentifier')
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
+    // 是否已登录
+    if (userStore.isLogin) {
+      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+        next()
+      }
+      else {
+        if (!userStore.hasUserInfo) {
+        // 获取用户信息
+          await userStore.getUserInfo()
+
+          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+        }
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'dashboard',
+              replace: true,
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true,
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        }
+        else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach((route) => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach((route) => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true,
+          })
+        }
+      }
     }
     else {
-      next()
+      // 未登录跳转到登录
+      if (to.name !== 'login') {
+        next({
+          name: 'login',
+          query: {
+            redirect: to.fullPath,
+          },
+        })
+      }
+      else {
+        next()
+      }
     }
   }
 })
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index d8f0859..30f312e 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -11,11 +11,24 @@
     default: 0,
   },
 })
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
 </script>
 
 <template>
   <div :style="`height: ${$props.height}px`" class="map-container">
-    <a-map />
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
   </div>
 </template>
 
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 64af358..0c937fe 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -62,6 +62,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
       },
       {
         alarmTypeName: '闸井浓度超限',
@@ -73,6 +75,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '未读',
         alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
       },
       {
         alarmTypeName: '疑似第三方破坏',
@@ -84,6 +88,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '已确认',
         alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
       },
       {
         alarmTypeName: '设备故障',
@@ -95,6 +101,8 @@
         dept: '第一分公司/运维1所/1班',
         status: '挂起',
         alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
       },
       {
         alarmTypeName: '设备故障',
@@ -180,6 +188,38 @@
 window.addEventListener('resize', () => {
   tableHeight.value = document.getElementById('container-table')?.clientHeight as number
 })
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
 </script>
 
 <template>
@@ -188,19 +228,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -209,7 +249,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -252,15 +292,15 @@
             <template #columns>
               <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
-                  <el-button type="primary" link size="small">
-                    查看 {{ scope.$index }}
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
                   </el-button>
                 </template>
               </el-table-column>
             </template>
           </normal-table>
           <!-- 打开关闭地图模式 -->
-          <div class="mapMode" :style="`height: ${tableHeight}px`">
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
             <!-- 打开 -->
             <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
               <el-icon :size="30">
@@ -277,7 +317,7 @@
       </div>
       <!-- 地图 -->
       <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
-        <map-com :height="tableHeight" />
+        <map-com ref="mapRef" :height="tableHeight" />
       </div>
     </div>
   </app-container>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 8eab8ad..27b67e8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类别" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警等级" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" />
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
@@ -185,7 +185,7 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" />
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -228,8 +228,8 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button type="primary" link size="small">
-                查看 {{ scope.$index }}
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index c098697..ab9bcc9 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -162,7 +162,7 @@
       </search-item>
       <search-item>
         <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
-        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
           <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 7b8f728..8df2239 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-服务监控
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorService">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '服务', value: '', align: 'center' },
+  { text: '备注', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新检查时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  服务监控
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-service" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 2b22dc2..caa6d46 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -1,3 +1,89 @@
+<!--
+  Description: 系统监控-定时任务
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="SystemMonitorTime">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '定时任务', value: '', align: 'center' },
+  { text: '定时任务名称', value: '', align: 'center' },
+  { text: '运行状态', value: '', align: 'center' },
+  { text: '最新运行时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  定时任务
+  <!-- 布局 -->
+  <app-container>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="monitor-time" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
new file mode 100644
index 0000000..30f312e
--- /dev/null
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -0,0 +1,39 @@
+<!--
+  Description: 报警管理-报警地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="AlarmMap">
+import AMap from '@/components/map/index.vue'
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+})
+// 地图实例
+const mapRef = ref()
+// 地图加载状态
+const completeFlag = ref(false)
+// 地图加载完成
+const completeMap = () => {
+  completeFlag.value = true
+  console.log('地图加载完成')
+}
+defineExpose({
+  mapRef,
+  completeFlag,
+})
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <a-map ref="mapRef" :zoom="14" @complete="completeMap" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index eaf3fbb..ef04fd4 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -1,3 +1,379 @@
+<!--
+  Description: 设备运维-设备报警
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="CurrentAlarm">
+import { ElMessage } from 'element-plus'
+import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+
+// 表格数据
+const list1 = ref<any[]>([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devicecode', align: 'center' },
+  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警原因', value: 'alarmReason', align: 'center' },
+  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '状态', value: 'status', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+    list1.value = [
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '一级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '2024-07-01 12:45:50',
+        lat: '39.91081620470105',
+        lng: '116.2590451793805',
+      },
+      {
+        alarmTypeName: '闸井浓度超限',
+        alarmRank: '二级',
+        alarmReason: '燃气浓度23%vol',
+        position: 'N121422南小街中压',
+        deviceType: '燃气智能监测终端',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '未读',
+        alarmTime: '',
+        lat: '39.911268',
+        lng: '116.343489',
+      },
+      {
+        alarmTypeName: '疑似第三方破坏',
+        alarmRank: '一级',
+        alarmReason: '桩倾斜报警',
+        position: 'N121422南小街中压',
+        deviceType: '智能监测桩',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '已确认',
+        alarmTime: '',
+        lat: '39.943322',
+        lng: '116.403976',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+        lat: '39.901552',
+        lng: '116.398043',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        deptName: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        devicecode: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+      {
+        alarmTypeName: '设备故障',
+        alarmRank: '三级',
+        alarmReason: '传感器异常',
+        position: '422南小街中压',
+        deviceType: '管线哨兵',
+        deviceNo: '342022010027',
+        dept: '第一分公司/运维1所/1班',
+        status: '挂起',
+        alarmTime: '',
+      },
+    ] as any[]
+  }, 1000)
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+// 表格标识  地图或普通
+const tableFlag = ref('normal')
+const tableHeight = ref(0)
+const switchMode = (type: string) => {
+  if (!list1.value.length) {
+    ElMessage.warning('暂无数据')
+    return
+  }
+  tableFlag.value = type
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+}
+watch(() => list1.value, () => {
+  if (list1.value.length) {
+    tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+  }
+})
+window.addEventListener('resize', () => {
+  tableHeight.value = document.getElementById('container-table')?.clientHeight as number
+})
+// 查看报警
+const mapRef = ref()
+const detail = (row: any) => {
+  switchMode('map')
+  // 绘制点
+  const draw = () => {
+    mapRef.value.mapRef.map.setCenter([row.lng, row.lat])
+    mapRef.value.mapRef.removeMarker()
+    mapRef.value.mapRef.addMarker({
+      position: [row.lng, row.lat],
+      content: '',
+      label: '',
+    })
+  }
+  setTimeout(() => {
+    if (!row.lng || !row.lat) {
+      ElMessage.warning('该数据缺少坐标信息')
+      return
+    }
+    if (mapRef.value.completeFlag) {
+      draw()
+    }
+    else {
+      setTimeout(() => {
+        draw()
+      }, 1000)
+    }
+    // console.log(mapRef.value)
+    // lat: '39.901552',
+    // lng: '116.398043',
+  })
+}
+</script>
+
 <template>
-  设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <div style="width: 100%;display: flex;">
+      <!-- 表头标题 -->
+      <div
+        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
+        style="width: 100%;"
+      >
+        <table-container
+          :is-config="true" config-title="device-current-alarm" :columns="columns"
+          :config-columns="columnsConfig" :edit="editColumns"
+        >
+          <template #btns-right>
+            <!-- 操作 -->
+            <div>
+              <el-button type="primary">
+                导出
+              </el-button>
+            </div>
+          </template>
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
+            :list-loading="loadingTable" @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button type="primary" link size="small" @click="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+          <!-- 打开关闭地图模式 -->
+          <div v-if="tableFlag !== 'normal'" class="mapMode" :style="`height: ${tableHeight}px`">
+            <!-- 打开 -->
+            <div v-if="tableFlag === 'normal'" class="open" @click="switchMode('map')">
+              <el-icon :size="30">
+                <arrow-left-bold :size="30" />
+              </el-icon>
+            </div>
+            <div v-if="tableFlag === 'map'" class="open" @click="switchMode('normal')">
+              <el-icon :size="30">
+                <arrow-right-bold :size="30" />
+              </el-icon>
+            </div>
+          </div>
+        </table-container>
+      </div>
+      <!-- 地图 -->
+      <div v-if="tableFlag === 'map'" :style="`height: ${tableHeight}px`" class="map">
+        <map-com ref="mapRef" :height="tableHeight" />
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.table {
+  width: 100% !important;
+}
+
+.table-map {
+  width: 75% !important;
+}
+
+.map {
+  width: 25% !important;
+  // background-color: antiquewhite;
+}
+
+.container-table {
+  position: relative;
+
+  .mapMode {
+    // background-color: aqua;
+    width: 1.5%;
+    //  height: 100vh;
+    position: absolute;
+    right: -6px;
+    top: 50%;
+    z-index: 9;
+    transform: translateY(-50%);
+
+    &:hover {
+      .open,
+      .close {
+        display: block;
+      }
+    }
+
+    .open {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      display: none;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.select {
+  width: 100%;
+}
+</style>
+
+<style>
+.select {
+  width: 192px !important;
+}
+</style>
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 84137c8..02ff9a3 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -1,3 +1,150 @@
+<!--
+  Description: 设备运维-设备报警记录
+  Author: 李亚光
+  Date: 2023-06-28
+ -->
+<script lang="ts" setup name="HistoryAlarm">
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警原因', value: '', align: 'center' },
+  { text: '厂商', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '位置', value: '', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '报警时间', value: '', align: 'center' },
+  { text: '解除时间', value: '', align: 'center' },
+  { text: '解除时长', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  历史设备报警
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="报警状态" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.keywords" placeholder="管理单位" :clearable="true" class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="厂商" clearable class="select" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="位置" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable />
+      </search-item>
+
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="history-alarm" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <!-- <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
+              </template>
+  </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 883232c..3ca678d 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -1,3 +1,153 @@
+<!--
+  Description: 设备运维-轨迹查询
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="DeviceTrajectorySearch">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '原始位置', value: '', align: 'center' },
+  { text: '当前位置', value: '', align: 'center' },
+  { text: '上报时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  轨迹查询
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select
+          v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
+          style="width: 192px;"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="device-trajectory" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
new file mode 100644
index 0000000..20fb0cc
--- /dev/null
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -0,0 +1,191 @@
+<!--
+  Description: 场站管理-信息窗体
+  Author: 李亚光
+  Date: 2024-07-18
+ -->
+<script lang="ts" setup name="infoWindow">
+const dialogFormVisible = ref(false)
+const overlay = ref()
+const infoWindow = ref()
+// 基本数据
+const baseInfo = ref({
+  ledgerCode: '', // 场站编号
+  ledgerName: '', // 场站名称
+  lngGaode: '',
+  latGaode: '',
+})
+// 详细信息
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '场站位号',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '使用状态',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '产权单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '管理方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '联系方式',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '所在区域',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: '',
+    align: 'center',
+  },
+  {
+    text: '标签',
+    value: '',
+    align: 'center',
+  },
+])
+// 初始化
+const initDialog = (e: any) => {
+  console.log(e, '信息窗体接收的数据')
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  baseInfo.value = e.info.row
+  dialogFormVisible.value = true
+  if (e.map) {
+    e.map.setZoom(15)
+  }
+  // 获取详细信息
+}
+
+// 关闭
+const close = () => {
+  infoWindow.value?.close()
+}
+
+defineExpose({ initDialog, close })
+</script>
+
+<template>
+  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <div class="header">
+      <el-tooltip
+        class="box-item" effect="dark" :content="`${baseInfo.ledgerCode} | ${baseInfo.ledgerName}`"
+        placement="top"
+      >
+        <span class="title">{{ baseInfo.ledgerCode }} | {{ baseInfo.ledgerName }}</span>
+      </el-tooltip>
+      <span class="close" @click="close">x</span>
+    </div>
+    <div class="body">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          {{ detailInfo[item.value] || '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 20%;
+}
+
+::v-deep(.el-descriptions__cell) {
+  padding: 0 !important;
+}
+
+.container {
+  width: 500px;
+  // padding: 0 10px;
+  background: rgba($color: #feffff, $alpha: 95%);
+  border: 1.5px solid #79b5e6;
+  position: relative;
+
+  .header {
+    float: right;
+    background-color: #ccc;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 2px 10px;
+    align-items: center;
+
+    .title {
+      font-weight: 700;
+      display: inline-block;
+      width: 90%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .close {
+      color: #4875a0;
+      font-size: 22px;
+      font-weight: 700;
+
+      &:hover {
+        cursor: pointer;
+        color: #658eb4;
+      }
+    }
+  }
+
+  .body {
+    // padding: 10px;
+    // display: flex;
+    // flex-wrap: wrap;
+    width: 100%;
+
+    .name {
+      width: 30%;
+    }
+
+    .value {
+      width: 70%;
+    }
+  }
+}
+
+.clearfix::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
new file mode 100644
index 0000000..f11d959
--- /dev/null
+++ b/src/views/home/pipeline/components/map.vue
@@ -0,0 +1,237 @@
+<!--
+  Description: 闸井监测-地图
+  Author: 李亚光
+  Date: 2023-07-08
+ -->
+<script lang="ts" setup name="WellMap">
+import detailInfo from './detailInfoDialog.vue'
+import AMap from '@/components/map/index.vue'
+
+const $props = defineProps({
+  height: {
+    type: Number,
+    default: 0,
+  },
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+// 地图实例
+const mapRef = ref()
+const publicPath = window.location.origin
+// console.log(publicPath, 'publicPath')
+// 展示图例数据
+const legendShowData = ref(['1', '2', '3', '0'])
+// 地图图例数据
+const legendData = ref([
+  {
+    name: '正常',
+    url: `${publicPath}/image/station/场站-正常.png`,
+    value: '1',
+  },
+  {
+    name: '异常',
+    url: `${publicPath}/image/station/场站-异常.png`,
+    value: '2',
+  },
+  {
+    name: '离线',
+    url: `${publicPath}/image/station/场站-离线.png`,
+    value: '3',
+  },
+  {
+    name: '未监控',
+    url: `${publicPath}/image/station/场站-未部署.png`,
+    value: '0',
+  },
+])
+// 控制图例
+const clickLegend = (type: string) => {
+  if (legendShowData.value.includes(type)) {
+    legendShowData.value = legendShowData.value.filter((item: string) => item !== type)
+  }
+  else {
+    legendShowData.value.push(type)
+  }
+  resetDraw()
+}
+// 初次加载标识
+const pageIsFirst = ref(true)
+// 绘制标记点
+const drawMarker = () => {
+  const style = [
+    {
+      url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
+      url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+      anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+  ]
+  // （0：未监控，1：正常，2：异常，3：离线）
+  const styleDict = {
+    0: 3,
+    1: 0,
+    2: 1,
+    3: 2,
+  } as { [key: string]: number }
+  const data = $props.data.map((item: any) => ({ ...item, monitorState: item.monitorState || '0' })).filter((item: any) => legendShowData.value.includes(item.monitorState)).filter((item: any) => item.lngGaode && item.latGaode).map((item: any) => ({
+    lnglat: [item.lngGaode, item.latGaode],
+    name: item.ledgerName,
+    style: item.monitorState ? styleDict[item.monitorState] : 3,
+    id: item.id,
+    row: item,
+  }))
+  mapRef.value.addMassMarks({
+    path: data,
+    zIndex: 111,
+    zooms: [3, 20],
+    style,
+  })
+  //
+  if (pageIsFirst.value) {
+    mapRef.value.map.setCenter([116.397428, 39.90923])
+  }
+  else {
+    mapRef.value.map.setFitView()
+  }
+  mapRef.value.map.setZoom(10.5)
+}
+// 点标记弹窗
+const detail = ref()
+const detailRef = ref()
+const massMarksClick = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  detail.value.open(data.map, data.event.data.lnglat)
+  // 初始化信息窗口
+  detailRef.value.initDialog({
+    overlay: data.event.target,
+    infoWindow: detail.value,
+    info: data.event.data,
+    map: mapRef.value.map,
+  })
+  setTimeout(() => {
+    // mapRef.value.map.setZoom(14)
+    mapRef.value.map.setCenter(data.event.data.lnglat)
+  })
+}
+
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(10.5)
+  // 定义弹窗
+  detail.value = new mapRef.value.AMap.InfoWindow({
+    closeWhenClickMap: true, // 是否在鼠标点击地图后关闭信息窗体
+    autoMove: true, // 是否自动调整窗体到视野内
+    isCustom: true, // 自定义信息窗体
+    content: detailRef.value.$el, // 窗体内容(vue组件)
+    offset: new mapRef.value.AMap.Pixel(9, -5), // 偏移
+  })
+  // 打开信息窗口
+  setTimeout(() => {
+    detail.value.open(mapRef.value.map, data.lnglat)
+    // 初始化信息窗口
+    detailRef.value.initDialog({
+      infoWindow: detail.value,
+      info: data,
+      map: mapRef.value.map,
+    })
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+
+function resetDraw() {
+  mapRef.value.removeMassMarks()
+  if (detailRef.value) {
+    detailRef.value.close()
+  }
+  if ($props.data) {
+    // 清空标记点重新绘制
+    drawMarker()
+  }
+}
+// 地图绘制完毕
+const completeMap = () => {
+  console.log('地图绘制完毕')
+  // 绘制海量点
+  resetDraw()
+}
+defineExpose({ openInfoDetail, drawMarker, resetDraw })
+</script>
+
+<template>
+  <div :style="`height: ${$props.height}px`" class="map-container">
+    <!-- 设备信息窗体 -->
+    <detail-info ref="detailRef" />
+    <!-- 地图 -->
+    <a-map ref="mapRef" @complete="completeMap" @massMarksClick="massMarksClick" />
+    <!-- 图例 -->
+    <!-- <div class="legend">
+      <div v-for="item in legendData" :key="item.value" class="legend-item" @click="clickLegend(item.value)">
+        <img v-show="legendShowData.includes(item.value)" class="img" :src="item.url">
+        <span v-show="!legendShowData.includes(item.value)" class="img" />
+        <span>{{ item.name }}</span>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.map-container {
+  width: 100%;
+  position: relative;
+}
+
+.legend {
+  background: rgb(68 66 66 / 20%);
+  position: absolute;
+  z-index: 1;
+  left: 15px;
+  bottom: 10px;
+  padding: 0 10px;
+  border-radius: 8px;
+
+  .legend-item {
+    margin: 5px 0;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+
+    .img {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index afa5a3a..9d57f42 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -1,3 +1,340 @@
+<!--
+  Description: 管线监测
+  Author: 李亚光
+  Date: 2023-09-04
+ -->
+<script lang="ts" setup name="WellMonitor">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ArrowUpBold } from '@element-plus/icons-vue'
+import MapCom from './components/map.vue'
+// import { getStationList, getStationListPage } from '@/api/home/station/station'
+import { getDictByCode } from '@/api/system/dict'
+// 表格标识  地图或普通
+const mapRef = ref()
+const tableFlag = ref('normal')
+const mapLoading = ref(true)
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 地图数据
+const mapList = ref([])
+
+// 初始展示列
+const columns = ref<any>([
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '设备编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '设备类型', value: 'ledgerName', isRequired: true, align: 'center' },
+  { text: '关联管线', value: 'responsibleDeptName', isRequired: true, align: 'center' },
+  { text: '压力级制', value: 'wellTypeName', isRequired: true, align: 'center' },
+  { text: '管径(mm)', value: 'position', align: 'center' },
+  { text: '管材', value: '', isRequired: true, align: 'center' },
+  { text: '建设年代', value: '', align: 'center' },
+  { text: '详细位置', value: 'onStateName', isRequired: true, align: 'center' },
+  { text: '管理单位', value: 'monitorStateName', isRequired: true, align: 'center' },
+  { text: '使用状态', value: 'device', align: 'center', width: '90' },
+  { text: '监控状态', value: 'marker', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  tagNumber: '', // 闸井位号
+  ledgerName: '', // 闸井名称
+  ledgerCode: '', // 闸井编号
+  responsibleDept: '', // 管理单位
+  onState: '', // 使用状态
+  monitorState: '', // 监控状态
+} as { [key: string]: string | number })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  mapLoading.value = true
+  // 判断是否有查询条件(是地图展示20条  否地图展示所有)
+  const queryList = [] as Boolean[] // 长度大于2 即为是
+  for (const i in listQuery.value) {
+    if (listQuery.value[i]) {
+      queryList.push(true)
+    }
+  }
+  // getStationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  //   if (queryList.length > 2) {
+  //     mapList.value = list.value
+  //     setTimeout(() => {
+  //       if (tableFlag.value === 'map') {
+  //         mapRef.value.resetDraw()
+  //       }
+  mapLoading.value = false
+  //     }, 500)
+  //   }
+  // }).catch(() => {
+  //   loadingTable.value = false
+  //   if (queryList.length <= 2) {
+  //     mapLoading.value = false
+  //   }
+  // })
+  // if (queryList.length > 2) { return }
+  // // 获取地图全部数据
+  // getStationList(listQuery.value).then((res) => {
+  //   mapList.value = res.data
+  //   setTimeout(() => {
+  //     if (tableFlag.value === 'map') {
+  //       mapRef.value.resetDraw()
+  //     }
+  //     mapLoading.value = false
+  //   }, 500)
+  // }).catch(() => {
+  //   mapLoading.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    tagNumber: '', // 闸井位号
+    ledgerName: '', // 闸井名称
+    ledgerCode: '', // 闸井编号
+    responsibleDept: '', // 管理单位
+    onState: '', // 使用状态态
+    monitorState: '', // 监控状态
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+// 获取字典
+const wellTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 场站类型
+const onStateList = ref<{ id: string; name: string; value: string }[]>([]) // 使用状态
+const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
+const fetchDict = () => {
+  // 场站类型
+  getDictByCode('wellType').then((res) => {
+    wellTypeList.value = res.data
+  })
+  // 使用状态
+  getDictByCode('onState').then((res) => {
+    onStateList.value = res.data
+  })
+  // 监控状态
+  getDictByCode('monitorState').then((res) => {
+    monitorStateList.value = res.data
+  })
+}
+onMounted(() => {
+  fetchDict()
+  fetchData()
+})
+
+// 切换地图标识
+const switchMode = (type: string) => {
+  tableFlag.value = type
+}
+// 点击数据行
+const rowClick = (data: any) => {
+  if (tableFlag.value === 'normal') { return }
+  if (!data.lngGaode || !data.latGaode) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  // 打开地图弹窗
+  mapRef.value.openInfoDetail({
+    lnglat: [data.lngGaode, data.latGaode],
+    id: data.id,
+    name: data.ledgerName,
+    row: data,
+  })
+}
+// 查看/编辑
+const $router = useRouter()
+const editRow = (type: string, row: any) => {
+  $router.push({
+    path: `/station/${type}`,
+    query: {
+      id: row.id,
+    },
+  })
+}
+</script>
+
 <template>
-  管线监测
+  <!-- 布局 -->
+  <app-container class="container">
+    <!-- 地图 -->
+    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" class="map" :height="350" :data="mapList" />
+    <!-- 占位-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 350px;" />
+    <!-- 收起地图-图标 -->
+    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
+      <el-icon :size="25">
+        <arrow-up-bold />
+      </el-icon>
+    </div>
+    <!-- 筛选条件 -->
+    <search-area
+      :class="`${tableFlag === 'map' ? 'search-area' : ''}`" :need-clear="true" @search="fetchData"
+      @clear="reset"
+    >
+      <search-item>
+        <el-input v-model.trim="listQuery.tagNumber" placeholder="安装位号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerCode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="关联管线" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.material" placeholder="材质" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.pipeDiameter1" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+        ~
+        <el-input
+          v-model="listQuery.pipeDiameter2" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.constructEra1" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+        ~
+        <el-input v-model="listQuery.constructEra2" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="安装方式" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="使用状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.pressType" placeholder="监控状态" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 筛选条件-地图 -->
+    <div v-if="tableFlag === 'map'" style="height: 114px;" />
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="station-monitor" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-left>
+        <!-- 操作 -->
+        <div v-if="tableFlag === 'normal'" style="margin-left: 15px;">
+          <el-button type="primary" plain :disabled="loadingTable" @click="switchMode('map')">
+            切换地图模式
+          </el-button>
+        </div>
+      </template>
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage" @rowClick="rowClick"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="75" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .map {
+    position: fixed;
+    z-index: 99;
+  }
+
+  .icon {
+    position: fixed;
+    top: 450px;
+    left: 50%;
+    // transform: translateX(-50%);
+    z-index: 901;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .search-area {
+    position: fixed;
+    z-index: 99;
+  }
+}
+</style>
+
+<style>
+.select {
+  width: 192px;
+}
+</style>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index bbd356b..98f2b83 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -1,3 +1,160 @@
+<!--
+  Description: 规则引擎-报警规则管理
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="RuleAlarmManage">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '报警类型', value: '', align: 'center' },
+  { text: '报警名称', value: 'deviceTypeName', align: 'center' },
+  { text: '报警等级', value: '', align: 'center' },
+  { text: '报警提示方式', value: '', align: 'center' },
+  { text: '状态', value: '', align: 'center' },
+  { text: '创建时间', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  报警规则管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="报警名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="报警等级" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="alarm-rule" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            报警类型管理
+          </el-button>
+          <el-button type="primary">
+            报警等级管理
+          </el-button>
+          <el-button type="primary">
+            新增
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small">
+                停用
+              </el-button>
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index ae7c9fa..b739dcd 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -1,3 +1,155 @@
+<!--
+  Description: 规则引擎-特殊报警规则管理
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="RuleAlarmSpecialManage">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: '', align: 'center' },
+  { text: '设备类型', value: '', align: 'center' },
+  { text: '绑定点位', value: '', align: 'center' },
+  { text: '详细位置', value: '', align: 'center' },
+  { text: '报警规则', value: '', align: 'center' },
+  { text: '操作时间', value: '', align: 'center' },
+  { text: '操作人', value: '', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 开始结束时间
+// const datetimerange = ref()
+// watch(() => datetimerange.value, (newVal) => {
+//   listQuery.value.begTime = ''
+//   listQuery.value.endTime = ''
+//   if (Array.isArray(newVal)) {
+//     if (newVal.length) {
+//       listQuery.value.begTime = `${newVal[0]} 00:00:00`
+//       listQuery.value.endTime = `${newVal[1]} 23:59:59`
+//     }
+//   }
+// })
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //   }))
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 查看轨迹详情
+const detail = (row: any) => {
+
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  特殊报警规则
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="alarm-rule-special" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新增
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small">
+                查看
+              </el-button>
+              <el-button type="primary" link size="small" @click="detail(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index d5f177c..4b2810e 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -1,3 +1,185 @@
+<!--
+  Description: 场站管理-运维管理
+  Author: 李亚光
+  Date: 2024-09-05
+ -->
+<script lang="ts" setup name="manufacturerOperationRecord">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '场站名称', value: 'devcode', align: 'center' },
+  { text: '管理单位', value: 'deviceTypeName', align: 'center' },
+  { text: '详细位置', value: 'repairTypeName', align: 'center' },
+  { text: '维护类型', value: 'ledgerNumber', align: 'center' },
+  { text: '维护内容', value: 'position', align: 'center' },
+  { text: '维护人员', value: '', align: 'center' },
+  { text: '维护时间', value: 'repairContent', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  repairType: '', // 运维类型
+  repairPerson: '', // 运维人员
+  repairContent: '', // 运维内容
+  endTime: '', // 结束时间
+  begTime: '', // 开始时间
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getOperationListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows.map((item: any) => ({
+  //     ...item,
+  //     deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+  //     repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0].name,
+  //   }))
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // }).catch(() => {
+  loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    repairType: '', // 运维类型
+    repairPerson: '', // 运维人员
+    repairContent: '', // 运维内容
+    endTime: '', // 结束时间
+    begTime: '', // 开始时间
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 导出列表
+const exportList = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // exportOperationList(listQuery.value).then((res) => {
+  //   exportFile(res.data, '厂商运维记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+}
+// 获取字典
+const fetchDict = async () => {
+  // // 获取设备类型
+  // const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  // deviceTypeList.value = res.data.rows
+  // // 运维类型
+  // getDictByCode('repairType').then((res) => {
+  //   repairTypeList.value = res.data
+  // })
+}
+onMounted(async () => {
+  await fetchDict()
+  fetchData()
+})
+</script>
+
 <template>
-  运维管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="场站名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="维护类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.typeName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="station-operation" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            新增
+          </el-button>
+          <el-button type="primary" @click="exportList">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>