diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index da60693..60bfcf0 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,12 +11,16 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '1',
+    value: '',
     name: '全部',
   },
   {
+    value: '1',
+    name: '未确认',
+  },
+  {
     value: '2',
-    name: '正在告警',
+    name: '已确认',
   },
   {
     value: '3',
@@ -66,13 +70,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
   list.value = [{
     alarmLevel: 'test1', //	报警等级
     alarmStatus: 'test1', //	报警状态(字典code)

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index da60693..60bfcf0 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,12 +11,16 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '1',
+    value: '',
     name: '全部',
   },
   {
+    value: '1',
+    name: '未确认',
+  },
+  {
     value: '2',
-    name: '正在告警',
+    name: '已确认',
   },
   {
     value: '3',
@@ -66,13 +70,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
   list.value = [{
     alarmLevel: 'test1', //	报警等级
     alarmStatus: 'test1', //	报警状态(字典code)
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 0df3d93..8d2b88a 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -86,7 +86,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '烟雾值', value: 'smokeValue', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
@@ -102,7 +102,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
@@ -178,7 +178,12 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+      return {
+        ...item,
+        deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index da60693..60bfcf0 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,12 +11,16 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '1',
+    value: '',
     name: '全部',
   },
   {
+    value: '1',
+    name: '未确认',
+  },
+  {
     value: '2',
-    name: '正在告警',
+    name: '已确认',
   },
   {
     value: '3',
@@ -66,13 +70,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
   list.value = [{
     alarmLevel: 'test1', //	报警等级
     alarmStatus: 'test1', //	报警状态(字典code)
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 0df3d93..8d2b88a 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -86,7 +86,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '烟雾值', value: 'smokeValue', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
@@ -102,7 +102,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
@@ -178,7 +178,12 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+      return {
+        ...item,
+        deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 9d0b58e..5c54847 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -106,6 +106,7 @@
         addDeviceList(params).then((res) => {
           ElMessage.success('保存成功')
           pageType.value = 'detail'
+          infoId.value = res.data // id
           loading.close()
         }).catch(() => {
           loading.close()

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index da60693..60bfcf0 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,12 +11,16 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '1',
+    value: '',
     name: '全部',
   },
   {
+    value: '1',
+    name: '未确认',
+  },
+  {
     value: '2',
-    name: '正在告警',
+    name: '已确认',
   },
   {
     value: '3',
@@ -66,13 +70,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
   list.value = [{
     alarmLevel: 'test1', //	报警等级
     alarmStatus: 'test1', //	报警状态(字典code)
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 0df3d93..8d2b88a 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -86,7 +86,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '烟雾值', value: 'smokeValue', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
@@ -102,7 +102,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
@@ -178,7 +178,12 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+      return {
+        ...item,
+        deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 9d0b58e..5c54847 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -106,6 +106,7 @@
         addDeviceList(params).then((res) => {
           ElMessage.success('保存成功')
           pageType.value = 'detail'
+          infoId.value = res.data // id
           loading.close()
         }).catch(() => {
           loading.close()
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 089a472..dda2f17 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -67,7 +67,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '3',
+      value: '',
     })
   })
 }

diff --git a/src/api/laboratory/alarm/current.ts b/src/api/laboratory/alarm/current.ts
index e9003a4..b11c617 100644
--- a/src/api/laboratory/alarm/current.ts
+++ b/src/api/laboratory/alarm/current.ts
@@ -25,7 +25,7 @@
 }
 
 // 操作报警
-export function operateAlarm(data: { id: string; alarmStatus: string }) {
+export function operateAlarm(data: { ids: string[]; alarmStatus: string }) {
   return request({
     url: `${prefix}/operate`,
     method: 'post',
diff --git a/src/api/laboratory/equipment/list.ts b/src/api/laboratory/equipment/list.ts
index 75e7f1e..26b6090 100644
--- a/src/api/laboratory/equipment/list.ts
+++ b/src/api/laboratory/equipment/list.ts
@@ -61,4 +61,3 @@
     data,
   })
 }
-
diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts
index 31ed06c..0b6603b 100644
--- a/src/api/laboratory/overView.ts
+++ b/src/api/laboratory/overView.ts
@@ -11,3 +11,11 @@
     method: 'get',
   })
 }
+
+// 查询各个实验室数据
+export function getLocationDetail() {
+  return request({
+    url: `${prefix}/workshop/environment`,
+    method: 'get',
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 579b155..d244fb7 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 { queryString, stripscript } from '@/utils/validate'
 
 const { isLoading } = useNProgress()
 
@@ -31,6 +32,16 @@
       next()
     }
     else {
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+      }
       if (!userStore.hasUserInfo) {
       // 获取用户信息
         await userStore.getUserInfo()
@@ -113,6 +124,22 @@
     }
   }
   else {
+    console.log('未登录')
+    // 携带token
+    const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+    if (hrefIdx > -1 && (!userStore.hasUserInfo || userStore === undefined || userStore === null)) {
+      const params = queryString(window.location.href)
+      if (params?.token) {
+        // 过滤token(哈希路由中可能携带一些特殊符号，需要去除)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        // 刷新页面并隐藏token
+        window.location.href = window.location.href.replace(`?token=${token}`, '')
+        history.go(0)
+        next()
+      }
+    }
+
     // 未登录跳转到登录
     if (to.name !== 'login') {
       next({
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index c59fdc6..dc215f6 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -129,3 +129,27 @@
   const re = /[0-9A-Za-z\\W]{6,18}$/
   return re.test(value)
 }
+
+// 提取url params参数
+export function queryString(str: string) {
+  const params = str.split('?')[1] // 截取?号后的字符串即name=itclanCoder&study=css
+  const param = params.split('&') // 通过&符号进行分割即["name=itclanCoder", "study=css"]
+  const obj: { [key: string]: string } = {} // 用一个对象存储目标值
+  for (let i = 0; i < param.length; i++) {
+    // 循环遍历截取出来的param数组
+    const paramsA = param[i].split('=') // 通过split,=继续对数组params每一项进行分割,生成数组["name", "itclanCoder"]
+    const key = paramsA[0] // 取数组项["name", "itclanCoder"]中第0位,即name
+    const value = paramsA[1] // 取数组项["name", "itclanCoder"]中第1位,即itclanCoder
+    obj[key] = value
+  }
+  return obj
+}
+// 去除字符串中的特殊符号
+export function stripscript(s: string) {
+  var pattern = /[[\]\/:*?"<>|#]/
+  var rs = ''
+  for (var i = 0; i < s.length; i++) {
+    rs = rs + s.substr(i, 1).replace(pattern, '')
+  }
+  return rs
+}
diff --git a/src/views/laboratory/alarm/current/list.vue b/src/views/laboratory/alarm/current/list.vue
index 1f199e1..fce8225 100644
--- a/src/views/laboratory/alarm/current/list.vue
+++ b/src/views/laboratory/alarm/current/list.vue
@@ -29,7 +29,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -50,54 +51,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 清除条件
 const clearList = () => {
@@ -142,7 +107,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -155,8 +120,33 @@
 }
 // -------------------------------------------表格右上角几个图标方法-----------------------------------------------
 // 点击全部消警
-const removeAllAlarm = () => {
-  ElMessage.info('敬请期待')
+const removeAllAlarm = (alarmStatus = '3') => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中数据')
+    return false
+  }
+
+  ElMessageBox.confirm(
+    '确认消警吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      loadingTable.value = true
+      operateAlarm({ ids: checkoutList.value, alarmStatus }).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '消警成功',
+        })
+        fetchData(true)
+      }).catch(() => {
+        loadingTable.value = false
+      })
+    })
 }
 
 // 导出
@@ -254,16 +244,16 @@
           >
             <template #default="{ row }">
               <el-button
-                v-if="row.alarmStatusName === '未确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认'"
                 style="width: 70px;"
                 size="small"
                 type="primary"
-                @click="handleEdit(row, '1', '确认报警')"
+                @click="handleEdit(row, '2', '确认报警')"
               >
                 确认报警
               </el-button>
               <el-button
-                v-if="row.alarmStatusName === '已确认'"
+                v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '已确认'"
                 style="width: 70px;background-color: #00a846;"
                 size="small"
                 type="success"
@@ -272,10 +262,11 @@
                 已确认
               </el-button>
               <el-button
+                v-if="row.alarmStatusName !== '已消警'"
                 style="width: 70px;"
                 size="small"
                 type="danger"
-                @click="handleEdit(row, '2', '取消报警')"
+                @click="handleEdit(row, '3', '取消报警')"
               >
                 取消报警
               </el-button>
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index da60693..60bfcf0 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,12 +11,16 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '1',
+    value: '',
     name: '全部',
   },
   {
+    value: '1',
+    name: '未确认',
+  },
+  {
     value: '2',
-    name: '正在告警',
+    name: '已确认',
   },
   {
     value: '3',
@@ -66,13 +70,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
   list.value = [{
     alarmLevel: 'test1', //	报警等级
     alarmStatus: 'test1', //	报警状态(字典code)
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 0df3d93..8d2b88a 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -86,7 +86,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '烟雾值', value: 'smokeValue', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
@@ -102,7 +102,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '状态', value: 'deviceStatusName', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
@@ -178,7 +178,12 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+      return {
+        ...item,
+        deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 9d0b58e..5c54847 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -106,6 +106,7 @@
         addDeviceList(params).then((res) => {
           ElMessage.success('保存成功')
           pageType.value = 'detail'
+          infoId.value = res.data // id
           loading.close()
         }).catch(() => {
           loading.close()
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 089a472..dda2f17 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -67,7 +67,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '3',
+      value: '',
     })
   })
 }
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index a6cf254..6e48c36 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -6,7 +6,8 @@
 import monitorData from './components/monitorData.vue'
 import type { IList, IListQuery } from '@/views/laboratory/alarm/current/list-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { operateAlarm } from '@/api/laboratory/alarm/current'
+import { getCurrentList, operateAlarm } from '@/api/laboratory/alarm/current'
+import { getLocationDetail } from '@/api/laboratory/overView'
 // ---------------------------------------表格---------------------------------------------
 const radioMenus = ref([ // 标签内容
   { name: '未确认报警', value: 'unconfirmed' },
@@ -20,7 +21,7 @@
   alarmStatus: '', // 报警状态
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
-  limit: 20,
+  limit: 10,
   offset: 1,
 })
 const list = ref<IList[]>([]) // 表格数据
@@ -36,7 +37,8 @@
   { text: '事件名称', value: 'eventName', align: 'center' },
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '数值', value: 'alarmValue', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '180' },
+  { text: '报警状态', value: 'alarmStatusName', align: 'center', width: '90' },
 ])
 const total = ref(0) // 数据总条数
 
@@ -47,99 +49,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getCurrentList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  loadingTable.value = false
-  // })
-  if (current.value === 'unconfirmed') {
-    list.value = [{
-      alarmLevel: 'test1', //	报警等级
-      alarmStatus: 'test1', //	报警状态(字典code)
-      alarmStatusName: '未确认', //	报警状态(字典value)
-      alarmTime: 'test1', //	报警时间
-      alarmValue: 'test1', //	报警数值
-      createTime: 'test1', //	创建时间
-      deptId: 'test1', //	负责部门id
-      deptName: 'test1', //	负责部门
-      deviceId: 'test1', //	设备表id
-      deviceName: 'test1', //	设备名称
-      deviceNo: 'test1', //	设备编号
-      eventName: 'test1', //	事件名称
-      id: 'test11', //	主键id
-      locationId: 'test1', //	安装地点id
-      locationName: 'test1', //	安装地点
-      updateTime: 'test1', //	更新时间
-      userId: 'test1', //	负责人id
-      userName: 'test1', //	负责人
-    },
-    {
-      alarmLevel: 'test2', //	报警等级
-      alarmStatus: 'test2', //	报警状态(字典code)
-      alarmStatusName: '未确认', //	报警状态(字典value)
-      alarmTime: 'test2', //	报警时间
-      alarmValue: 'test2', //	报警数值
-      createTime: 'test2', //	创建时间
-      deptId: 'test2', //	负责部门id
-      deptName: 'test2', //	负责部门
-      deviceId: 'test2', //	设备表id
-      deviceName: 'test2', //	设备名称
-      deviceNo: 'test2', //	设备编号
-      eventName: 'test2', //	事件名称
-      id: 'test22', //	主键id
-      locationId: 'test2', //	安装地点id
-      locationName: 'test2', //	安装地点
-      updateTime: 'test2', //	更新时间
-      userId: 'test2', //	负责人id
-      userName: 'test2', //	负责人
-    },
-    ]
-  }
-  else {
-    list.value = [{
-      alarmLevel: 'test1', //	报警等级
-      alarmStatus: 'test1', //	报警状态(字典code)
-      alarmStatusName: '已确认', //	报警状态(字典value)
-      alarmTime: 'test1', //	报警时间
-      alarmValue: 'test1', //	报警数值
-      createTime: 'test1', //	创建时间
-      deptId: 'test1', //	负责部门id
-      deptName: 'test1', //	负责部门
-      deviceId: 'test1', //	设备表id
-      deviceName: 'test1', //	设备名称
-      deviceNo: 'test1', //	设备编号
-      eventName: 'test1', //	事件名称
-      id: 'test11', //	主键id
-      locationId: 'test1', //	安装地点id
-      locationName: 'test1', //	安装地点
-      updateTime: 'test1', //	更新时间
-      userId: 'test1', //	负责人id
-      userName: 'test1', //	负责人
-    },
-    {
-      alarmLevel: 'test2', //	报警等级
-      alarmStatus: 'test2', //	报警状态(字典code)
-      alarmStatusName: '已确认', //	报警状态(字典value)
-      alarmTime: 'test2', //	报警时间
-      alarmValue: 'test2', //	报警数值
-      createTime: 'test2', //	创建时间
-      deptId: 'test2', //	负责部门id
-      deptName: 'test2', //	负责部门
-      deviceId: 'test2', //	设备表id
-      deviceName: 'test2', //	设备名称
-      deviceNo: 'test2', //	设备编号
-      eventName: 'test2', //	事件名称
-      id: 'test22', //	主键id
-      locationId: 'test2', //	安装地点id
-      locationName: 'test2', //	安装地点
-      updateTime: 'test2', //	更新时间
-      userId: 'test2', //	负责人id
-      userName: 'test2', //	负责人
-    },
-    ]
-  }
+  getCurrentList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { alarmStatus: string }) => {
+      return {
+        ...item,
+        alarmStatusName: `${item.alarmStatus}` === '1' ? '未确认' : `${item.alarmStatus}` === '2' ? '已确认' : `${item.alarmStatus}` === '3' ? '已消警' : '',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -166,7 +87,7 @@
   )
     .then(() => {
       loadingTable.value = true
-      operateAlarm({ id: row.id, alarmStatus }).then((res) => {
+      operateAlarm({ ids: [row.id], alarmStatus }).then((res) => {
         ElMessage({
           type: 'success',
           message: `${title}成功`,
@@ -202,8 +123,19 @@
 })
 
 // ------------------------------------钩子----------------------------------------------------------
+watch(() => current.value, (newValue) => {
+  if (newValue === 'unconfirmed') { // 未确认
+    listQuery.value.alarmStatus = '1'
+  }
+  else { // 已确认
+    listQuery.value.alarmStatus = '2'
+  }
+  fetchData()
+}, { immediate: true })
+
 onMounted(() => {
   fetchData()
+  getLocationDetail()
 })
 </script>
 
@@ -276,19 +208,20 @@
         >
           <template #default="{ row }">
             <el-button
-              v-if="row.alarmStatusName === '未确认' && current === 'unconfirmed'"
+              v-if="row.alarmStatusName !== '已消警' && row.alarmStatusName === '未确认' && current === 'unconfirmed'"
               style="width: 70px;"
               size="small"
               type="primary"
-              @click="handleEdit(row, '1', '确认报警')"
+              @click="handleEdit(row, '2', '确认报警')"
             >
               确认报警
             </el-button>
             <el-button
+              v-if="row.alarmStatusName !== '已消警'"
               style="width: 70px;"
               size="small"
               type="danger"
-              @click="handleEdit(row, '2', '取消报警')"
+              @click="handleEdit(row, '3', '取消报警')"
             >
               取消报警
             </el-button>