diff --git a/src/views/pages/dashboard/dashboard-edit.vue b/src/views/pages/dashboard/dashboard-edit.vue
index 434c9b7c7db2c8927bcc5ea42c4e7ce862f08004..b6cbe5944bb6ce36f204febec0f5fe9eff7696b9 100644
--- a/src/views/pages/dashboard/dashboard-edit.vue
+++ b/src/views/pages/dashboard/dashboard-edit.vue
@@ -295,13 +295,16 @@ export default {
     addHistory(isActive, isFallback) {
       //给恢复队列增加历史数据
       const dashboardData = this.$utils.deepClone(this.dashboard);
-      dashboardData.widgetList.forEach(widget => {
-        for (let key in widget) {
-          if (key.startsWith('_')) {
-            this.$delete(widget, key);
+      if (dashboardData && dashboardData.widgetList && dashboardData.widgetList.length > 0) {
+        dashboardData.widgetList.forEach(widget => {
+          for (let key in widget) {
+            if (key.startsWith('_')) {
+              this.$delete(widget, key);
+            }
           }
-        }
-      });
+        });
+      }
+   
       //如果已经是恢复途中，则把isInUse后面的数据先清除再Push
       const inUseIndex = this.recoverQueue.findIndex(d => d.isInUse);
       if (inUseIndex > -1) {
@@ -404,14 +407,16 @@ export default {
       const newWidget = this.$utils.deepClone(widget);
       let maxI = 0;
       let maxY = 0;
-      this.dashboard.widgetList.forEach(element => {
-        if (maxI < element.i) {
-          maxI = element.i;
-        }
-        if (maxY < element.y) {
-          maxY = element.y;
-        }
-      });
+      if (this.dashboard && this.dashboard.widgetList && this.dashboard.widgetList.length > 0) {
+        this.dashboard.widgetList.forEach(element => {
+          if (maxI < element.i) {
+            maxI = element.i;
+          }
+          if (maxY < element.y) {
+            maxY = element.y;
+          }
+        });
+      }
       newWidget.name = newWidget.name + '_copy';
       newWidget.i = maxI + 1;
       newWidget.x = 0;
@@ -419,20 +424,30 @@ export default {
       newWidget._selected = false;
       newWidget.uuid = this.$utils.setUuid(); //前端使用uuid作为唯一标识
       this.addHistory(true);
+      if (this.$utils.isEmpty(this.dashboard)) {
+        this.dashboard = {
+          name: '',
+          isActive: 1,
+          widgetList: []
+        };
+      } else if (!this.dashboard.hasOwnProperty('widgetList')) {
+        this.$set(this.dashboard, 'widgetList', []);
+      } 
       this.dashboard.widgetList.push(newWidget);
     },
     addWidget(widget) {
       let maxI = 0;
       let maxY = 0;
-      this.dashboard.widgetList.forEach(element => {
-        if (maxI < element.i) {
-          maxI = element.i;
-        }
-        if (maxY < element.y) {
-          maxY = element.y;
-        }
-      });
-
+      if (this.dashboard && this.dashboard.widgetList && this.dashboard.widgetList.length > 0) {
+        this.dashboard.widgetList.forEach(element => {
+          if (maxI < element.i) {
+            maxI = element.i;
+          }
+          if (maxY < element.y) {
+            maxY = element.y;
+          }
+        });
+      }
       const newWidget = {
         type: widget.type,
         w: widget.width,
@@ -452,6 +467,15 @@ export default {
       }
       newWidget.uuid = this.$utils.setUuid(); //前端使用uuid作为唯一标识
       this.addHistory(true);
+      if (this.$utils.isEmpty(this.dashboard)) {
+        this.dashboard = {
+          name: '',
+          isActive: 1,
+          widgetList: []
+        };
+      } else if (!this.dashboard.hasOwnProperty('widgetList')) {
+        this.$set(this.dashboard, 'widgetList', []);
+      }
       this.dashboard.widgetList.push(newWidget);
     },
     fullscreen() {
diff --git a/src/views/pages/dashboard/dashboard-manage.vue b/src/views/pages/dashboard/dashboard-manage.vue
index a585162a55938d726d852ac31749fc63678403e0..bcc07877dccf84736f50ae4b62741a50f23c177c 100644
--- a/src/views/pages/dashboard/dashboard-manage.vue
+++ b/src/views/pages/dashboard/dashboard-manage.vue
@@ -54,7 +54,7 @@
           </template>
           <template slot-scope="{ row }">
             <div class="dashbord-overview" @click="toDashboard('detail', row.id)">
-              <widget-overview v-if="row.widgetList.length > 0" :widgetList="row.widgetList"></widget-overview>
+              <widget-overview v-if="row.widgetList && row.widgetList.length > 0" :widgetList="row.widgetList"></widget-overview>
               <div class="slider-container text-op">
                 <div>{{ row.description }}</div>
                 <div class="icon-enter tsfont-search"></div>