diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
index 2177b1f..060d103 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
@@ -240,7 +240,10 @@ export default {
   data() {
     return {
       stationOptions: [],
-      paramsArg: {},
+      paramsArg: {
+        startDate: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endDate: dateFormat(new Date(), 'yyyy-MM-dd')
+      },
       columns,
       columns_info,
       dataSource: [],
diff --git a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
index b57dc0a..8c644b5 100644
--- a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
@@ -90,28 +90,23 @@ const columns = [
     title: 'NUCLIDE',
     align: 'center',
     dataIndex: 'nuclide',
-    // width: 200,
   },{
     title: 'VALUE',
     align: 'center',
     dataIndex: 'val',
-    // width: 200,
-  },{
-    title: 'CYCLE',
-    align: 'center',
-    dataIndex: 'cycle',
-    // width: 200,
   },{
     title: 'SOURCE TYPE',
     align: 'center',
     dataIndex: 'datasource',
-    // width: 200,
   },{
     title: 'CACL DATE',
     align: 'center',
     dataIndex: 'caclDate',
-    // width: 200,
-  },
+  },{
+    title: 'CYCLE',
+    align: 'center',
+    dataIndex: 'cycle'
+  }
 ]
 export default {
   components: {
diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
index 7ae40f5..da1c710 100644
--- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
@@ -168,55 +168,55 @@ import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [
   {
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name'
   },{
     title: 'STATUS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'online',
     scopedSlots: {
       customRender: 'status'
     }
   },{
     title: 'IP ADDRESS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'ipAddress'
   },{
     title: 'DB TYPE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'type'
   },{
     title: 'PROT',
-    align: 'left',
+    align: 'center',
     dataIndex: 'port'
   },{
     title: 'SLOW QUERY',
-    align: 'left',
+    align: 'center',
     dataIndex: 'slowQuery' 
   },{
     title: 'ALARMS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarms',
     scopedSlots: {
       customRender: 'alarms',
     }
   },{
     title: 'CPU UTILIZATION',
-    align: 'left',
+    align: 'center',
     dataIndex: 'cpuUutilzation',
     scopedSlots: {
       customRender: 'cpu',
     }
   },{
     title: 'MEMORY USAGE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'memoryUsage',
     scopedSlots: {
       customRender: 'memory',
     }
   },{
     title: 'DISK USAGE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'diskUsage',
     scopedSlots: {
       customRender: 'disk',
diff --git a/src/views/abnormalAlarm/emailMonitor/instances/index.vue b/src/views/abnormalAlarm/emailMonitor/instances/index.vue
index 8df571c..b4dc70e 100644
--- a/src/views/abnormalAlarm/emailMonitor/instances/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/instances/index.vue
@@ -128,69 +128,6 @@
 </template>
 
 <script>
-var data1 = [];
-var dataCount = 24;
-var startTime = +new Date();
-console.log("startTime",startTime);
-var categories = ['email'];
-var types = [
-  { name: 'num', color: '#0aaf25' },
-];
-var legendData = types.map(item=>{
-  return item.name
-})
-// Generate mock data
-categories.forEach((category, index) => {
-  var baseTime = startTime;
-  for (var i = 0; i < dataCount; i++) {
-    var typeItem = types[0];
-    var duration = Math.round(Math.random() * 10000);
-    data1.push({
-      name: typeItem.name,
-      value: [index, baseTime, (baseTime += duration), duration],
-      itemStyle: {
-        normal: {
-          color: typeItem.color
-        }
-      }
-    });
-    baseTime += Math.round(Math.random() * 2000);
-  }
-});
-function renderItem1(params, api) {
-  console.log("params",params);
-  console.log("api",api);
-  var categoryIndex = api.value(0);
-  var start = api.coord([api.value(1), categoryIndex]);
-  var end = api.coord([api.value(2), categoryIndex]);
-  var height = api.size([0, 1])[1] * 1;
-  console.log(categoryIndex);
-  console.log(start);
-  console.log(end);
-  console.log(height);
-  var rectShape = echarts.graphic.clipRectByRect(
-    {
-      x: start[0],
-      y: start[1] - height / 2,
-      width: end[0] - start[0],
-      height: height
-    },
-    {
-      x: params.coordSys.x,
-      y: params.coordSys.y,
-      width: params.coordSys.width,
-      height: params.coordSys.height
-    }
-  );
-  return (
-    rectShape && {
-      type: 'rect',
-      transition: ['shape'],
-      shape: rectShape,
-      style: api.style()
-    }
-  );
-}
 import moment from 'moment';
 import * as echarts from 'echarts'
 import BoxTitle from '../../components/boxTitle.vue';
@@ -603,60 +540,6 @@ export default {
         this.guageStore.resize();
       });
     },
-    drawTimeline() {
-      this.timeLine = echarts.init(document.getElementById("timeLine"))
-      let option = {
-        color:['#0aaf25'],
-        tooltip: {
-          formatter: function (params) {
-            return params.marker + params.name + ': ' + params.value[3] + ' ms';
-          }
-        },
-        grid: {
-          left: '10%',
-          right: '10%',
-          bottom: '0',
-          top:15,
-          height: 32,
-          containLabel: false,
-          show: true
-        },
-        xAxis: {
-          min: startTime,
-          axisLabel: {
-            color: "#ade6ee",
-            fontSize: 14,
-            formatter: function (val) {
-              console.log("valvalvalval",val);
-              return Math.max(0, val - startTime) + ' ms';
-            }
-          },
-          splitLine: {
-            show: false
-          }
-        },
-        yAxis: {
-          show:false,
-          data: categories
-        },
-        series: [
-          { name: legendData[0], type: 'bar', data: [] },
-          {
-            type: 'custom',
-            renderItem: renderItem1,
-            encode: {
-              x: [1, 2],
-              y: 0
-            },
-            data: data1
-          }
-        ]
-      }
-      this.timeLine.setOption(option)
-      window.addEventListener("resize", function () {
-        this.timeLine.resize();
-      });
-    },
     drawAreaMail() {
       this.areaMailLine = echarts.init(document.getElementById("mailArea"))
       let option = {
diff --git a/src/views/abnormalAlarm/emailMonitor/overview/index.vue b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
index f3add93..9ae3205 100644
--- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
@@ -195,57 +195,63 @@ import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [
   {
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name'
   },{
     title: 'STATUS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'online',
     scopedSlots: {
       customRender: 'status'
     }
   },{
+<<<<<<< Updated upstream
     title: 'ENABLE',
     align: 'left',
     dataIndex: 'enabled',
     scopedSlots: {
       customRender: 'enabled'
     }
+=======
+    title: 'ENABLE OR NOT',
+    align: 'center',
+    dataIndex: 'enabled'
+>>>>>>> Stashed changes
   },{
     title: 'E-MAIL',
-    align: 'left',
+    align: 'center',
     dataIndex: 'emailServerAddress'
   },{
     title: "TODAY'S TOTAL",
-    align: 'left',
+    align: 'center',
     dataIndex: 'today',
     scopedSlots: {
       customRender: 'today'
     }
   },{
     title: "YESTERDAY'S TOTAL",
-    align: 'left',
+    align: 'center',
     dataIndex: 'yesterday',
     scopedSlots: {
       customRender: 'yesterday'
     }
   },{
     title: "WEEKLY TOTAL",
-    align: 'left',
+    align: 'center',
     dataIndex: 'weekly',
     scopedSlots: {
       customRender: 'weekly'
     }
   },{
     title: 'ALARMS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarms',
     scopedSlots: {
       customRender: 'alarms',
     }
   },{
     title: "STOER CAPACITY",
-    align: 'left',
+    align: 'center',
     dataIndex: 'stoerCapacity',
     scopedSlots: {
       customRender: 'stoer',
diff --git a/src/views/abnormalAlarm/serverMonitor/overview/index.vue b/src/views/abnormalAlarm/serverMonitor/overview/index.vue
index aa42a22..8069dce 100644
--- a/src/views/abnormalAlarm/serverMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/serverMonitor/overview/index.vue
@@ -122,43 +122,43 @@ import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [
   {
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name'
   },{
     title: 'STATUS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'serverInfo',
     scopedSlots: {
       customRender: 'status'
     }
   },{
     title: 'IP ADDRESS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'ipAddress'
   },{
     title: 'ALARMS',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarms',
     scopedSlots: {
       customRender: 'alarms',
     }
   },{
     title: 'CPU UTILIZATION',
-    align: 'left',
+    align: 'center',
     dataIndex: 'cpuUutilzation',
     scopedSlots: {
       customRender: 'cpu',
     }
   },{
     title: 'MEMORY USAGE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'memoryUsage',
     scopedSlots: {
       customRender: 'memory',
     }
   },{
     title: 'DISK USAGE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'diskUsage',
     scopedSlots: {
       customRender: 'disk',