diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>
diff --git a/src/views/overview/track.vue b/src/views/overview/track.vue
index 8d977b7..424fa11 100644
--- a/src/views/overview/track.vue
+++ b/src/views/overview/track.vue
@@ -14,13 +14,13 @@
               <el-radio label="30">30秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="4" style="padding-top: 10px">
+          <el-col :span="4" :offset="2" style="padding-top: 10px">
             <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -176,9 +176,10 @@
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
-    top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    /*left:500px;*/
+    top: 10px;
+    right: 0;
+    background-color: #ffffff;
   }
   #map {
     width:100%;

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>
diff --git a/src/views/overview/track.vue b/src/views/overview/track.vue
index 8d977b7..424fa11 100644
--- a/src/views/overview/track.vue
+++ b/src/views/overview/track.vue
@@ -14,13 +14,13 @@
               <el-radio label="30">30秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="4" style="padding-top: 10px">
+          <el-col :span="4" :offset="2" style="padding-top: 10px">
             <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -176,9 +176,10 @@
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
-    top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    /*left:500px;*/
+    top: 10px;
+    right: 0;
+    background-color: #ffffff;
   }
   #map {
     width:100%;
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..b9f9f07 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -1,14 +1,15 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row style="width: 1400px">
-          <el-col style="width: 762px">
+        <el-row >
+          <el-col style="width: fit-content;">
             <el-date-picker
               v-model="dateTimeRange"
               type="datetimerange"
               range-separator="至"
+              size="small"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
@@ -18,14 +19,15 @@
             <el-button class="filter-item" type="primary" size="small" @click="play">开始</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="pause">暂停</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="stop">停止</el-button>
-            <span style="padding-left: 10px;font-size: 14px">回放速度</span>
-            <span style="padding-left: 3px;font-size: 14px">快</span>
+
           </el-col>
-          <el-col style="width: 180px;padding-left: 10px;padding-right: 10px;">
-            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" @change="settimer"/>
+          <el-col style="display:flex;width: fit-content;">
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px">回放速度</span>
+            <span style="padding-left:10px;padding-right: 10px;padding-top: 10px;font-size: 14px">快</span>
+            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" style="width: 100px;" @change="settimer"/>
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px;">慢</span>
           </el-col>
-          <el-col style="width: 180px;padding-top: 4px">
-            <span style="padding-left: 2px;font-size: 14px;">慢</span>
+          <el-col style="padding-top: 4px;width: fit-content; float: right;">
             <el-button class="filter-item" type="primary" style="margin-left: 10px;background-color: #286090;border: #286090" size="small" @click="staticspeed">时间速度曲线</el-button>
           </el-col>
         </el-row>
@@ -38,7 +40,7 @@
       <div class="namecard" >{{ carName }}</div>
     </div>
     <trail-static v-show="dialogFormVisible" ref="trailStatic" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import trailStatic from '@/views/overview/trailStatic'
@@ -220,6 +222,7 @@
         'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
         { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
       ).addTo(map))
+      this.search()
     },
     search() {
       this.fetchData(false)
@@ -328,6 +331,17 @@
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .search-div{
+    padding:12px;
+    padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    background-color: #fff;
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    justify-content:space-between;
+    .search-btn{
+      margin-bottom:10px;
+    }
+  }
   .namecard{
     width: 300px;
     height: 20px;
@@ -340,6 +354,7 @@
     color: #1f2d3d;
   }
   #map {
+    border-top: 12px solid #ebebeb;
     width:100%;
     height:72vh;
   }
@@ -350,6 +365,7 @@
     border-radius: 50%;
   }
   .timeslide{
+    padding-left: 20px;padding-right: 20px;
     /deep/ .el-slider__button{
       border-radius: 20%;
       width: 40px;

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>
diff --git a/src/views/overview/track.vue b/src/views/overview/track.vue
index 8d977b7..424fa11 100644
--- a/src/views/overview/track.vue
+++ b/src/views/overview/track.vue
@@ -14,13 +14,13 @@
               <el-radio label="30">30秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="4" style="padding-top: 10px">
+          <el-col :span="4" :offset="2" style="padding-top: 10px">
             <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -176,9 +176,10 @@
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
-    top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    /*left:500px;*/
+    top: 10px;
+    right: 0;
+    background-color: #ffffff;
   }
   #map {
     width:100%;
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..b9f9f07 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -1,14 +1,15 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row style="width: 1400px">
-          <el-col style="width: 762px">
+        <el-row >
+          <el-col style="width: fit-content;">
             <el-date-picker
               v-model="dateTimeRange"
               type="datetimerange"
               range-separator="至"
+              size="small"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
@@ -18,14 +19,15 @@
             <el-button class="filter-item" type="primary" size="small" @click="play">开始</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="pause">暂停</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="stop">停止</el-button>
-            <span style="padding-left: 10px;font-size: 14px">回放速度</span>
-            <span style="padding-left: 3px;font-size: 14px">快</span>
+
           </el-col>
-          <el-col style="width: 180px;padding-left: 10px;padding-right: 10px;">
-            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" @change="settimer"/>
+          <el-col style="display:flex;width: fit-content;">
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px">回放速度</span>
+            <span style="padding-left:10px;padding-right: 10px;padding-top: 10px;font-size: 14px">快</span>
+            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" style="width: 100px;" @change="settimer"/>
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px;">慢</span>
           </el-col>
-          <el-col style="width: 180px;padding-top: 4px">
-            <span style="padding-left: 2px;font-size: 14px;">慢</span>
+          <el-col style="padding-top: 4px;width: fit-content; float: right;">
             <el-button class="filter-item" type="primary" style="margin-left: 10px;background-color: #286090;border: #286090" size="small" @click="staticspeed">时间速度曲线</el-button>
           </el-col>
         </el-row>
@@ -38,7 +40,7 @@
       <div class="namecard" >{{ carName }}</div>
     </div>
     <trail-static v-show="dialogFormVisible" ref="trailStatic" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import trailStatic from '@/views/overview/trailStatic'
@@ -220,6 +222,7 @@
         'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
         { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
       ).addTo(map))
+      this.search()
     },
     search() {
       this.fetchData(false)
@@ -328,6 +331,17 @@
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .search-div{
+    padding:12px;
+    padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    background-color: #fff;
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    justify-content:space-between;
+    .search-btn{
+      margin-bottom:10px;
+    }
+  }
   .namecard{
     width: 300px;
     height: 20px;
@@ -340,6 +354,7 @@
     color: #1f2d3d;
   }
   #map {
+    border-top: 12px solid #ebebeb;
     width:100%;
     height:72vh;
   }
