diff --git a/src/views/profile/DeviceDetailsView/eventLog.vue b/src/views/profile/DeviceDetailsView/eventLog.vue
index 0797f92c..4c0e283b 100644
--- a/src/views/profile/DeviceDetailsView/eventLog.vue
+++ b/src/views/profile/DeviceDetailsView/eventLog.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="iot-child-device">
-    <div class="event-box">
+    <div v-if="eventTypeList.length > 0" class="event-box">
       <!-- 左侧事件类型列表 -->
       <div :span="4" class="event-tabs">
         <el-tabs v-model="activeEventType" style="min-height: 200px;width: 150px;height: 100%" tab-position="left" @tab-click="handleTabClick">
@@ -77,7 +77,10 @@
         />
       </div>
     </div>
-
+    <div v-else style="padding: 100px;text-align: center">
+      <i class="el-icon-s-order" style="font-size: 50px;color: #999"></i>
+      <div style="color: #909399;margin-top: 10px">暂无事件</div>
+    </div>
     <el-dialog
       :visible.sync="eventContentShow"
       class="params-eldialog"
@@ -178,6 +181,13 @@ export default {
     getDeviceLogList() {
       this.loading = true;
       this.queryParams.deviceId = this.sourceId;
+
+      // 如果activeEventType为空且有事件类型列表，则使用第一个事件类型
+      if (!this.activeEventType && this.eventTypeList.length > 0) {
+        this.activeEventType = this.eventTypeList[0].id;
+        this.activeEventObj = this.eventTypeList[0];
+      }
+
       this.queryParams.eventType = this.activeEventType;
       listDeviceEventLogList(this.queryParams).then(res => {
         this.eventList = res.data.records;
diff --git a/src/views/profile/DeviceRunStarts/index.vue b/src/views/profile/DeviceRunStarts/index.vue
index 390de54a..48e8f394 100644
--- a/src/views/profile/DeviceRunStarts/index.vue
+++ b/src/views/profile/DeviceRunStarts/index.vue
@@ -367,6 +367,9 @@ export default {
             ...response.data
           ];
         }
+        this.connection();
+      }).catch(error=>{
+        this.connection();
       });
     },
     closeWebscoket() {
@@ -394,16 +397,16 @@ export default {
     this.closeWebscoket();
   },
   watch: {
-    cmdList(val) {
-      if (val) {
-        // val.forEach((v, index) => {
-        //   this.forGetParmas(v, index);
-        // });
-        // setTimeout(this.connection, 3000);
-        // this.connection()
-        this.processAllRequests(val);
-      }
-    },
+    // cmdList(val) {
+    //   if (val) {
+    //     // val.forEach((v, index) => {
+    //     //   this.forGetParmas(v, index);
+    //     // });
+    //     // setTimeout(this.connection, 3000);
+    //     // this.connection()
+    //     this.processAllRequests(val);
+    //   }
+    // },
     realTimeData: {
       handler: function() {
         this.setListData(this.realTimeData);