diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue
index 338779b..bb66e5a 100644
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@@ -14,19 +14,19 @@
                     </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-for="i in selectSecnesList" :key="i.sceneId"
-                              :command="{router:i.router,name:i.sceneName}">{{
+                              :command="{router:i.router,name:i.sceneName,sceneId:i.sceneId}">{{
                 i.sceneName
               }}
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <div :class="`menu ${nowMenu==='3'? 'menuClick' :''}`" style="left: 16%" @click="toLink('equipmentMonitoring')">
+      <div :class="`menu ${nowMenu==='3'? 'menuClick' :''}`" style="left: 16%" @click="toLink('equipment')">
                 <span>
                     设备监测
                 </span>
       </div>
-      <div :class="`menu ${nowMenu==='4'? 'menuClick' :''}`" style="left: 23%" @click="toLink('senso')">
+      <div :class="`menu ${nowMenu==='4'? 'menuClick' :''}`" style="left: 23%" @click="toLink('equipmentMonitoring')">
                 <span>
                     传感器汇总
                 </span>
@@ -66,9 +66,8 @@ export default {
   },
 
   async mounted() {
-
     await this.setSelectSecnes()
-    if (this.$route.name === 'SmartScene'||this.$route.name === 'GPS' ) {
+    if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS') {
       if (this.$route.query?.name) {
         this.name = this.$route.query?.name
       } else {
@@ -89,9 +88,12 @@ export default {
     async setSelectSecnes() {
       const {data} = await selectSecnes()
       this.selectSecnesList = data
-      let defaultSceneId = data.find(e => e.defaultFlag === '1').sceneId
-      this.sceneId = defaultSceneId
-      this.$emit('sceneIdChange',defaultSceneId);
+      if (!this.$route.query.name) {
+        this.sceneId = data.find(e => e.defaultFlag === '1').sceneId
+      }else{
+        this.sceneId = data.find(e => e.sceneName === this.$route.query.name).sceneId
+      }
+      this.$emit('sceneIdChange', this.sceneId);
     },
     // sceneIdChange(){
     //
@@ -101,6 +103,7 @@ export default {
     },
     dropdownLink(e) {
       this.name = e.name
+      this.$emit('sceneIdChange', e.sceneId);
       this.$router.push({path: "/board/" + (e.router || 'smartScene'), query: {name: e.name}});
     },
     toIndex() {
diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index bbeeaac..5e0ff9c 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -70,7 +70,7 @@
           </div>
           <div class="btn">
             <div class="btnC" style="top: 50%">
-              <el-button type="primary">详细信息</el-button>
+              <el-button type="primary" @click="toHistory">历史记录</el-button>
             </div>
           </div>
 
@@ -109,6 +109,7 @@ export default {
     }
   },
   async mounted() {
+    setInterval(this.getDevice,30*1000)
   },
   methods: {
     sceneIdChange(e){
@@ -166,6 +167,9 @@ export default {
     async setMonitorById() {
       const {data} = await getMonitorById(this.sceneId)
       this.MonitorInfo = data
+    },
+    toHistory(){
+      this.$router.push({path: "/board/senso"});
     }
   }
 };
diff --git a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
index e50181a..9b027f7 100644
--- a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
+++ b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div class="centerImg"></div>
-    <BoardTopNav  @sceneIdChange="sceneIdChange" nowMenu="3"></BoardTopNav>
+    <BoardTopNav  @sceneIdChange="sceneIdChange" nowMenu="4"></BoardTopNav>
     <div class="leftMenu">
       <div v-for="i in deviceList" class="item">
         <span>{{ i.deviceModeName }}</span>
@@ -65,6 +65,15 @@
             label="voltage"
             prop="voltage">
           </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                @click="toHistory"
+              >修改</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div ref="pagination" style="margin-top: 12px;height: 36px;">
@@ -137,6 +146,9 @@ export default {
         "sceneId": this.sceneId,
       })
       this.deviceList = data
+    },
+    toHistory(){
+      this.$router.push({path: "/board/senso"});
     }
   }
 };
diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue
index 17bc588..3222f6b 100644
--- a/ruoyi-ui/src/views/board/smartScene/index.vue
+++ b/ruoyi-ui/src/views/board/smartScene/index.vue
@@ -49,10 +49,10 @@
             <div class="scrollTable" style="width: 15%">
               {{ item.data3 }}
             </div>
-            <div class="scrollTable" style="width: 30%">
+            <div class="scrollTable" style="width: 20%">
               {{ item.data4 }}
             </div>
-            <div class="scrollTable" style="width: 11%">
+            <div class="scrollTable" style="width: 21%">
               {{ item.data5 }}
             </div>
             <div class="scrollTable" style="width: 20%">
@@ -164,13 +164,14 @@ export default {
       const {rows: data} = await getAlarmInfos()
       console.log(data)
       this.table1Data = data.map((e,i)=>{
+        console.log(e)
         return {
-          data1: i,
+          data1: i+1,
           data2: e.alarmLevelName,
           data3: e.alarmTypeName,
-          data4: '无线检测 检测值为 21° - 25°',
+          data4:e.remark,
           data5: e.monitorUnitName,
-          data6: '2021.01.01 00:00:00',
+          data6: e.alarmTime,
         }
       })
     }