@@ -350,6 +365,7 @@
     border-radius: 50%;
   }
   .timeslide{
+    padding-left: 20px;padding-right: 20px;
     /deep/ .el-slider__button{
       border-radius: 20%;
       width: 40px;
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index 4997de5..8b5fb20 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -96,7 +96,7 @@
           </el-row>
         </el-form>
         <div v-if="canclick2==true" style="text-align:center">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
+          <el-button :disabled="!click1" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick2" title="（二）关联车辆" name="2">
@@ -129,7 +129,7 @@
           </el-checkbox-group>
         </div>
         <div v-if="canclick3==true" style="text-align:center;padding-top: 10px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
+          <el-button :disabled="!click2" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick3" title="（三）地图操作" name="3">
@@ -137,267 +137,279 @@
           <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
         </div>
         <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
+          <el-button :disabled="!click3" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
     </el-collapse>
   </div>
 </template>
 <script>
-import { getDictCode } from '@/api/dict'
-import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
-import DeptSelect from '@/components/DeptSelect'
-import L from 'leaflet'
-import 'leaflet/dist/leaflet.css'
+  import { getDictCode } from '@/api/dict'
+  import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
+  import DeptSelect from '@/components/DeptSelect'
+  import L from 'leaflet'
+  import 'leaflet/dist/leaflet.css'
 
-export default {
-  components: { DeptSelect },
-  data() {
-    return {
-      activeNames: ['1', '3'],
-      deptShow: true,
-      map: null,
-      list: [],
-      alarmlist: [],
-      cartypelist: [],
-      canclick2: true,
-      canclick3: true,
-      timechoose: false,
-      accessTime: [],
-      carlist: [],
-      baselayer: [],
-      markerlayer: null,
-      pointForm: {
-        routeId: '',
-        pointlist: []
-      },
-      carForm: {
-        routeId: '',
-        carIds: []
-      },
-      listQuery: {
-        routeId: '',
-        description: '',
-        carCode: '',
-        carType: '',
-        deptId: ''
-      },
-      routeForm: {
-        id: '',
-        routeName: '',
-        alarmType: '',
-        alarmDistance: '',
-        startAddress: '',
-        endAddress: '',
-        mainRoad: '',
-        startDate: '',
-        endDate: '',
-        accessTime: '',
-        remarks: ''
-      }, // 表单
-      times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
-      options: [{
-        value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
-        label: '全天（0-23）'
-      }, {
-        value: '8,9,10,11,12,13,14,15,16,17,18',
-        label: '工作时间段（8-18）'
-      }, {
-        value: '8,9,10,11,12',
-        label: '上午工作时间段（8-12）'
-      }, {
-        value: '14,15,16,17,18',
-        label: '下午工作时间段（14-18）'
-      }, {
-        value: '-1',
-        label: '自定义时间段'
-      }],
-      rules: {
-        routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
-        alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  mounted() {
-    getDictCode('routeAlarmType').then(response => {
-      this.alarmlist = response.data
-    })
-    getDictCode('carType').then(response => {
-      this.cartypelist = response.data
-    })
-  },
-  methods: {
-    removeall() {
-      var base = this.baselayer
-      this.map.eachLayer(function(layer) {
-        if (layer !== base[0] && layer !== base[1]) {
-          layer.remove()
+  export default {
+    components: { DeptSelect },
+    data() {
+      return {
+        activeNames: ['1', '3'],
+        deptShow: true,
+        map: null,
+        list: [],
+        alarmlist: [],
+        cartypelist: [],
+        canclick2: true,
+        canclick3: true,
+        timechoose: false,
+        click1: true,
+        click2: true,
+        click3: true,
+        accessTime: [],
+        carlist: [],
+        baselayer: [],
+        markerlayer: null,
+        pointForm: {
+          routeId: '',
+          pointlist: []
+        },
+        carForm: {
+          routeId: '',
+          carIds: []
+        },
+        listQuery: {
+          routeId: '',
+          description: '',
+          carCode: '',
+          carType: '',
+          deptId: ''
+        },
+        routeForm: {
+          id: '',
+          routeName: '',
+          alarmType: '',
+          alarmDistance: '',
+          startAddress: '',
+          endAddress: '',
+          mainRoad: '',
+          startDate: '',
+          endDate: '',
+          accessTime: '',
+          remarks: ''
+        }, // 表单
+        times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+        options: [{
+          value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
+          label: '全天（0-23）'
+        }, {
+          value: '8,9,10,11,12,13,14,15,16,17,18',
+          label: '工作时间段（8-18）'
+        }, {
+          value: '8,9,10,11,12',
+          label: '上午工作时间段（8-12）'
+        }, {
+          value: '14,15,16,17,18',
+          label: '下午工作时间段（14-18）'
+        }, {
+          value: '-1',
+          label: '自定义时间段'
+        }],
+        rules: {
+          routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
+          alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
+          alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
         }
-      })
-      this.pointForm.pointlist = []
-    },
-    initMap() {
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 18,
-        center: [27.75962, 116.06021],
-        zoom: 11,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.map.pm.addControls({
-        position: 'topleft',
-        drawPolygon: false, // 添加绘制多边形
-        drawMarker: false, // 添加按钮以绘制标记
-        drawCircleMarker: false, // 添加按钮以绘制圆形标记
-        drawPolyline: true, // 添加按钮绘制线条
-        drawRectangle:	false,	// 添加按钮绘制矩形
-        drawCircle: false, //  添加按钮绘制圆圈
-        editMode: false, //  添加按钮编辑多边形
-        dragMode: false, //   添加按钮拖动多边形
-        cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
-        removalMode: false // 清除图层
-      })
-      // 设置绘制后的线条颜色等
-      this.map.pm.setPathOptions({
-        color: '#409eff',
-        fillColor: 'green',
-        fillOpacity: 0.4
-      })
-      this.map.pm.setLang('zh')
-      this.map.on('pm:create', e => {
-        if (this.pointForm.pointlist.length !== 0) {
-          this.$message.warning('一次只能绘制一条路线')
-          e.layer.remove()
-        } else {
-          console.log(e, '绘制完成时调用')
-          console.log(e.layer._latlngs[0].lat)
-          var Icon
-          var removepoints = []
-          for (var i = 0; i < e.layer._latlngs.length; i++) {
-            if (i === 0) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/start.png'),
-                iconSize: [35, 35]
-              })
-            } else if (i === e.layer._latlngs.length - 1) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/end.png'),
-                iconSize: [35, 35]
-              })
-            } else {
-              Icon = L.divIcon({
-                className: 'my-div-icon', // 自定义icon css样式
-                iconSize: [10, 10]// 点大小
-              })
-            }
-            var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
-              icon: Icon
-            })
-            removepoints.push(marker)
-          }
-          this.markerlayer = L.layerGroup(removepoints)
-          map.addLayer(this.markerlayer)
-          this.pointForm.pointlist = e.layer._latlngs
-        }
-      })
-    },
-    fetchData() {
-      console.log('fetchData')
-      listUnbindCar(this.listQuery).then(response => {
-        this.list = response.data
-      })
-    },
-    accessTimeSelect(val) {
-      if (val === '-1') {
-        this.timechoose = true
-      } else {
-        this.timechoose = false
       }
     },
-    search() {
-      this.fetchData(false)
+    mounted() {
+      getDictCode('routeAlarmType').then(response => {
+        this.alarmlist = response.data
+      })
+      getDictCode('carType').then(response => {
+        this.cartypelist = response.data
+      })
     },
-    saveRoute() {
-      if (this.pointForm.pointlist.length === 0) {
-        this.$message.warning('请规划路线')
-      } else {
-        addPath(this.pointForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('新增路线成功！')
-            this.$router.push({ path: '/route/list' })
+    methods: {
+      removeall() {
+        var base = this.baselayer
+        this.map.eachLayer(function(layer) {
+          if (layer !== base[0] && layer !== base[1]) {
+            layer.remove()
           }
         })
-      }
-    },
-    saveCar() {
-      if (this.carlist.length === 0) {
-        this.$message.warning('请至少选择一辆车')
-      } else {
-        for (var i = 0; i < this.carlist.length; i++) {
-          this.carForm.carIds.push(Number(this.carlist[i]))
-        }
-        console.log(this.carForm)
-        bindCar(this.carForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('绑定车辆信息成功！')
-            this.canclick3 = false
-            this.initMap()
-          }
+        this.pointForm.pointlist = []
+      },
+      initMap() {
+        const map = L.map('map', {
+          minZoom: 3,
+          maxZoom: 18,
+          center: [27.75962, 116.06021],
+          zoom: 11,
+          zoomControl: false,
+          attributionControl: false,
+          crs: L.CRS.EPSG3857
         })
-      }
-    },
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          if (this.routeForm.startDate > this.routeForm.endDate) {
-            this.$message.warning('请确认输入正确起止时间')
-          } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
-            this.$message.warning('请选择时间段')
+        this.map = map // data上需要挂载
+        window.map = map
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.map.pm.addControls({
+          position: 'topleft',
+          drawPolygon: false, // 添加绘制多边形
+          drawMarker: false, // 添加按钮以绘制标记
+          drawCircleMarker: false, // 添加按钮以绘制圆形标记
+          drawPolyline: true, // 添加按钮绘制线条
+          drawRectangle:	false,	// 添加按钮绘制矩形
+          drawCircle: false, //  添加按钮绘制圆圈
+          editMode: false, //  添加按钮编辑多边形
+          dragMode: false, //   添加按钮拖动多边形
+          cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
+          removalMode: false // 清除图层
+        })
+        // 设置绘制后的线条颜色等
+        this.map.pm.setPathOptions({
+          color: '#409eff',
+          fillColor: 'green',
+          fillOpacity: 0.4
+        })
+        this.map.pm.setLang('zh')
+        this.map.on('pm:create', e => {
+          if (this.pointForm.pointlist.length !== 0) {
+            this.$message.warning('一次只能绘制一条路线')
+            e.layer.remove()
           } else {
-            var timeselect = false
-            if (this.routeForm.accessTime === '-1') {
-              timeselect = true
-              this.routeForm.accessTime = this.accessTime[0]
-              for (var i = 1; i < this.accessTime.length; i++) {
-                this.routeForm.accessTime += (',' + this.accessTime[i])
+            console.log(e, '绘制完成时调用')
+            console.log(e.layer._latlngs[0].lat)
+            var Icon
+            var removepoints = []
+            for (var i = 0; i < e.layer._latlngs.length; i++) {
+              if (i === 0) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/start.png'),
+                  iconSize: [35, 35]
+                })
+              } else if (i === e.layer._latlngs.length - 1) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/end.png'),
+                  iconSize: [35, 35]
+                })
+              } else {
+                Icon = L.divIcon({
+                  className: 'my-div-icon', // 自定义icon css样式
+                  iconSize: [10, 10]// 点大小
+                })
               }
+              var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
+                icon: Icon
+              })
+              removepoints.push(marker)
             }
-            addRouteInfo(this.routeForm).then(response => {
-              if (response.code === 200) {
-                this.$message.success('添加规划路线基本信息成功！')
-                if (timeselect) {
-                  this.routeForm.accessTime = '自定义时间段'
-                }
-                this.canclick2 = false
-                this.carForm.routeId = response.data
-                this.listQuery.routeId = response.data
-                this.pointForm.routeId = response.data
-                this.activeNames.push('2')
-                this.fetchData()
-              }
-            })
+            this.markerlayer = L.layerGroup(removepoints)
+            map.addLayer(this.markerlayer)
+            this.pointForm.pointlist = e.layer._latlngs
           }
+        })
+      },
+      fetchData() {
+        console.log('fetchData')
+        listUnbindCar(this.listQuery).then(response => {
+          this.list = response.data
+        })
+      },
+      accessTimeSelect(val) {
+        if (val === '-1') {
+          this.timechoose = true
+        } else {
+          this.timechoose = false
         }
-      })
-    },
-    handleChange(val) {
-      console.log(val)
+      },
+      search() {
+        this.fetchData(false)
+      },
+      saveRoute() {
+        this.click3 = false
+        if (this.pointForm.pointlist.length === 0) {
+          this.click3 = true
+          this.$message.warning('请规划路线')
+        } else {
+          addPath(this.pointForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增路线成功！')
+              this.$router.push({ path: '/route/list' })
+            }
+          })
+        }
+      },
+      saveCar() {
+        this.click2 = false
+        if (this.carlist.length === 0) {
+          this.$message.warning('请至少选择一辆车')
+          this.click2 = true
+        } else {
+          for (var i = 0; i < this.carlist.length; i++) {
+            this.carForm.carIds.push(Number(this.carlist[i]))
+          }
+          console.log(this.carForm)
+          bindCar(this.carForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定车辆信息成功！')
+              this.canclick3 = false
+              this.initMap()
+            }
+          })
+        }
+      },
+      saveData() {
+        this.click1 = false
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (this.routeForm.startDate > this.routeForm.endDate) {
+              this.$message.warning('请确认输入正确起止时间')
+              this.click1 = true
+            } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
+              this.$message.warning('请选择时间段')
+              this.click1 = true
+            } else {
+              var timeselect = false
+              if (this.routeForm.accessTime === '-1') {
+                timeselect = true
+                this.routeForm.accessTime = this.accessTime[0]
+                for (var i = 1; i < this.accessTime.length; i++) {
+                  this.routeForm.accessTime += (',' + this.accessTime[i])
+                }
+              }
+              addRouteInfo(this.routeForm).then(response => {
+                if (response.code === 200) {
+                  this.$message.success('添加规划路线基本信息成功！')
+                  if (timeselect) {
+                    this.routeForm.accessTime = '自定义时间段'
+                  }
+                  this.canclick2 = false
+                  this.carForm.routeId = response.data
+                  this.listQuery.routeId = response.data
+                  this.pointForm.routeId = response.data
+                  this.activeNames.push('2')
+                  this.fetchData()
+                }
+              })
+            }
+          } else {
+            this.click1 = true
+          }
+        })
+      },
+      handleChange(val) {
+        console.log(val)
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>
diff --git a/src/views/overview/track.vue b/src/views/overview/track.vue
index 8d977b7..424fa11 100644
--- a/src/views/overview/track.vue
+++ b/src/views/overview/track.vue
@@ -14,13 +14,13 @@
               <el-radio label="30">30秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="4" style="padding-top: 10px">
+          <el-col :span="4" :offset="2" style="padding-top: 10px">
             <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -176,9 +176,10 @@
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
-    top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    /*left:500px;*/
+    top: 10px;
+    right: 0;
+    background-color: #ffffff;
   }
   #map {
     width:100%;
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..b9f9f07 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -1,14 +1,15 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row style="width: 1400px">
-          <el-col style="width: 762px">
+        <el-row >
+          <el-col style="width: fit-content;">
             <el-date-picker
               v-model="dateTimeRange"
               type="datetimerange"
               range-separator="至"
