diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
index 6cb948e..7c8b6ac 100644
--- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%;">
     <div class="view-header">
-      <div class="view-num">Alarm：<span>{{ alarmTotal }}</span></div>
+      <div class="view-num">Alarms：<span>{{ alarmTotal }}</span></div>
       <div>
         <a-button class="view-btn" @click="onAdd">
           <img class="icon-add" src="@/assets/images/global/add.png" alt="" />
@@ -82,28 +82,6 @@
       @cancel="onCancel"
     >
     <a-form :form="form" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
-      <a-form-item label="DB Username">
-        <a-input
-          v-decorator="[
-            'username', 
-            { 
-              rules: [{ required: true, message: 'Please input username!' }],
-              initialVale: this.formVal.username
-            }
-          ]"
-        />
-      </a-form-item>
-      <a-form-item label="DB Password">
-        <a-input
-          v-decorator="[
-            'password', 
-            { 
-              rules: [{ required: true, message: 'Please input DB Password!' }],
-              initialVale: this.formVal.password
-            }
-          ]"
-        />
-      </a-form-item>
       <a-form-item label="Name">
         <a-input
           v-decorator="[
@@ -117,7 +95,7 @@
       </a-form-item>
       <a-form-item label="DB Type">
         <j-dict-select-tag 
-          placeholder="请选择数据库类型" 
+          placeholder="Please select a database type" 
           dict-code="database_type"
           v-decorator="[
             'type', 
@@ -150,6 +128,28 @@
           ]"
         />
       </a-form-item>
+      <a-form-item label="DB Username">
+        <a-input
+          v-decorator="[
+            'username', 
+            { 
+              rules: [{ required: true, message: 'Please input username!' }],
+              initialVale: this.formVal.username
+            }
+          ]"
+        />
+      </a-form-item>
+      <a-form-item label="DB Password">
+        <a-input
+          v-decorator="[
+            'password', 
+            { 
+              rules: [{ required: true, message: 'Please input DB Password!' }],
+              initialVale: this.formVal.password
+            }
+          ]"
+        />
+      </a-form-item>
     </a-form>
       <template slot="footer">
         <a-space class="operators" :size="20">
@@ -180,6 +180,10 @@ const columns = [
     title: 'IP ADDRESS',
     align: 'left',
     dataIndex: 'ipAddress'
+  },{
+    title: 'DB TYPE',
+    align: 'left',
+    dataIndex: 'type'
   },{
     title: 'PROT',
     align: 'left',
diff --git a/src/views/abnormalAlarm/emailMonitor/overview/index.vue b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
index 4d6fda4..f0d941c 100644
--- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%;">
     <div class="view-header">
-      <div class="view-num">Alarm：<span>{{ alarmTotal }}</span></div>
+      <div class="view-num">Alarms：<span>{{ alarmTotal }}</span></div>
       <div>
         <a-button class="view-btn" @click="onAdd">
           <img class="icon-add" src="@/assets/images/global/add.png" alt="" />
@@ -84,7 +84,7 @@
       v-model="visible" 
       @cancel="onCancel"
     >
-    <a-form :form="form" :label-col="{ span: 9 }" :wrapper-col="{ span: 14 }">
+    <a-form :form="form" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
       <a-form-item label="Name">
         <a-input
           v-decorator="[
@@ -96,7 +96,7 @@
           ]"
         />
       </a-form-item>
-      <a-form-item label="Email Servier Address">
+      <a-form-item label="Server Address">
         <a-input
           v-decorator="[
             'emailServerAddress', 
@@ -129,9 +129,9 @@
           ]"
         />
       </a-form-item>
-      <a-form-item label="Emil Type">
+      <a-form-item label="Email Type">
         <j-dict-select-tag
-          placeholder="请选择邮箱类型" 
+          placeholder="Please select an email type" 
           dict-code="email_type"
           v-decorator="[
             'emilType', 
@@ -142,7 +142,7 @@
           ]"
         />
       </a-form-item>
-      <a-form-item label="Station">
+      <a-form-item label="Enable or not">
         <a-select 
           v-decorator="[
             'enabled', 
@@ -152,10 +152,10 @@
             }
           ]"
         >
-          <a-select-option value="1">
+          <a-select-option :value="1">
             Enable
           </a-select-option>
-          <a-select-option value="0">
+          <a-select-option :value="0">
             Disabled
           </a-select-option>
         </a-select>
@@ -197,6 +197,10 @@ const columns = [
     scopedSlots: {
       customRender: 'status'
     }
+  },{
+    title: 'ENABLE OR NOT',
+    align: 'left',
+    dataIndex: 'enabled'
   },{
     title: 'E-MAIL',
     align: 'left',
@@ -324,7 +328,7 @@ export default {
         getAction("/sysEmail/findInfo", {id:this.currentId}).then(res => {
           if (res.success) {
             this.form.setFieldsValue({
-              name: res.result.username,
+              name: res.result.name,
               emailServerAddress: res.result.emailServerAddress,
               username: res.result.username,
               password: res.result.password,
diff --git a/src/views/abnormalAlarm/serverMonitor/overview/index.vue b/src/views/abnormalAlarm/serverMonitor/overview/index.vue
index 7902cce..e80be23 100644
--- a/src/views/abnormalAlarm/serverMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/serverMonitor/overview/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%;">
     <div class="view-header">
-      <div class="view-num">Alarm：<span>{{ alarmTotal }}</span></div>
+      <div class="view-num">Alarms：<span>{{ alarmTotal }}</span></div>
       <div>
         <a-button class="view-btn" @click="onAdd">
           <img class="icon-add" src="@/assets/images/global/add.png" alt="" />
@@ -116,7 +116,7 @@
 </template>
 
 <script>
-import TableList from '../../components/tableList.vue';
+import TableList from '../../components/tableList.vue'
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [
   {