diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index a2e226a..aa58e6f 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -78,7 +78,7 @@
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
+          :page-sizes="[10,15,20,30]"
           :page-size="listQuery.limit"
           :total="total"
           class="table-bottom"
@@ -520,19 +520,19 @@
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" >
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
@@ -590,7 +590,7 @@
   }
   #map {
     width:100%;
-    height: 80vh;
+    height: 72vh;
     border-top: 12px solid #ebebeb;
   }
   /deep/ .el-table--scrollable-y .el-table__body-wrapper{

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index a2e226a..aa58e6f 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -78,7 +78,7 @@
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
+          :page-sizes="[10,15,20,30]"
           :page-size="listQuery.limit"
           :total="total"
           class="table-bottom"
@@ -520,19 +520,19 @@
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" >
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
@@ -590,7 +590,7 @@
   }
   #map {
     width:100%;
-    height: 80vh;
+    height: 72vh;
     border-top: 12px solid #ebebeb;
   }
   /deep/ .el-table--scrollable-y .el-table__body-wrapper{
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index b9f9f07..c043833 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -356,7 +356,7 @@
   #map {
     border-top: 12px solid #ebebeb;
     width:100%;
-    height:72vh;
+    height:67.5vh;
   }
   .my-div-icon {
     width: 10px;

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index a2e226a..aa58e6f 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -78,7 +78,7 @@
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
+          :page-sizes="[10,15,20,30]"
           :page-size="listQuery.limit"
           :total="total"
           class="table-bottom"
@@ -520,19 +520,19 @@
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" >
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
@@ -590,7 +590,7 @@
   }
   #map {
     width:100%;