+              size="small"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
@@ -18,14 +19,15 @@
             <el-button class="filter-item" type="primary" size="small" @click="play">开始</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="pause">暂停</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="stop">停止</el-button>
-            <span style="padding-left: 10px;font-size: 14px">回放速度</span>
-            <span style="padding-left: 3px;font-size: 14px">快</span>
+
           </el-col>
-          <el-col style="width: 180px;padding-left: 10px;padding-right: 10px;">
-            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" @change="settimer"/>
+          <el-col style="display:flex;width: fit-content;">
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px">回放速度</span>
+            <span style="padding-left:10px;padding-right: 10px;padding-top: 10px;font-size: 14px">快</span>
+            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" style="width: 100px;" @change="settimer"/>
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px;">慢</span>
           </el-col>
-          <el-col style="width: 180px;padding-top: 4px">
-            <span style="padding-left: 2px;font-size: 14px;">慢</span>
+          <el-col style="padding-top: 4px;width: fit-content; float: right;">
             <el-button class="filter-item" type="primary" style="margin-left: 10px;background-color: #286090;border: #286090" size="small" @click="staticspeed">时间速度曲线</el-button>
           </el-col>
         </el-row>
@@ -38,7 +40,7 @@
       <div class="namecard" >{{ carName }}</div>
     </div>
     <trail-static v-show="dialogFormVisible" ref="trailStatic" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import trailStatic from '@/views/overview/trailStatic'
@@ -220,6 +222,7 @@
         'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
         { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
       ).addTo(map))
+      this.search()
     },
     search() {
       this.fetchData(false)
@@ -328,6 +331,17 @@
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .search-div{
+    padding:12px;
+    padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    background-color: #fff;
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    justify-content:space-between;
+    .search-btn{
+      margin-bottom:10px;
+    }
+  }
   .namecard{
     width: 300px;
     height: 20px;
@@ -340,6 +354,7 @@
     color: #1f2d3d;
   }
   #map {
+    border-top: 12px solid #ebebeb;
     width:100%;
     height:72vh;
   }
@@ -350,6 +365,7 @@
     border-radius: 50%;
   }
   .timeslide{
+    padding-left: 20px;padding-right: 20px;
     /deep/ .el-slider__button{
       border-radius: 20%;
       width: 40px;
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index 4997de5..8b5fb20 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -96,7 +96,7 @@
           </el-row>
         </el-form>
         <div v-if="canclick2==true" style="text-align:center">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
+          <el-button :disabled="!click1" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick2" title="（二）关联车辆" name="2">
@@ -129,7 +129,7 @@
           </el-checkbox-group>
         </div>
         <div v-if="canclick3==true" style="text-align:center;padding-top: 10px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
+          <el-button :disabled="!click2" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick3" title="（三）地图操作" name="3">
@@ -137,267 +137,279 @@
           <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
         </div>
         <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
+          <el-button :disabled="!click3" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
     </el-collapse>
   </div>
 </template>
 <script>
-import { getDictCode } from '@/api/dict'
-import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
-import DeptSelect from '@/components/DeptSelect'
-import L from 'leaflet'
-import 'leaflet/dist/leaflet.css'
+  import { getDictCode } from '@/api/dict'
+  import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
+  import DeptSelect from '@/components/DeptSelect'
+  import L from 'leaflet'
+  import 'leaflet/dist/leaflet.css'
 
-export default {
-  components: { DeptSelect },
-  data() {
-    return {
-      activeNames: ['1', '3'],
-      deptShow: true,
-      map: null,
-      list: [],
-      alarmlist: [],
-      cartypelist: [],
-      canclick2: true,
-      canclick3: true,
-      timechoose: false,
-      accessTime: [],
-      carlist: [],
-      baselayer: [],
-      markerlayer: null,
-      pointForm: {
-        routeId: '',
-        pointlist: []
-      },
-      carForm: {
-        routeId: '',
-        carIds: []
-      },
-      listQuery: {
-        routeId: '',
-        description: '',
-        carCode: '',
-        carType: '',
-        deptId: ''
-      },
-      routeForm: {
-        id: '',
-        routeName: '',
-        alarmType: '',
-        alarmDistance: '',
-        startAddress: '',
-        endAddress: '',
-        mainRoad: '',
-        startDate: '',
-        endDate: '',
-        accessTime: '',
-        remarks: ''
-      }, // 表单
-      times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
-      options: [{
-        value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
-        label: '全天（0-23）'
-      }, {
-        value: '8,9,10,11,12,13,14,15,16,17,18',
-        label: '工作时间段（8-18）'
-      }, {
-        value: '8,9,10,11,12',
-        label: '上午工作时间段（8-12）'
-      }, {
-        value: '14,15,16,17,18',
-        label: '下午工作时间段（14-18）'
-      }, {
-        value: '-1',
-        label: '自定义时间段'
-      }],
-      rules: {
-        routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
-        alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  mounted() {
-    getDictCode('routeAlarmType').then(response => {
-      this.alarmlist = response.data
-    })
-    getDictCode('carType').then(response => {
-      this.cartypelist = response.data
-    })
-  },
-  methods: {
-    removeall() {
-      var base = this.baselayer
-      this.map.eachLayer(function(layer) {
-        if (layer !== base[0] && layer !== base[1]) {
-          layer.remove()
+  export default {
+    components: { DeptSelect },
+    data() {
+      return {
+        activeNames: ['1', '3'],
+        deptShow: true,
+        map: null,
+        list: [],
+        alarmlist: [],
+        cartypelist: [],
+        canclick2: true,
+        canclick3: true,
+        timechoose: false,
+        click1: true,
+        click2: true,
+        click3: true,
+        accessTime: [],
+        carlist: [],
+        baselayer: [],
+        markerlayer: null,
+        pointForm: {
+          routeId: '',
+          pointlist: []
+        },
+        carForm: {
+          routeId: '',
+          carIds: []
+        },
+        listQuery: {
+          routeId: '',
+          description: '',
+          carCode: '',
+          carType: '',
+          deptId: ''
+        },
+        routeForm: {
+          id: '',
+          routeName: '',
+          alarmType: '',
+          alarmDistance: '',
+          startAddress: '',
+          endAddress: '',
+          mainRoad: '',
+          startDate: '',
+          endDate: '',
+          accessTime: '',
+          remarks: ''
+        }, // 表单
+        times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+        options: [{
+          value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
+          label: '全天（0-23）'
+        }, {
+          value: '8,9,10,11,12,13,14,15,16,17,18',
+          label: '工作时间段（8-18）'
+        }, {
+          value: '8,9,10,11,12',
+          label: '上午工作时间段（8-12）'
+        }, {
+          value: '14,15,16,17,18',
+          label: '下午工作时间段（14-18）'
+        }, {
+          value: '-1',
+          label: '自定义时间段'
+        }],
+        rules: {
+          routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
+          alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
+          alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
         }
-      })
-      this.pointForm.pointlist = []
-    },
-    initMap() {
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 18,
-        center: [27.75962, 116.06021],
-        zoom: 11,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.map.pm.addControls({
-        position: 'topleft',
-        drawPolygon: false, // 添加绘制多边形
-        drawMarker: false, // 添加按钮以绘制标记
-        drawCircleMarker: false, // 添加按钮以绘制圆形标记
-        drawPolyline: true, // 添加按钮绘制线条
-        drawRectangle:	false,	// 添加按钮绘制矩形
-        drawCircle: false, //  添加按钮绘制圆圈
-        editMode: false, //  添加按钮编辑多边形
-        dragMode: false, //   添加按钮拖动多边形
-        cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
-        removalMode: false // 清除图层
-      })
-      // 设置绘制后的线条颜色等
-      this.map.pm.setPathOptions({
-        color: '#409eff',
-        fillColor: 'green',
-        fillOpacity: 0.4
-      })
-      this.map.pm.setLang('zh')
-      this.map.on('pm:create', e => {
-        if (this.pointForm.pointlist.length !== 0) {
-          this.$message.warning('一次只能绘制一条路线')
-          e.layer.remove()
-        } else {
-          console.log(e, '绘制完成时调用')
-          console.log(e.layer._latlngs[0].lat)
-          var Icon
-          var removepoints = []
-          for (var i = 0; i < e.layer._latlngs.length; i++) {
-            if (i === 0) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/start.png'),
-                iconSize: [35, 35]
-              })
-            } else if (i === e.layer._latlngs.length - 1) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/end.png'),
-                iconSize: [35, 35]
-              })
-            } else {
-              Icon = L.divIcon({
-                className: 'my-div-icon', // 自定义icon css样式
-                iconSize: [10, 10]// 点大小
-              })
-            }
-            var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
-              icon: Icon
-            })
-            removepoints.push(marker)
-          }
-          this.markerlayer = L.layerGroup(removepoints)
-          map.addLayer(this.markerlayer)
-          this.pointForm.pointlist = e.layer._latlngs
-        }
-      })
-    },
-    fetchData() {
-      console.log('fetchData')
-      listUnbindCar(this.listQuery).then(response => {
-        this.list = response.data
-      })
-    },
-    accessTimeSelect(val) {
-      if (val === '-1') {
-        this.timechoose = true
-      } else {
-        this.timechoose = false
       }
     },
-    search() {
-      this.fetchData(false)
+    mounted() {
+      getDictCode('routeAlarmType').then(response => {
+        this.alarmlist = response.data
+      })
+      getDictCode('carType').then(response => {
+        this.cartypelist = response.data
+      })
     },
-    saveRoute() {
-      if (this.pointForm.pointlist.length === 0) {
-        this.$message.warning('请规划路线')
-      } else {
-        addPath(this.pointForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('新增路线成功！')
-            this.$router.push({ path: '/route/list' })
+    methods: {
+      removeall() {
+        var base = this.baselayer
+        this.map.eachLayer(function(layer) {
+          if (layer !== base[0] && layer !== base[1]) {
+            layer.remove()
           }
         })
-      }
-    },
-    saveCar() {
-      if (this.carlist.length === 0) {
-        this.$message.warning('请至少选择一辆车')
-      } else {
-        for (var i = 0; i < this.carlist.length; i++) {
-          this.carForm.carIds.push(Number(this.carlist[i]))
-        }
-        console.log(this.carForm)
-        bindCar(this.carForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('绑定车辆信息成功！')
-            this.canclick3 = false
-            this.initMap()
-          }
+        this.pointForm.pointlist = []
+      },
+      initMap() {
+        const map = L.map('map', {
+          minZoom: 3,
+          maxZoom: 18,
+          center: [27.75962, 116.06021],
+          zoom: 11,
+          zoomControl: false,
+          attributionControl: false,
+          crs: L.CRS.EPSG3857
         })
-      }
-    },
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          if (this.routeForm.startDate > this.routeForm.endDate) {
-            this.$message.warning('请确认输入正确起止时间')
-          } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
-            this.$message.warning('请选择时间段')
+        this.map = map // data上需要挂载
+        window.map = map
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.map.pm.addControls({
+          position: 'topleft',
+          drawPolygon: false, // 添加绘制多边形
+          drawMarker: false, // 添加按钮以绘制标记
+          drawCircleMarker: false, // 添加按钮以绘制圆形标记
+          drawPolyline: true, // 添加按钮绘制线条
+          drawRectangle:	false,	// 添加按钮绘制矩形
+          drawCircle: false, //  添加按钮绘制圆圈
+          editMode: false, //  添加按钮编辑多边形
+          dragMode: false, //   添加按钮拖动多边形
+          cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
+          removalMode: false // 清除图层
+        })
+        // 设置绘制后的线条颜色等
+        this.map.pm.setPathOptions({
+          color: '#409eff',
+          fillColor: 'green',
+          fillOpacity: 0.4
+        })
+        this.map.pm.setLang('zh')
+        this.map.on('pm:create', e => {
+          if (this.pointForm.pointlist.length !== 0) {
+            this.$message.warning('一次只能绘制一条路线')
+            e.layer.remove()
           } else {
-            var timeselect = false
-            if (this.routeForm.accessTime === '-1') {
-              timeselect = true
-              this.routeForm.accessTime = this.accessTime[0]
-              for (var i = 1; i < this.accessTime.length; i++) {
-                this.routeForm.accessTime += (',' + this.accessTime[i])
+            console.log(e, '绘制完成时调用')
+            console.log(e.layer._latlngs[0].lat)
+            var Icon
+            var removepoints = []
+            for (var i = 0; i < e.layer._latlngs.length; i++) {
+              if (i === 0) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/start.png'),
+                  iconSize: [35, 35]
+                })
+              } else if (i === e.layer._latlngs.length - 1) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/end.png'),
+                  iconSize: [35, 35]
+                })
+              } else {
+                Icon = L.divIcon({
+                  className: 'my-div-icon', // 自定义icon css样式
+                  iconSize: [10, 10]// 点大小
+                })
               }
+              var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
+                icon: Icon
+              })
+              removepoints.push(marker)
             }
-            addRouteInfo(this.routeForm).then(response => {
-              if (response.code === 200) {
-                this.$message.success('添加规划路线基本信息成功！')
-                if (timeselect) {
-                  this.routeForm.accessTime = '自定义时间段'
-                }
-                this.canclick2 = false
-                this.carForm.routeId = response.data
-                this.listQuery.routeId = response.data
-                this.pointForm.routeId = response.data
-                this.activeNames.push('2')
-                this.fetchData()
-              }
-            })
+            this.markerlayer = L.layerGroup(removepoints)
+            map.addLayer(this.markerlayer)
+            this.pointForm.pointlist = e.layer._latlngs
           }
+        })
+      },
+      fetchData() {
+        console.log('fetchData')
+        listUnbindCar(this.listQuery).then(response => {
+          this.list = response.data
+        })
+      },
+      accessTimeSelect(val) {
+        if (val === '-1') {
+          this.timechoose = true
+        } else {
+          this.timechoose = false
         }
-      })
-    },
-    handleChange(val) {
-      console.log(val)
+      },
+      search() {
+        this.fetchData(false)
+      },
+      saveRoute() {
+        this.click3 = false
+        if (this.pointForm.pointlist.length === 0) {
+          this.click3 = true
+          this.$message.warning('请规划路线')
+        } else {
+          addPath(this.pointForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增路线成功！')
+              this.$router.push({ path: '/route/list' })
+            }
+          })
+        }
+      },
+      saveCar() {
+        this.click2 = false
+        if (this.carlist.length === 0) {
+          this.$message.warning('请至少选择一辆车')
+          this.click2 = true
+        } else {
+          for (var i = 0; i < this.carlist.length; i++) {
+            this.carForm.carIds.push(Number(this.carlist[i]))
+          }
+          console.log(this.carForm)
+          bindCar(this.carForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定车辆信息成功！')
+              this.canclick3 = false
+              this.initMap()
+            }
+          })
+        }
+      },
+      saveData() {
+        this.click1 = false
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (this.routeForm.startDate > this.routeForm.endDate) {
+              this.$message.warning('请确认输入正确起止时间')
+              this.click1 = true
+            } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
+              this.$message.warning('请选择时间段')
+              this.click1 = true
+            } else {
+              var timeselect = false
+              if (this.routeForm.accessTime === '-1') {
+                timeselect = true
+                this.routeForm.accessTime = this.accessTime[0]
+                for (var i = 1; i < this.accessTime.length; i++) {
+                  this.routeForm.accessTime += (',' + this.accessTime[i])
+                }
+              }
+              addRouteInfo(this.routeForm).then(response => {
+                if (response.code === 200) {
+                  this.$message.success('添加规划路线基本信息成功！')
+                  if (timeselect) {
+                    this.routeForm.accessTime = '自定义时间段'
+                  }
+                  this.canclick2 = false
+                  this.carForm.routeId = response.data
+                  this.listQuery.routeId = response.data
+                  this.pointForm.routeId = response.data
+                  this.activeNames.push('2')
+                  this.fetchData()
+                }
+              })
+            }
+          } else {
+            this.click1 = true
+          }
+        })
+      },
+      handleChange(val) {
+        console.log(val)
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/views/route/editRoute.vue b/src/views/route/editRoute.vue
index 6ce4730..c8124cc 100644
--- a/src/views/route/editRoute.vue
+++ b/src/views/route/editRoute.vue
@@ -85,7 +85,7 @@
           </el-row>
         </el-form>
         <div style="text-align:center">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData">修改路线基本信息</el-button>
+          <el-button :disabled="!click1" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData">修改路线基本信息</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
@@ -97,7 +97,7 @@
               </el-checkbox-group>
             </div>
             <div style="text-align:center;padding-top: 10px">
-              <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
+              <el-button :disabled="!click2" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
           <el-tab-pane label="增加绑定车辆" name="second">
@@ -129,7 +129,7 @@
               </el-checkbox-group>
             </div>
             <div style="text-align:center;padding-top: 10px">
-              <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="addCar">增加绑定车辆</el-button>
+              <el-button :disabled="!click3" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="addCar">增加绑定车辆</el-button>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -159,6 +159,9 @@
       routeId: '',
       map: null,
       list: [],
+      click1: true,
+      click2: true,
+      click3: true,
       alarmlist: [],
       cartypelist: [],
       accessTime: [],
@@ -409,7 +412,9 @@
       this.fetchData(false)
     },
     addCar() {
+      this.click3 = false
       if (this.addlist.length === 0) {
+        this.click3 = true
         this.$message.warning('请至少选择一辆车')
       } else {
         this.addCarForm.routeId = this.routeId
@@ -425,7 +430,9 @@
       }
     },
     removeCar() {
+      this.click2 = false
       if (this.removelist.length === 0) {
+        this.click2 = true
         this.$message.warning('请至少选择一辆车解绑')
       } else {
         this.removeCarForm.routeId = this.routeId
@@ -443,9 +450,11 @@
       }
     },
     saveData() {
+      this.click1 = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.routeForm.startDate > this.routeForm.endDate) {
+            this.click1 = true
             this.$message.warning('请确认输入正确起止时间')
           } else {
             this.routeForm.accessTime = this.accessTime[0]
@@ -458,6 +467,8 @@
               }
             })
           }