-    height: 80vh;
+    height: 72vh;
     border-top: 12px solid #ebebeb;
   }
   /deep/ .el-table--scrollable-y .el-table__body-wrapper{
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index b9f9f07..c043833 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -356,7 +356,7 @@
   #map {
     border-top: 12px solid #ebebeb;
     width:100%;
-    height:72vh;
+    height:67.5vh;
   }
   .my-div-icon {
     width: 10px;
diff --git a/src/views/overview/trailStatic.vue b/src/views/overview/trailStatic.vue
index 7f49888..c6543fc 100644
--- a/src/views/overview/trailStatic.vue
+++ b/src/views/overview/trailStatic.vue
@@ -9,7 +9,7 @@
 
 <script>
 import { speedLine } from '@/api/overview'
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 export default {
   name: 'TrailStatic',
   data() {
@@ -107,25 +107,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
+  /deep/ .el-dialog__body{
+    padding: 30px 0;
   }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index a2e226a..aa58e6f 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -78,7 +78,7 @@
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
+          :page-sizes="[10,15,20,30]"
           :page-size="listQuery.limit"
           :total="total"
           class="table-bottom"
@@ -520,19 +520,19 @@
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" >
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
@@ -590,7 +590,7 @@
   }
   #map {
     width:100%;
-    height: 80vh;
+    height: 72vh;
     border-top: 12px solid #ebebeb;
   }
   /deep/ .el-table--scrollable-y .el-table__body-wrapper{
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index b9f9f07..c043833 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -356,7 +356,7 @@
   #map {
     border-top: 12px solid #ebebeb;
     width:100%;
-    height:72vh;
+    height:67.5vh;
   }
   .my-div-icon {
     width: 10px;
diff --git a/src/views/overview/trailStatic.vue b/src/views/overview/trailStatic.vue
index 7f49888..c6543fc 100644
--- a/src/views/overview/trailStatic.vue
+++ b/src/views/overview/trailStatic.vue
@@ -9,7 +9,7 @@
 
 <script>
 import { speedLine } from '@/api/overview'
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 export default {
   name: 'TrailStatic',
   data() {
@@ -107,25 +107,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
+  /deep/ .el-dialog__body{
+    padding: 30px 0;
   }
 </style>
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index b208d0e..012d65b 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -457,6 +457,3 @@
     }
   }
 </style>
-<style lang="scss" scoped>
-
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..6b331ca 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,37 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params = '?token=' + this.$store.getters.token
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params
+        } else {
+          window.open(command.url + params, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +136,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..77035f4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,6 +6,7 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
@@ -16,6 +17,7 @@
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarm/editCarThreshold.vue b/src/views/alarm/editCarThreshold.vue
index 18186e5..32b02f2 100644
--- a/src/views/alarm/editCarThreshold.vue
+++ b/src/views/alarm/editCarThreshold.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body width="700px">
-    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" label-position="right" label-width="180px">
+    <el-form ref="dataForm" :rules="rules" :model="thresholdForm" size="small" label-position="right" label-width="180px">
       <el-row :gutter="20">
         <el-col :span="16" offset="4">
           <el-form-item label="设备离线时长（分钟）" prop="offlineTime">
@@ -31,8 +31,8 @@
       </el-row>
     </el-form>
     <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
-      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
-      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+      <el-button type="primary" style="width: 100px;font-size: 16px;" size="small" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" size="small" @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -162,25 +162,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
+
 </style>
diff --git a/src/views/alarm/listCarThreshold.vue b/src/views/alarm/listCarThreshold.vue
index a102517..6674886 100644
--- a/src/views/alarm/listCarThreshold.vue
+++ b/src/views/alarm/listCarThreshold.vue
@@ -1,61 +1,41 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-          </el-form-item>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+    </search-area>
 
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-              <el-option
-                v-for="item in cartypelist"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        </el-form>
-    </el-form></div>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="edit(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+
     <!--编辑资源的对话框-->
     <edit-car-threshold v-show="dialogFormVisible" ref="editCarThreshold" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarThreshold from '@/views/alarm/editCarThreshold'
@@ -74,7 +54,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -177,22 +157,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listData.vue b/src/views/alarm/listData.vue
index ea8ae5e..76d6992 100644
--- a/src/views/alarm/listData.vue
+++ b/src/views/alarm/listData.vue
@@ -1,56 +1,63 @@
-<template xmlns:align="">
-  <div class="app-container">
+<template>
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="timeRange"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
-    <div ref="chart" :style="{height: '400px'}"/>
-    <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row[dept.deptId] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container" style="margin-bottom: 80px" >
-      <el-pagination
-        v-show="total>listQuery.limit && list.length!==0"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          :picker-options="pickerOptions"
+          :clearable="false"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          size="small"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </search-item>
+    </search-area>
+    <el-row :gutter="20" class="data-row">
+      <el-col :span="12">
+        <div ref="chart" :style="{height: '450px'}" class="chart-container"/>
+      </el-col>
+      <el-col :span="12" style="padding-right: 30px" >
+        <div class="table-col">
+          <!--查询结果Table显示-->
+          <el-table v-loading="listLoading" v-if="list.length!==0" :data="bottomlist" class="table" size="small" max-height="400" border @selection-change="handleSelectionChange">
+            <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="column.class">{{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ scope.row[dept.deptId] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <div class="pagination-container" style="margin-bottom: 80px" >
+            <el-pagination
+              v-show="total>listQuery.limit && list.length!==0"
+              :current-page="listQuery.offset"
+              :page-sizes="[15,20,30]"
+              :page-size="listQuery.limit"
+              :total="total"
+              align="center"
+              layout="total, sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </div>
+
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { getDataList } from '@/api/alarm'
 export default {
   name: 'ListData',
@@ -89,7 +96,7 @@
         startDate: '',
         endDate: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -172,7 +179,18 @@
           var item = {
             name: this.deptList[j].deptName,
             type: 'line',
-            data: nums
+            data: nums,
+            markPoint: {
+              data: [
+                { type: 'max', name: '最大值' },
+                { type: 'min', name: '最小值' }
+              ]
+            },
+            markLine: {
+              data: [
+                { type: 'average', name: '平均值' }
+              ]
+            }
           }
           series.push(item)
         }
@@ -286,16 +304,17 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
+
   .table{
     margin-bottom: 20px;
+    margin-top: 40px;
   }
-  .pagination-container{
-    margin-bottom: 100px;
+  .data-row{
+    border-top: 12px solid #ebebeb;
+  }
+  .chart-container{
+    padding-top: 20px;
+    padding-left: 20px;
+    padding-right: 10px;
   }
 </style>
diff --git a/src/views/alarm/listOffline.vue b/src/views/alarm/listOffline.vue
index 757dd30..e61fad0 100644
--- a/src/views/alarm/listOffline.vue
+++ b/src/views/alarm/listOffline.vue
@@ -1,48 +1,29 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="车辆单位" clearable value=""/>
-        </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="车辆单位" clearable value=""/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 <script>
 import { getOffineList, exportOffline } from '@/api/alarm'
@@ -59,7 +40,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -166,22 +147,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/alarm/listRecord.vue b/src/views/alarm/listRecord.vue
index a992fa1..e2fe8e0 100644
--- a/src/views/alarm/listRecord.vue
+++ b/src/views/alarm/listRecord.vue
@@ -1,90 +1,71 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model.trim="listQuery.description" placeholder="车辆描述" clearable/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-input v-model="listQuery.carCode" placeholder="车牌号" clearable/>
-        </el-form-item>
-
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in cartypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmType" :dept-show="deptShow" placeholder="报警类型" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmtypelist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" placeholder="报警原因" clearable value="" @change="fetchData()">
-            <el-option
-              v-for="item in alarmreasonlist"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="selectForm-container-item" prop="keywords">
-          <el-date-picker
-            v-model="dateTimeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-form-item>
-
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-        <el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>
-      </el-form>
-    </div>
+    <search-area size="small" type="seperate" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.description" placeholder="车辆描述" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.carCode" placeholder="车牌号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.carType" filterable placeholder="车辆类型" size="small" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in cartypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" size="small" placeholder="使用单位" clearable value=""/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmType" :dept-show="deptShow" size="small" placeholder="报警类型" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmtypelist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.alarmReason" :dept-show="deptShow" size="small" placeholder="报警原因" clearable value="" @change="fetchData()">
+          <el-option
+            v-for="item in alarmreasonlist"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateTimeRange"
+          type="datetimerange"
+          size="small"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border style="margin-top: 20px" @selection-change="handleSelectionChange">
-      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span :class="column.class">{{ scope.row[column.value] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="80" align="center">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[15,20,30]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
+    <normal-table :data="list" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" class="table" border size="small" @selection-change="handleSelectionChange" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" icon="el-icon-receiving" @click="batchExport">导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="80" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
     <!--编辑资源的对话框-->
     <detail-record v-show="dialogFormVisible" ref="detailRecord"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import detailRecord from '@/views/alarm/detailRecord'
@@ -108,7 +89,7 @@
         startTime: '',
         endTime: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [{
         text: '车辆描述',
@@ -260,13 +241,20 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.table{
-  margin-bottom: 20px;
-}
 </style>
diff --git a/src/views/carinfo/editCarInfo.vue b/src/views/carinfo/editCarInfo.vue
index c115f65..3d7aef8 100644
--- a/src/views/carinfo/editCarInfo.vue
+++ b/src/views/carinfo/editCarInfo.vue
@@ -337,28 +337,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 15px;
-  }
-  .el-dialog{
-    width:700px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/editGpsDevice.vue b/src/views/carinfo/editGpsDevice.vue
index 9c177e5..3f486c9 100644
--- a/src/views/carinfo/editGpsDevice.vue
+++ b/src/views/carinfo/editGpsDevice.vue
@@ -156,25 +156,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
 </style>
diff --git a/src/views/carinfo/listCarInfo.vue b/src/views/carinfo/listCarInfo.vue
index d54303c..c09b1ef 100644
--- a/src/views/carinfo/listCarInfo.vue
+++ b/src/views/carinfo/listCarInfo.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -209,16 +209,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/carinfo/listGpsDevice.vue b/src/views/carinfo/listGpsDevice.vue
index 0f6455f..b524031 100644
--- a/src/views/carinfo/listGpsDevice.vue
+++ b/src/views/carinfo/listGpsDevice.vue
@@ -59,7 +59,7 @@
         carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -214,21 +214,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  $tableTitleHeight:45px;
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
   .edit_btns{
     padding-top: 8px;
     .edit_btn{
@@ -236,16 +221,4 @@
       margin:0px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
 </style>
diff --git a/src/views/fence/listFence.vue b/src/views/fence/listFence.vue
index 2bb6878..33483c9 100644
--- a/src/views/fence/listFence.vue
+++ b/src/views/fence/listFence.vue
@@ -70,7 +70,7 @@
         fenceType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -200,16 +200,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index 91bed41..7c46e5d 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -66,7 +66,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -163,16 +163,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/mile/listTime.vue b/src/views/mile/listTime.vue
index f4f8613..30f9edc 100644
--- a/src/views/mile/listTime.vue
+++ b/src/views/mile/listTime.vue
@@ -91,7 +91,7 @@
         // carType: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {
@@ -191,16 +191,16 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index a2e226a..aa58e6f 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -78,7 +78,7 @@
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
-          :page-sizes="[15,20,30]"
+          :page-sizes="[10,15,20,30]"
           :page-size="listQuery.limit"
           :total="total"
           class="table-bottom"
@@ -520,19 +520,19 @@
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" >
-  .el-table__header tr,
-  .el-table__header th {
-    padding: 0;
-    height: 40px;
-    background-color: #f8f8f8;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 100px;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /*.el-table__header tr,*/
+  /*.el-table__header th {*/
+    /*padding: 0;*/
+    /*height: 40px;*/
+    /*background-color: #f8f8f8;*/
+  /*}*/
+  /*.table{*/
+    /*margin-bottom: 20px;*/
+  /*}*/
+  /*.pagination-container{*/
+    /*margin-bottom: 100px;*/
+  /*}*/
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
@@ -590,7 +590,7 @@
   }
   #map {
     width:100%;
-    height: 80vh;
+    height: 72vh;
     border-top: 12px solid #ebebeb;
   }
   /deep/ .el-table--scrollable-y .el-table__body-wrapper{
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index b9f9f07..c043833 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -356,7 +356,7 @@
   #map {
     border-top: 12px solid #ebebeb;
     width:100%;
-    height:72vh;
+    height:67.5vh;
   }
   .my-div-icon {
     width: 10px;
diff --git a/src/views/overview/trailStatic.vue b/src/views/overview/trailStatic.vue
index 7f49888..c6543fc 100644
--- a/src/views/overview/trailStatic.vue
+++ b/src/views/overview/trailStatic.vue
@@ -9,7 +9,7 @@
 
 <script>
 import { speedLine } from '@/api/overview'
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 export default {
   name: 'TrailStatic',
   data() {
@@ -107,25 +107,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight: 40px;
-  .el-form-item {
-    margin-bottom: 22px;
-  }
-  .el-select{
-    width: 100%;
-  }
-  .table-title {
-    background-color: rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header {
-      line-height: $tableTitleHeight;
-      color: #606266;
-      font-size: 14px;
-      font-weight: bold;
-      i {
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
+  /deep/ .el-dialog__body{
+    padding: 30px 0;
   }
 </style>
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index b208d0e..012d65b 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -457,6 +457,3 @@
     }
   }
 </style>
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/route/listRoute.vue b/src/views/route/listRoute.vue
index ea9abc2..c49ad11 100644
--- a/src/views/route/listRoute.vue
+++ b/src/views/route/listRoute.vue
@@ -51,7 +51,7 @@
         mainRoad: '',
         deptId: '',
         offset: 1,
-        limit: 15
+        limit: 20
       }, // 查询条件
       columns: [
         {