+        } else {
+          this.click1 = true
         }
       })
     }
@@ -467,8 +478,8 @@
 
 <style rel="stylesheet/scss" lang="scss">
   /*#editroute . {*/
-    /*font-size: 15px ;*/
-    /*font-weight: bold;*/
+  /*font-size: 15px ;*/
+  /*font-weight: bold;*/
   /*}*/
   #editroute .el-checkbox__label {
     font-size: 15px ;

diff --git a/config/dev.env.js b/config/dev.env.js
index 95e311a..4e35847 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://111.198.10.15:12204"'
   BASE_API: '"http://111.198.10.15:11409"'
+  // BASE_API: '"http://127.0.0.1:8095"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'car/template/download',
     method: 'get',
     params: {
       filename: fileName
diff --git a/src/router/index.js b/src/router/index.js
index e028254..348a602 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,16 +49,9 @@
   // 主页
   {
     path: '/',
-    component: Layout,
-    redirect: 'overviewlist',
-    name: 'Overview',
-    hidden: true,
-    children: [{
-      path: 'overviewlist',
-      name: 'Overviewlist',
-      component: () => import('@/views/overview/listoverview'),
-      meta: { title: '车辆定位监控列表', icon: 'function', permission: ['/overview/list'], affix: true }
-    }]
+    redirect: '/overviewlist',
+    name: 'Dashboard',
+    hidden: true
   }
 ]
 // 实例化vue的时候直挂载constantRouter
diff --git a/src/settings.js b/src/settings.js
index b568ce0..fd10978 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
@@ -21,7 +21,7 @@
    * @type {boolean} true | false
    * @description 是否要显示侧边栏logo
    */
-  sidebarLogo: false,
+  sidebarLogo: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..7f9c7f4 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '车辆管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
           align: 'center'
         },
         {
-          text: '当日里程',
+          text: '当日里程(km)',
           value: 'dayMile',
           align: 'center'
         },
         {
-          text: '当月里程',
+          text: '当月里程(km)',
           value: 'monthMile',
           align: 'center'
         },
         {
-          text: '当年里程',
+          text: '当年里程(km)',
           value: 'yearMile',
           align: 'center'
         }
diff --git a/src/views/overview/listoverview.vue b/src/views/overview/listoverview.vue
index 4dee730..a2e226a 100644
--- a/src/views/overview/listoverview.vue
+++ b/src/views/overview/listoverview.vue
@@ -1,67 +1,66 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
-    <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>
+    <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" placeholder="使用单位" size="small" clearable value=""/>
+      </search-item>
+    </search-area>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
-      </el-form>
-    </div>
     <div id="map">
       <!--查询结果Table显示-->
       <div slot="header" class="rightcard" >
         <el-row>
-          <el-col :span="4">
-            <div style="font-size: 14px;padding-top: 10px;padding-left: 20px">在线：{{ online }}</div>
+          <el-col :span="3">
+            <div style="font-size: 14px;padding-top: 10px;">在线：{{ online }}</div>
           </el-col>
           <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px">离线：{{ offline }}</div>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <div style="font-size: 14px;padding-top: 10px;padding-left: 5px">刷新时间</div>
           </el-col>
-          <el-col :span="8" style="padding-top: 12px;padding-left: 10px">
+          <el-col :span="9" style="padding-top: 12px;padding-left: 10px">
             <el-radio-group v-model="refresh" @change="clicktime">
               <el-radio label="10">10秒</el-radio>
               <el-radio label="30">30秒</el-radio>
               <el-radio label="60">60秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="3" style="padding-top: 4px;padding-left: 8px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="3" style="padding-top: 10px">
-            <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
+
+          <el-col :span="4" style="padding-top: 10px">
+            <label style="font-size: 14px;padding-left: 5px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="2" style="padding-top: 4px;padding-left: 5px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
       <div slot="header" class="table-title" @click="tableclick">
-        <div class="table-name" style="color: white">
+        <div class="table-name">
           车辆列表
         </div>
-        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
-        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; left:20px;top:20px;margin-top:-8px;color: white"/>
+        <i v-if="showtable==true" class="el-icon-arrow-down" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
+        <i v-if="showtable==false" class="el-icon-arrow-right" style="position:absolute; right:20px;top:20px;margin-top:-8px;"/>
       </div>
-      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="table" border @row-dblclick="dbSelected" @selection-change="handleSelectionChange">
+
+      <el-table v-if="showtable==true" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :header-cell-style="{background: '#ffffff'}" :data="list" max-height="300" class="table" border @row-dblclick="dbSelected" @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">
@@ -70,12 +69,12 @@
         </el-table-column>
         <el-table-column label="更多" width="110" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
-            <el-button type="warning" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
+            <el-button type="text" size="mini" @click="track(scope.row.carId)">跟踪</el-button>
+            <el-button type="text" size="mini" @click="trail(scope.row.carId,scope.row)">轨迹</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <div v-if="showtable==true" class="pagination-container">
         <el-pagination
           v-show="total>listQuery.limit"
           :current-page="listQuery.offset"
@@ -88,9 +87,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+
     </div>
     <edit-car-info v-show="dialogFormVisible" ref="editCarInfo" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import editCarInfo from '@/views/carinfo/editCarInfo'
@@ -99,6 +99,8 @@
 import DeptSelect from '@/components/DeptSelect'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-rotatedmarker/leaflet.rotatedMarker.js'
+
 export default {
   name: 'ListOverview',
   components: { DeptSelect, editCarInfo },
@@ -535,27 +537,37 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .table{
     width: 460px;
-    height: 70vh;
+    /*height: 60vh;*/
     z-index: 10000;
     margin-top: 40px;
-    position: absolute;
+    position: relative;
     left:20px;
-    top:20px;
+    top:30px;
+    /*padding-bottom: 20px;*/
   }
   .rightcard{
-    width: 750px;
+    /*width: 750px;*/
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
+    /*left:500px;*/
     top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    right: 0;
+    background-color: #ffffff;
+    padding-left: 20px;
+    padding-right: 50px;
   }
   .table-bottom{
-    position: absolute;
-    left: 120px;
-    top:700px;
+    position: relative;
+    left: 21px;
+    /*top: 20px;*/
     z-index: 10001;
+    float: left;
+    width: 458px;
+    background-color: #ffffff;
+    /* margin-top: 20px; */
+    padding-top: 20px;
+    padding-bottom: 10px;
   }
   .table-name{
     position:relative;
@@ -569,14 +581,33 @@
     text-align:center;
     width: 460px;
     height: 40px;
-    background-color: #409eff;
+    background-color: #ffffff;
     z-index: 10000;
     position: absolute;
     left:20px;
     top:20px;
+    font-weight: bold;
   }
   #map {
     width:100%;
-    height:80vh;
+    height: 80vh;
+    border-top: 12px solid #ebebeb;
   }
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper{
+      padding-bottom: 11px !important;
+  }
+  /*/deep/ .el-radio__input.is-checked+.el-radio__label {*/
+    /*color: red;*/
+  /*}*/
+  /*/deep/ .el-radio__input.is-checked .el-radio__inner {*/
+    /*border-color: #e91e63;*/
+    /*background: #e91e63;*/
+  /*}*/
+  /deep/ .el-radio{
+    margin-right: 5px;
+  }
+  /deep/ .el-radio__label{
+    padding-left: 5px;
+  }
+
 </style>
diff --git a/src/views/overview/track.vue b/src/views/overview/track.vue
index 8d977b7..424fa11 100644
--- a/src/views/overview/track.vue
+++ b/src/views/overview/track.vue
@@ -14,13 +14,13 @@
               <el-radio label="30">30秒</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
-            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
-          </el-col>
-          <el-col :span="4" style="padding-top: 10px">
+          <el-col :span="4" :offset="2" style="padding-top: 10px">
             <label style="font-size: 14px;padding-left: 10px;color: red">{{ sec }}</label>
             <label style="font-size: 14px">秒后刷新</label>
           </el-col>
+          <el-col :span="4" style="padding-top: 4px;padding-left: 18px">
+            <el-button type="primary" size="small" @click="fetchData">立即刷新</el-button>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -176,9 +176,10 @@
     height: 40px;
     z-index: 10000;
     position: absolute;
-    left:500px;
-    top:20px;
-    background-color: rgba(238, 238, 238, 0.93);
+    /*left:500px;*/
+    top: 10px;
+    right: 0;
+    background-color: #ffffff;
   }
   #map {
     width:100%;
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..b9f9f07 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -1,14 +1,15 @@
 <template>
-  <div id="overview" class="app-container">
+  <app-container id="overview">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row style="width: 1400px">
-          <el-col style="width: 762px">
+        <el-row >
+          <el-col style="width: fit-content;">
             <el-date-picker
               v-model="dateTimeRange"
               type="datetimerange"
               range-separator="至"
+              size="small"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
@@ -18,14 +19,15 @@
             <el-button class="filter-item" type="primary" size="small" @click="play">开始</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="pause">暂停</el-button>
             <el-button class="filter-item" type="primary" size="small" @click="stop">停止</el-button>
-            <span style="padding-left: 10px;font-size: 14px">回放速度</span>
-            <span style="padding-left: 3px;font-size: 14px">快</span>
+
           </el-col>
-          <el-col style="width: 180px;padding-left: 10px;padding-right: 10px;">
-            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" @change="settimer"/>
+          <el-col style="display:flex;width: fit-content;">
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px">回放速度</span>
+            <span style="padding-left:10px;padding-right: 10px;padding-top: 10px;font-size: 14px">快</span>
+            <el-slider v-model="sec" :format-tooltip="formatTooltip" :step="10" :min="10" :show-tooltip="false" style="width: 100px;" @change="settimer"/>
+            <span style="padding-left: 10px;padding-top: 10px;font-size: 14px;">慢</span>
           </el-col>
-          <el-col style="width: 180px;padding-top: 4px">
-            <span style="padding-left: 2px;font-size: 14px;">慢</span>
+          <el-col style="padding-top: 4px;width: fit-content; float: right;">
             <el-button class="filter-item" type="primary" style="margin-left: 10px;background-color: #286090;border: #286090" size="small" @click="staticspeed">时间速度曲线</el-button>
           </el-col>
         </el-row>
@@ -38,7 +40,7 @@
       <div class="namecard" >{{ carName }}</div>
     </div>
     <trail-static v-show="dialogFormVisible" ref="trailStatic" @watchChild="fetchData"/>
-  </div>
+  </app-container>
 </template>
 <script>
 import trailStatic from '@/views/overview/trailStatic'
@@ -220,6 +222,7 @@
         'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
         { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
       ).addTo(map))
+      this.search()
     },
     search() {
       this.fetchData(false)
@@ -328,6 +331,17 @@
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .search-div{
+    padding:12px;
+    padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    background-color: #fff;
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    justify-content:space-between;
+    .search-btn{
+      margin-bottom:10px;
+    }
+  }
   .namecard{
     width: 300px;
     height: 20px;
@@ -340,6 +354,7 @@
     color: #1f2d3d;
   }
   #map {
+    border-top: 12px solid #ebebeb;
     width:100%;
     height:72vh;
   }
@@ -350,6 +365,7 @@
     border-radius: 50%;
   }
   .timeslide{
+    padding-left: 20px;padding-right: 20px;
     /deep/ .el-slider__button{
       border-radius: 20%;
       width: 40px;
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index 4997de5..8b5fb20 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -96,7 +96,7 @@
           </el-row>
         </el-form>
         <div v-if="canclick2==true" style="text-align:center">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
+          <el-button :disabled="!click1" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData"> >> 下一步，关联车辆</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick2" title="（二）关联车辆" name="2">
@@ -129,7 +129,7 @@
           </el-checkbox-group>
         </div>
         <div v-if="canclick3==true" style="text-align:center;padding-top: 10px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
+          <el-button :disabled="!click2" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveCar"> >> 下一步，规划路线</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item :disabled="canclick3" title="（三）地图操作" name="3">
@@ -137,267 +137,279 @@
           <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
         </div>
         <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
+          <el-button :disabled="!click3" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
     </el-collapse>
   </div>
 </template>
 <script>
-import { getDictCode } from '@/api/dict'
-import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
-import DeptSelect from '@/components/DeptSelect'
-import L from 'leaflet'
-import 'leaflet/dist/leaflet.css'
+  import { getDictCode } from '@/api/dict'
+  import { addRouteInfo, listUnbindCar, bindCar, addPath } from '@/api/routeInfo'
+  import DeptSelect from '@/components/DeptSelect'
+  import L from 'leaflet'
+  import 'leaflet/dist/leaflet.css'
 
-export default {
-  components: { DeptSelect },
-  data() {
-    return {
-      activeNames: ['1', '3'],
-      deptShow: true,
-      map: null,
-      list: [],
-      alarmlist: [],
-      cartypelist: [],
-      canclick2: true,
-      canclick3: true,
-      timechoose: false,
-      accessTime: [],
-      carlist: [],
-      baselayer: [],
-      markerlayer: null,
-      pointForm: {
-        routeId: '',
-        pointlist: []
-      },
-      carForm: {
-        routeId: '',
-        carIds: []
-      },
-      listQuery: {
-        routeId: '',
-        description: '',
-        carCode: '',
-        carType: '',
-        deptId: ''
-      },
-      routeForm: {
-        id: '',
-        routeName: '',
-        alarmType: '',
-        alarmDistance: '',
-        startAddress: '',
-        endAddress: '',
-        mainRoad: '',
-        startDate: '',
-        endDate: '',
-        accessTime: '',
-        remarks: ''
-      }, // 表单
-      times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
-      options: [{
-        value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
-        label: '全天（0-23）'
-      }, {
-        value: '8,9,10,11,12,13,14,15,16,17,18',
-        label: '工作时间段（8-18）'
-      }, {
-        value: '8,9,10,11,12',
-        label: '上午工作时间段（8-12）'
-      }, {
-        value: '14,15,16,17,18',
-        label: '下午工作时间段（14-18）'
-      }, {
-        value: '-1',
-        label: '自定义时间段'
-      }],
-      rules: {
-        routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
-        alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  mounted() {
-    getDictCode('routeAlarmType').then(response => {
-      this.alarmlist = response.data
-    })
-    getDictCode('carType').then(response => {
-      this.cartypelist = response.data
-    })
-  },
-  methods: {
-    removeall() {
-      var base = this.baselayer
-      this.map.eachLayer(function(layer) {
-        if (layer !== base[0] && layer !== base[1]) {
-          layer.remove()
+  export default {
+    components: { DeptSelect },
+    data() {
+      return {
+        activeNames: ['1', '3'],
+        deptShow: true,
+        map: null,
+        list: [],
+        alarmlist: [],
+        cartypelist: [],
+        canclick2: true,
+        canclick3: true,
+        timechoose: false,
+        click1: true,
+        click2: true,
+        click3: true,
+        accessTime: [],
+        carlist: [],
+        baselayer: [],
+        markerlayer: null,
+        pointForm: {
+          routeId: '',
+          pointlist: []
+        },
+        carForm: {
+          routeId: '',
+          carIds: []
+        },
+        listQuery: {
+          routeId: '',
+          description: '',
+          carCode: '',
+          carType: '',
+          deptId: ''
+        },
+        routeForm: {
+          id: '',
+          routeName: '',
+          alarmType: '',
+          alarmDistance: '',
+          startAddress: '',
+          endAddress: '',
+          mainRoad: '',
+          startDate: '',
+          endDate: '',
+          accessTime: '',
+          remarks: ''
+        }, // 表单
+        times: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+        options: [{
+          value: '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23',
+          label: '全天（0-23）'
+        }, {
+          value: '8,9,10,11,12,13,14,15,16,17,18',
+          label: '工作时间段（8-18）'
+        }, {
+          value: '8,9,10,11,12',
+          label: '上午工作时间段（8-12）'
+        }, {
+          value: '14,15,16,17,18',
+          label: '下午工作时间段（14-18）'
+        }, {
+          value: '-1',
+          label: '自定义时间段'
+        }],
+        rules: {
+          routeName: [{ required: true, message: '路线描述不能为空', trigger: ['blur', 'change'] }],
+          alarmType: [{ required: true, message: '报警类型必选', trigger: ['blur', 'change'] }],
+          alarmDistance: [{ required: true, message: '偏离报警距离不能为空', trigger: ['blur', 'change'] }]
         }
-      })
-      this.pointForm.pointlist = []
-    },
-    initMap() {
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 18,
-        center: [27.75962, 116.06021],
-        zoom: 11,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.baselayer.push(L.tileLayer(
-        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.map.pm.addControls({
-        position: 'topleft',
-        drawPolygon: false, // 添加绘制多边形
-        drawMarker: false, // 添加按钮以绘制标记
-        drawCircleMarker: false, // 添加按钮以绘制圆形标记
-        drawPolyline: true, // 添加按钮绘制线条
-        drawRectangle:	false,	// 添加按钮绘制矩形
-        drawCircle: false, //  添加按钮绘制圆圈
-        editMode: false, //  添加按钮编辑多边形
-        dragMode: false, //   添加按钮拖动多边形
-        cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
-        removalMode: false // 清除图层
-      })
-      // 设置绘制后的线条颜色等
-      this.map.pm.setPathOptions({
-        color: '#409eff',
-        fillColor: 'green',
-        fillOpacity: 0.4
-      })
-      this.map.pm.setLang('zh')
-      this.map.on('pm:create', e => {
-        if (this.pointForm.pointlist.length !== 0) {
-          this.$message.warning('一次只能绘制一条路线')
-          e.layer.remove()
-        } else {
-          console.log(e, '绘制完成时调用')
-          console.log(e.layer._latlngs[0].lat)
-          var Icon
-          var removepoints = []
-          for (var i = 0; i < e.layer._latlngs.length; i++) {
-            if (i === 0) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/start.png'),
-                iconSize: [35, 35]
-              })
-            } else if (i === e.layer._latlngs.length - 1) {
-              Icon = L.icon({
-                iconUrl: require('../../assets/global_images/end.png'),
-                iconSize: [35, 35]
-              })
-            } else {
-              Icon = L.divIcon({
-                className: 'my-div-icon', // 自定义icon css样式
-                iconSize: [10, 10]// 点大小
-              })
-            }
-            var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
-              icon: Icon
-            })
-            removepoints.push(marker)
-          }
-          this.markerlayer = L.layerGroup(removepoints)
-          map.addLayer(this.markerlayer)
-          this.pointForm.pointlist = e.layer._latlngs
-        }
-      })
-    },
-    fetchData() {
-      console.log('fetchData')
-      listUnbindCar(this.listQuery).then(response => {
-        this.list = response.data
-      })
-    },
-    accessTimeSelect(val) {
-      if (val === '-1') {
-        this.timechoose = true
-      } else {
-        this.timechoose = false
       }
     },
-    search() {
-      this.fetchData(false)
+    mounted() {
+      getDictCode('routeAlarmType').then(response => {
+        this.alarmlist = response.data
+      })
+      getDictCode('carType').then(response => {
+        this.cartypelist = response.data
+      })
     },
-    saveRoute() {
-      if (this.pointForm.pointlist.length === 0) {
-        this.$message.warning('请规划路线')
-      } else {
-        addPath(this.pointForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('新增路线成功！')
-            this.$router.push({ path: '/route/list' })
+    methods: {
+      removeall() {
+        var base = this.baselayer
+        this.map.eachLayer(function(layer) {
+          if (layer !== base[0] && layer !== base[1]) {
+            layer.remove()
           }
         })
-      }
-    },
-    saveCar() {
-      if (this.carlist.length === 0) {
-        this.$message.warning('请至少选择一辆车')
-      } else {
-        for (var i = 0; i < this.carlist.length; i++) {
-          this.carForm.carIds.push(Number(this.carlist[i]))
-        }
-        console.log(this.carForm)
-        bindCar(this.carForm).then(response => {
-          if (response.code === 200) {
-            this.$message.success('绑定车辆信息成功！')
-            this.canclick3 = false
-            this.initMap()
-          }
+        this.pointForm.pointlist = []
+      },
+      initMap() {
+        const map = L.map('map', {
+          minZoom: 3,
+          maxZoom: 18,
+          center: [27.75962, 116.06021],
+          zoom: 11,
+          zoomControl: false,
+          attributionControl: false,
+          crs: L.CRS.EPSG3857
         })
-      }
-    },
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          if (this.routeForm.startDate > this.routeForm.endDate) {
-            this.$message.warning('请确认输入正确起止时间')
-          } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
-            this.$message.warning('请选择时间段')
+        this.map = map // data上需要挂载
+        window.map = map
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.baselayer.push(L.tileLayer(
+          'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+          { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+        ).addTo(map))
+        this.map.pm.addControls({
+          position: 'topleft',
+          drawPolygon: false, // 添加绘制多边形
+          drawMarker: false, // 添加按钮以绘制标记
+          drawCircleMarker: false, // 添加按钮以绘制圆形标记
+          drawPolyline: true, // 添加按钮绘制线条
+          drawRectangle:	false,	// 添加按钮绘制矩形
+          drawCircle: false, //  添加按钮绘制圆圈
+          editMode: false, //  添加按钮编辑多边形
+          dragMode: false, //   添加按钮拖动多边形
+          cutPolygon: false, // 添加一个按钮以删除图层里面的部分内容
+          removalMode: false // 清除图层
+        })
+        // 设置绘制后的线条颜色等
+        this.map.pm.setPathOptions({
+          color: '#409eff',
+          fillColor: 'green',
+          fillOpacity: 0.4
+        })
+        this.map.pm.setLang('zh')
+        this.map.on('pm:create', e => {
+          if (this.pointForm.pointlist.length !== 0) {
+            this.$message.warning('一次只能绘制一条路线')
+            e.layer.remove()
           } else {
-            var timeselect = false
-            if (this.routeForm.accessTime === '-1') {
-              timeselect = true
-              this.routeForm.accessTime = this.accessTime[0]
-              for (var i = 1; i < this.accessTime.length; i++) {
-                this.routeForm.accessTime += (',' + this.accessTime[i])
+            console.log(e, '绘制完成时调用')
+            console.log(e.layer._latlngs[0].lat)
+            var Icon
+            var removepoints = []
+            for (var i = 0; i < e.layer._latlngs.length; i++) {
+              if (i === 0) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/start.png'),
+                  iconSize: [35, 35]
+                })
+              } else if (i === e.layer._latlngs.length - 1) {
+                Icon = L.icon({
+                  iconUrl: require('../../assets/global_images/end.png'),
+                  iconSize: [35, 35]
+                })
+              } else {
+                Icon = L.divIcon({
+                  className: 'my-div-icon', // 自定义icon css样式
+                  iconSize: [10, 10]// 点大小
+                })
               }
+              var marker = L.marker([e.layer._latlngs[i].lat, e.layer._latlngs[i].lng], {
+                icon: Icon
+              })
+              removepoints.push(marker)
             }
-            addRouteInfo(this.routeForm).then(response => {
-              if (response.code === 200) {
-                this.$message.success('添加规划路线基本信息成功！')
-                if (timeselect) {
-                  this.routeForm.accessTime = '自定义时间段'
-                }
-                this.canclick2 = false
-                this.carForm.routeId = response.data
-                this.listQuery.routeId = response.data
-                this.pointForm.routeId = response.data
-                this.activeNames.push('2')
-                this.fetchData()
-              }
-            })
+            this.markerlayer = L.layerGroup(removepoints)
+            map.addLayer(this.markerlayer)
+            this.pointForm.pointlist = e.layer._latlngs
           }
+        })
+      },
+      fetchData() {
+        console.log('fetchData')
+        listUnbindCar(this.listQuery).then(response => {
+          this.list = response.data
+        })
+      },
+      accessTimeSelect(val) {
+        if (val === '-1') {
+          this.timechoose = true
+        } else {
+          this.timechoose = false
         }
-      })
-    },
-    handleChange(val) {
-      console.log(val)
+      },
+      search() {
+        this.fetchData(false)
+      },
+      saveRoute() {
+        this.click3 = false
+        if (this.pointForm.pointlist.length === 0) {
+          this.click3 = true
+          this.$message.warning('请规划路线')
+        } else {
+          addPath(this.pointForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增路线成功！')
+              this.$router.push({ path: '/route/list' })
+            }
+          })
+        }
+      },
+      saveCar() {
+        this.click2 = false
+        if (this.carlist.length === 0) {
+          this.$message.warning('请至少选择一辆车')
+          this.click2 = true
+        } else {
+          for (var i = 0; i < this.carlist.length; i++) {
+            this.carForm.carIds.push(Number(this.carlist[i]))
+          }
+          console.log(this.carForm)
+          bindCar(this.carForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定车辆信息成功！')
+              this.canclick3 = false
+              this.initMap()
+            }
+          })
+        }
+      },
+      saveData() {
+        this.click1 = false
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (this.routeForm.startDate > this.routeForm.endDate) {
+              this.$message.warning('请确认输入正确起止时间')
+              this.click1 = true
+            } else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
+              this.$message.warning('请选择时间段')
+              this.click1 = true
+            } else {
+              var timeselect = false
+              if (this.routeForm.accessTime === '-1') {
+                timeselect = true
+                this.routeForm.accessTime = this.accessTime[0]
+                for (var i = 1; i < this.accessTime.length; i++) {
+                  this.routeForm.accessTime += (',' + this.accessTime[i])
+                }
+              }
+              addRouteInfo(this.routeForm).then(response => {
+                if (response.code === 200) {
+                  this.$message.success('添加规划路线基本信息成功！')
+                  if (timeselect) {
+                    this.routeForm.accessTime = '自定义时间段'
+                  }
+                  this.canclick2 = false
+                  this.carForm.routeId = response.data
+                  this.listQuery.routeId = response.data
+                  this.pointForm.routeId = response.data
+                  this.activeNames.push('2')
+                  this.fetchData()
+                }
+              })
+            }
+          } else {
+            this.click1 = true
+          }
+        })
+      },
+      handleChange(val) {
+        console.log(val)
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/views/route/editRoute.vue b/src/views/route/editRoute.vue
index 6ce4730..c8124cc 100644
--- a/src/views/route/editRoute.vue
+++ b/src/views/route/editRoute.vue
@@ -85,7 +85,7 @@
           </el-row>
         </el-form>
         <div style="text-align:center">
-          <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData">修改路线基本信息</el-button>
+          <el-button :disabled="!click1" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveData">修改路线基本信息</el-button>
         </div>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
@@ -97,7 +97,7 @@
               </el-checkbox-group>
             </div>
             <div style="text-align:center;padding-top: 10px">
-              <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
+              <el-button :disabled="!click2" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
           <el-tab-pane label="增加绑定车辆" name="second">
@@ -129,7 +129,7 @@
               </el-checkbox-group>
             </div>
             <div style="text-align:center;padding-top: 10px">
-              <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="addCar">增加绑定车辆</el-button>
+              <el-button :disabled="!click3" type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="addCar">增加绑定车辆</el-button>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -159,6 +159,9 @@
       routeId: '',
       map: null,
       list: [],
+      click1: true,
+      click2: true,
+      click3: true,
       alarmlist: [],
       cartypelist: [],
       accessTime: [],
@@ -409,7 +412,9 @@
       this.fetchData(false)
     },
     addCar() {
+      this.click3 = false
       if (this.addlist.length === 0) {
+        this.click3 = true
         this.$message.warning('请至少选择一辆车')
       } else {
         this.addCarForm.routeId = this.routeId
@@ -425,7 +430,9 @@
       }
     },
     removeCar() {
+      this.click2 = false
       if (this.removelist.length === 0) {
+        this.click2 = true
         this.$message.warning('请至少选择一辆车解绑')
       } else {
         this.removeCarForm.routeId = this.routeId
@@ -443,9 +450,11 @@
       }
     },
     saveData() {
+      this.click1 = false
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.routeForm.startDate > this.routeForm.endDate) {
+            this.click1 = true
             this.$message.warning('请确认输入正确起止时间')
           } else {
             this.routeForm.accessTime = this.accessTime[0]
@@ -458,6 +467,8 @@
               }
             })
           }
+        } else {
+          this.click1 = true
         }
       })
     }
@@ -467,8 +478,8 @@
 
 <style rel="stylesheet/scss" lang="scss">
   /*#editroute . {*/
-    /*font-size: 15px ;*/
-    /*font-weight: bold;*/
+  /*font-size: 15px ;*/
+  /*font-weight: bold;*/
   /*}*/
   #editroute .el-checkbox__label {
     font-size: 15px ;
diff --git a/static/project.config.json b/static/project.config.json
index c66d2a1..8ee0219 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "基础资源系统",
+  "title": "车辆管理系统",
   "baseUrl": "http://111.198.10.15:11409/",
   "mainPage": "",
   "singleSys": true,