diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/deviceManage/busController.vue b/src/views/deviceManage/busController.vue
index 4646bf2..d4e45ee 100644
--- a/src/views/deviceManage/busController.vue
+++ b/src/views/deviceManage/busController.vue
@@ -4,13 +4,10 @@
     <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable />
+        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable/>
       </search-item>
-      <search-item/>
       <search-item>
-        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable>
-          <el-option v-for="item in controllerTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-        </el-select>
+        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable/>
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptId" :dept-show="true" :need-top="true" size="small" placeholder="所属组织"/>

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/deviceManage/busController.vue b/src/views/deviceManage/busController.vue
index 4646bf2..d4e45ee 100644
--- a/src/views/deviceManage/busController.vue
+++ b/src/views/deviceManage/busController.vue
@@ -4,13 +4,10 @@
     <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable />
+        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable/>
       </search-item>
-      <search-item/>
       <search-item>
-        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable>
-          <el-option v-for="item in controllerTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-        </el-select>
+        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable/>
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptId" :dept-show="true" :need-top="true" size="small" placeholder="所属组织"/>
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..1579ec9
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="tab-block">
+    <el-radio-group v-model="type" @change="changeType">
+      <el-radio :label="'lamp'">按路灯</el-radio>
+      <el-radio :label="'lampbox'">按灯箱</el-radio>
+      <el-radio :label="'circuit'">按回路</el-radio>
+    </el-radio-group>
+    <!-- 按路灯搜索 -->
+    <div class="search-row">
+      <el-row v-if="type === 'lamp'" :gutter="10">
+        <el-col :span="6">
+          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
+            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按灯箱搜索 -->
+      <el-row v-if="type === 'lampbox'" :gutter="10">
+        <el-col :span="8">
+          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按回路搜索 -->
+      <el-row v-if="type === 'circuit'" :gutter="10">
+        <el-col :span="10" :offset="2">
+          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="10">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 搜索 & 开关灯 -->
+      <el-row class="button-row">
+        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
+      </el-row>
+    </div>
+    <!-- 搜索结果列表 -->
+    <el-table
+      v-loading="listLoading"
+      v-show="showList"
+      :row-style="{height: '33px'}"
+      :cell-style="{padding: '0px'}"
+      :data="lampList"
+      class="infinite-list"
+      border
+      infinite-scroll-disabled="disabled"
+      max-height="300px"
+      style="margin-top: 20px;"
+      @row-click="rowClick"
+      @selection-change="handleSelectionChange">
+      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
+      <el-table-column align="center" type="index" label="序号" width="50"/>
+      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
+      <el-table-column align="center" prop="lampName" label="路灯名称"/>
+      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getAllStreet } from '@/api/street'
+
+export default {
+  name: 'LampTabPane',
+  props: {
+    lampQuery: {
+      type: Object,
+      default: function() {
+        return {
+          lampCode: '',
+          status: '',
+          lampStreet: '',
+          lampArea: '',
+          lampboxCode: '',
+          lampboxStreet: '',
+          lampboxArea: '',
+          circuitCode: ''
+        }
+      }
+    }, // 查询条件
+    lampList: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, // 路灯列表
+    listLoading: {
+      type: Boolean,
+      default: false
+    }, // 列表加载
+    showList: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      type: 'lamp',
+      statusList: [
+        { value: '1', name: '开灯' },
+        { value: '2', name: '灭灯' },
+        { value: '3', name: '报警' },
+        { value: '4', name: '离线' }
+      ],
+      streetList: [],
+      areaList: []
+    }
+  },
+  created() {
+    this.initStreetList()
+    this.initAreaList()
+  },
+  methods: {
+    searchLamp() {
+      console.log('inQuery', this.lampQuery)
+      this.$emit('searchLamp')
+      // this.showList = true
+    },
+    controlLamp(lampIds, controlType) {
+      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
+    },
+    initStreetList() {
+      getAllStreet().then(res => {
+        this.streetList = res.data
+      })
+    },
+    initAreaList() {
+      getAllStreet().then(res => {
+        this.areaList = res.data
+      })
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 状态为"离线"，不能勾选
+    selectable(row, index) {
+      return row.status !== '4'
+    },
+    rowClick(row) {
+      this.$emit('rowClick', row)
+    },
+    changeType() {
+      this.$emit('changeType')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-radio-group{
+  margin: 10px;
+  margin-bottom: 0px;
+}
+.search-row{
+  margin: 10px;
+}
+.button-row{
+  /*margin: 10px;*/
+  margin-top: 10px;
+  margin-bottom: -15px;
+}
+.search-button{
+  margin: 10px;
+}
+  .infinite-list{
+    margin-top: 10px;
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/deviceManage/busController.vue b/src/views/deviceManage/busController.vue
index 4646bf2..d4e45ee 100644
--- a/src/views/deviceManage/busController.vue
+++ b/src/views/deviceManage/busController.vue
@@ -4,13 +4,10 @@
     <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable />
+        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable/>
       </search-item>
-      <search-item/>
       <search-item>
-        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable>
-          <el-option v-for="item in controllerTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-        </el-select>
+        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable/>
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptId" :dept-show="true" :need-top="true" size="small" placeholder="所属组织"/>
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..1579ec9
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="tab-block">
+    <el-radio-group v-model="type" @change="changeType">
+      <el-radio :label="'lamp'">按路灯</el-radio>
+      <el-radio :label="'lampbox'">按灯箱</el-radio>
+      <el-radio :label="'circuit'">按回路</el-radio>
+    </el-radio-group>
+    <!-- 按路灯搜索 -->
+    <div class="search-row">
+      <el-row v-if="type === 'lamp'" :gutter="10">
+        <el-col :span="6">
+          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
+            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按灯箱搜索 -->
+      <el-row v-if="type === 'lampbox'" :gutter="10">
+        <el-col :span="8">
+          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按回路搜索 -->
+      <el-row v-if="type === 'circuit'" :gutter="10">
+        <el-col :span="10" :offset="2">
+          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="10">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 搜索 & 开关灯 -->
+      <el-row class="button-row">
+        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
+      </el-row>
+    </div>
+    <!-- 搜索结果列表 -->
+    <el-table
+      v-loading="listLoading"
+      v-show="showList"
+      :row-style="{height: '33px'}"
+      :cell-style="{padding: '0px'}"
+      :data="lampList"
+      class="infinite-list"
+      border
+      infinite-scroll-disabled="disabled"
+      max-height="300px"
+      style="margin-top: 20px;"
+      @row-click="rowClick"
+      @selection-change="handleSelectionChange">
+      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
+      <el-table-column align="center" type="index" label="序号" width="50"/>
+      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
+      <el-table-column align="center" prop="lampName" label="路灯名称"/>
+      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getAllStreet } from '@/api/street'
+
+export default {
+  name: 'LampTabPane',
+  props: {
+    lampQuery: {
+      type: Object,
+      default: function() {
+        return {
+          lampCode: '',
+          status: '',
+          lampStreet: '',
+          lampArea: '',
+          lampboxCode: '',
+          lampboxStreet: '',
+          lampboxArea: '',
+          circuitCode: ''
+        }
+      }
+    }, // 查询条件
+    lampList: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, // 路灯列表
+    listLoading: {
+      type: Boolean,
+      default: false
+    }, // 列表加载
+    showList: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      type: 'lamp',
+      statusList: [
+        { value: '1', name: '开灯' },
+        { value: '2', name: '灭灯' },
+        { value: '3', name: '报警' },
+        { value: '4', name: '离线' }
+      ],
+      streetList: [],
+      areaList: []
+    }
+  },
+  created() {
+    this.initStreetList()
+    this.initAreaList()
+  },
+  methods: {
+    searchLamp() {
+      console.log('inQuery', this.lampQuery)
+      this.$emit('searchLamp')
+      // this.showList = true
+    },
+    controlLamp(lampIds, controlType) {
+      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
+    },
+    initStreetList() {
+      getAllStreet().then(res => {
+        this.streetList = res.data
+      })
+    },
+    initAreaList() {
+      getAllStreet().then(res => {
+        this.areaList = res.data
+      })
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 状态为"离线"，不能勾选
+    selectable(row, index) {
+      return row.status !== '4'
+    },
+    rowClick(row) {
+      this.$emit('rowClick', row)
+    },
+    changeType() {
+      this.$emit('changeType')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-radio-group{
+  margin: 10px;
+  margin-bottom: 0px;
+}
+.search-row{
+  margin: 10px;
+}
+.button-row{
+  /*margin: 10px;*/
+  margin-top: 10px;
+  margin-bottom: -15px;
+}
+.search-button{
+  margin: 10px;
+}
+  .infinite-list{
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index db279d8..9565f6b 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -70,102 +70,15 @@
       <div v-show="showtable">
         <el-tabs v-model="tab" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="路灯列表" name="lamp">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lamp'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-                <el-col :span="6" class="edit_btns" style="margin-top:6px;text-align: right;margin-left: 8px">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','1')">开灯</el-button>
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','0')">关灯</el-button>
-                </el-col>
-              </el-row>
-              <el-table
-                v-loading="listLoading"
-                :row-style="{height: '33px'}"
-                :cell-style="{padding: '0px'}"
-                :data="list"
-                class="infinite-list"
-                border
-                infinite-scroll-disabled="disabled"
-                height="300px"
-                style="margin-top: -10px;"
-                @row-click="rowClick"
-                @selection-change="handleSelectionChange">
-                <el-table-column align="center" type="selection" width="55"/>
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="回路列表" name="circuit">
-            <div class="tab-block">
-              <el-row v-if="tab === 'circuit'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="circuitQuery.circuitCode" size="small" placeholder="回路编号" clearable />
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="灯箱列表" name="lampbox">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lampbox'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampboxQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampboxQuery.streetId" size="small" placeholder="道路" filterable clearable>
-                    <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+            <lamp-tab-pane
+              :lamp-list="lamplist"
+              :lamp-query="lampQuery"
+              :list-loading="listLoading"
+              :show-list="showList"
+              @searchLamp="search"
+              @controlLamp="control(lampIds,'','',controlLamp)"
+              @rowClick="rowClick"
+              @changeType="resetLampQuery"/>
           </el-tab-pane>
           <el-tab-pane label="报警列表" name="alarm">
             <div class="tab-block">
@@ -202,10 +115,12 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getAllStreet } from '@/api/system/area'
-import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/system/overview'
+// import { getAllStreet } from '@/api/street'
+import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/overview'
+import LampTabPane from './lampTabPane'
 export default {
   name: 'Overview',
+  components: { LampTabPane },
   data() {
     return {
       bottombtn: 'lamp',
@@ -290,8 +205,12 @@
       lampQuery: {
         lampCode: '',
         status: '',
-        circuitId: '',
-        lampBoxId: ''
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
       },
       circuitQuery: {
         circuitCode: ''
@@ -303,7 +222,8 @@
       alarmQuery: {
         deviceType: '',
         alarmType: ''
-      }
+      },
+      showList: false
     }
   },
   mounted() {
@@ -311,15 +231,17 @@
     this.initData()
   },
   methods: {
+    // 隐藏或显示左侧列表
     tableclick() {
       this.showtable = !this.showtable
     },
+    // 点击列表中的行，调整地图视角
     rowClick(row) {
       if (this.tab === 'lamp') {
         for (var i = 0; i < this.iconlist.length; i++) {
           if (this.iconlist[i].options.id === row.lampId) {
             console.log(this.iconlist[i])
-            this.map.setView(this.iconlist[i]._latlng, 17)
+            this.map.setView(this.iconlist[i]._latlng, 19)
             // this.map.setView({ lat: cenLat, lng: cenLng }, 18)
           }
         }
@@ -338,11 +260,11 @@
       }
     },
     async search() {
+      console.log('outQuery', this.lampQuery)
       this.listLoading = true
       if (this.tab === 'lamp') {
-        const detail = await getLampList(this.lampQuery)
-        this.lamplist = detail.data
-        this.list = this.lamplist
+        await this.getlamp()
+        this.showList = true
       } else if (this.tab === 'circuit') {
         const detail = await getCircuitList(this.circuitQuery)
         this.ciulistlist = detail.data
@@ -358,10 +280,24 @@
       }
       this.listLoading = false
     },
+    resetLampQuery() {
+      this.lampQuery = {
+        lampCode: '',
+        status: '',
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
+      }
+    },
     async tabClick(tab, event) {
       this.listLoading = true
       if (tab.name === 'lamp') {
         this.bottombtn = 'lamp'
+        this.resetLampQuery()
+        this.showList = false
         this.getlamp('', '', '')
         this.lampQuery.status = ''
         this.lampQuery.circuitId = ''
@@ -471,20 +407,20 @@
     async initData() {
       const resDetail = await getLampStatus()
       this.status = resDetail.data
-      const lampDetail = await getLampList(this.lampQuery)
-      this.lamplist = lampDetail.data
-      this.list = this.lamplist
-      const circuitDetail = await getCircuitList()
-      this.circuitlist = circuitDetail.data
+      // const lampDetail = await getLampList(this.lampQuery)
+      // this.lamplist = lampDetail.data
+      // this.list = this.lamplist
+      // const circuitDetail = await getCircuitList()
+      // this.circuitlist = circuitDetail.data
       const lampboxDetail = await getLampBoxList()
       this.lampboxlist = lampboxDetail.data
       const alarmDetail = await getAlarmList()
       this.alarmlist = alarmDetail.data
-      this.getlamp('', '', '')
+      this.getlamp()
 
       // 获取道路列表
-      const streetList = await getAllStreet(null)
-      this.streetList = streetList.data
+      // const streetList = await getAllStreet(null)
+      // this.streetList = streetList.data
     },
     removemarkers() {
       for (var i = 0; i < this.iconlist.length; i++) {
@@ -529,9 +465,10 @@
     },
     async getlamp(status, circuitId, lampBoxId) {
       this.removemarkers()
-      this.lampQuery.status = status
-      this.lampQuery.circuitId = circuitId
-      this.lampQuery.lampBoxId = lampBoxId
+      // this.lampQuery.status = status
+      // this.lampQuery.circuitId = circuitId
+      // this.lampQuery.lampBoxId = lampBoxId
+      console.log('getLamp', this.lampQuery)
       const resDetail = await getLampList(this.lampQuery)
       this.lamplist = resDetail.data
       if (this.lamplist.length === 0) {
@@ -572,32 +509,42 @@
           }
           getlampDetail(e.target.options.id).then(response => {
             var data = response.data
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-                '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">路灯详情信息</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯编号：</label>' + data.lampCode	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯类型：</label>' + data.lampTypeName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯状态：</label>' + data.statusName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>' + data.groupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯功率(W)：</label>' + data.power	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>' + data.controllerCode	 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器类型：</label>' + data.controllerTypeName		 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器分组：</label>' + data.controllerGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>' + data.lamppostCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆名称：</label>' + data.lamppostName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆类型：</label>' + data.lamppostTypeName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆分组：</label>' + data.postGroupName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路编号：</label>' + data.circuitCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路名称：</label>' + data.circuitName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路分组：</label>' + data.circuitGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位/高度(m)：</label>' + data.latitude + ';' + data.longitude + ' / ' + data.height + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.height + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新电压(V)/电流值(A)：</label>' + data.latestVol + ' / ' + data.latestElec + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新功率(W)：</label>' + data.latestPower + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>' + data.latestTime + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-                '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号+设备状态
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '路灯' + data.lampCode
+            if (data.statusName) {
+              str += `——` + data.statusName
+            }
+            str += `</div>`
+            if (data.groupName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>` + data.groupName	 + `</div>`
+            }
+            if (data.controllerCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>` + data.controllerCode	 + `</div>`
+            }
+            if (data.lamppostCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>` + data.lamppostCode	 + `</div>`
+            }
+            if (data.height) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度(m)：</label>` + data.height	 + `</div>`
+            }
+            if (data.latestVol) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电压(V)：</label>` + data.latestVol	 + `</div>`
+            }
+            if (data.latestElec) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电流(A)：</label>` + data.latestElec	 + `</div>`
+            }
+            if (data.latestPower) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">功率(W)：</label>` + data.latestPower	 + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            // todo 开关灯按钮
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -631,25 +578,35 @@
           id: this.lampboxlist[i].id
         }).addTo(this.map)
         item.on('click', function(e) {
+          console.log(e.target.options)
           if (e.target.dragging._marker._popup) {
             e.target.dragging._marker.unbindPopup()
           }
           getLampBoxDetail(e.target.options.id).then(response => {
             var data = response.data
             console.log(response.data)
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">灯箱详情信息</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱编号：</label>' + data.lampboxCode	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>' + data.lampboxName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位：</label>' + data.latitude + ';' + data.longitude + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>' + data.elecA + ' / ' + data.elecB + ' / ' + data.elecC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>' + data.volA + ' / ' + data.volB + ' / ' + data.volC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>' + data.powerA + ' / ' + data.powerB + ' / ' + data.powerC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>' + data.upTime + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-              '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '灯箱' + data.lampboxCode + `</div>`
+            if (data.lampboxName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>` + data.lampboxName	 + `</div>`
+            }
+            if (data.elecA || data.elecB || data.elecC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>` + data.elecA + `/` + data.elecB + `/` + data.elecC + `</div>`
+            }
+            if (data.volA || data.volB || data.volC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>` + data.volA + `/` + data.volB + `/` + data.volC + `</div>`
+            }
+            if (data.powerA || data.powerB || data.powerC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>` + data.powerA + `/` + data.powerB + `/` + data.powerC + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -746,6 +703,7 @@
       }
       return 5
     },
+    // 初始化地图
     init() {
       const map = L.map('map', {
         minZoom: 2,

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/deviceManage/busController.vue b/src/views/deviceManage/busController.vue
index 4646bf2..d4e45ee 100644
--- a/src/views/deviceManage/busController.vue
+++ b/src/views/deviceManage/busController.vue
@@ -4,13 +4,10 @@
     <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable />
+        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable/>
       </search-item>
-      <search-item/>
       <search-item>
-        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable>
-          <el-option v-for="item in controllerTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-        </el-select>
+        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable/>
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptId" :dept-show="true" :need-top="true" size="small" placeholder="所属组织"/>
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..1579ec9
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="tab-block">
+    <el-radio-group v-model="type" @change="changeType">
+      <el-radio :label="'lamp'">按路灯</el-radio>
+      <el-radio :label="'lampbox'">按灯箱</el-radio>
+      <el-radio :label="'circuit'">按回路</el-radio>
+    </el-radio-group>
+    <!-- 按路灯搜索 -->
+    <div class="search-row">
+      <el-row v-if="type === 'lamp'" :gutter="10">
+        <el-col :span="6">
+          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
+            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按灯箱搜索 -->
+      <el-row v-if="type === 'lampbox'" :gutter="10">
+        <el-col :span="8">
+          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按回路搜索 -->
+      <el-row v-if="type === 'circuit'" :gutter="10">
+        <el-col :span="10" :offset="2">
+          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="10">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 搜索 & 开关灯 -->
+      <el-row class="button-row">
+        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
+      </el-row>
+    </div>
+    <!-- 搜索结果列表 -->
+    <el-table
+      v-loading="listLoading"
+      v-show="showList"
+      :row-style="{height: '33px'}"
+      :cell-style="{padding: '0px'}"
+      :data="lampList"
+      class="infinite-list"
+      border
+      infinite-scroll-disabled="disabled"
+      max-height="300px"
+      style="margin-top: 20px;"
+      @row-click="rowClick"
+      @selection-change="handleSelectionChange">
+      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
+      <el-table-column align="center" type="index" label="序号" width="50"/>
+      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
+      <el-table-column align="center" prop="lampName" label="路灯名称"/>
+      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getAllStreet } from '@/api/street'
+
+export default {
+  name: 'LampTabPane',
+  props: {
+    lampQuery: {
+      type: Object,
+      default: function() {
+        return {
+          lampCode: '',
+          status: '',
+          lampStreet: '',
+          lampArea: '',
+          lampboxCode: '',
+          lampboxStreet: '',
+          lampboxArea: '',
+          circuitCode: ''
+        }
+      }
+    }, // 查询条件
+    lampList: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, // 路灯列表
+    listLoading: {
+      type: Boolean,
+      default: false
+    }, // 列表加载
+    showList: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      type: 'lamp',
+      statusList: [
+        { value: '1', name: '开灯' },
+        { value: '2', name: '灭灯' },
+        { value: '3', name: '报警' },
+        { value: '4', name: '离线' }
+      ],
+      streetList: [],
+      areaList: []
+    }
+  },
+  created() {
+    this.initStreetList()
+    this.initAreaList()
+  },
+  methods: {
+    searchLamp() {
+      console.log('inQuery', this.lampQuery)
+      this.$emit('searchLamp')
+      // this.showList = true
+    },
+    controlLamp(lampIds, controlType) {
+      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
+    },
+    initStreetList() {
+      getAllStreet().then(res => {
+        this.streetList = res.data
+      })
+    },
+    initAreaList() {
+      getAllStreet().then(res => {
+        this.areaList = res.data
+      })
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 状态为"离线"，不能勾选
+    selectable(row, index) {
+      return row.status !== '4'
+    },
+    rowClick(row) {
+      this.$emit('rowClick', row)
+    },
+    changeType() {
+      this.$emit('changeType')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-radio-group{
+  margin: 10px;
+  margin-bottom: 0px;
+}
+.search-row{
+  margin: 10px;
+}
+.button-row{
+  /*margin: 10px;*/
+  margin-top: 10px;
+  margin-bottom: -15px;
+}
+.search-button{
+  margin: 10px;
+}
+  .infinite-list{
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index db279d8..9565f6b 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -70,102 +70,15 @@
       <div v-show="showtable">
         <el-tabs v-model="tab" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="路灯列表" name="lamp">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lamp'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-                <el-col :span="6" class="edit_btns" style="margin-top:6px;text-align: right;margin-left: 8px">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','1')">开灯</el-button>
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','0')">关灯</el-button>
-                </el-col>
-              </el-row>
-              <el-table
-                v-loading="listLoading"
-                :row-style="{height: '33px'}"
-                :cell-style="{padding: '0px'}"
-                :data="list"
-                class="infinite-list"
-                border
-                infinite-scroll-disabled="disabled"
-                height="300px"
-                style="margin-top: -10px;"
-                @row-click="rowClick"
-                @selection-change="handleSelectionChange">
-                <el-table-column align="center" type="selection" width="55"/>
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="回路列表" name="circuit">
-            <div class="tab-block">
-              <el-row v-if="tab === 'circuit'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="circuitQuery.circuitCode" size="small" placeholder="回路编号" clearable />
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="灯箱列表" name="lampbox">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lampbox'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampboxQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampboxQuery.streetId" size="small" placeholder="道路" filterable clearable>
-                    <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+            <lamp-tab-pane
+              :lamp-list="lamplist"
+              :lamp-query="lampQuery"
+              :list-loading="listLoading"
+              :show-list="showList"
+              @searchLamp="search"
+              @controlLamp="control(lampIds,'','',controlLamp)"
+              @rowClick="rowClick"
+              @changeType="resetLampQuery"/>
           </el-tab-pane>
           <el-tab-pane label="报警列表" name="alarm">
             <div class="tab-block">
@@ -202,10 +115,12 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getAllStreet } from '@/api/system/area'
-import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/system/overview'
+// import { getAllStreet } from '@/api/street'
+import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/overview'
+import LampTabPane from './lampTabPane'
 export default {
   name: 'Overview',
+  components: { LampTabPane },
   data() {
     return {
       bottombtn: 'lamp',
@@ -290,8 +205,12 @@
       lampQuery: {
         lampCode: '',
         status: '',
-        circuitId: '',
-        lampBoxId: ''
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
       },
       circuitQuery: {
         circuitCode: ''
@@ -303,7 +222,8 @@
       alarmQuery: {
         deviceType: '',
         alarmType: ''
-      }
+      },
+      showList: false
     }
   },
   mounted() {
@@ -311,15 +231,17 @@
     this.initData()
   },
   methods: {
+    // 隐藏或显示左侧列表
     tableclick() {
       this.showtable = !this.showtable
     },
+    // 点击列表中的行，调整地图视角
     rowClick(row) {
       if (this.tab === 'lamp') {
         for (var i = 0; i < this.iconlist.length; i++) {
           if (this.iconlist[i].options.id === row.lampId) {
             console.log(this.iconlist[i])
-            this.map.setView(this.iconlist[i]._latlng, 17)
+            this.map.setView(this.iconlist[i]._latlng, 19)
             // this.map.setView({ lat: cenLat, lng: cenLng }, 18)
           }
         }
@@ -338,11 +260,11 @@
       }
     },
     async search() {
+      console.log('outQuery', this.lampQuery)
       this.listLoading = true
       if (this.tab === 'lamp') {
-        const detail = await getLampList(this.lampQuery)
-        this.lamplist = detail.data
-        this.list = this.lamplist
+        await this.getlamp()
+        this.showList = true
       } else if (this.tab === 'circuit') {
         const detail = await getCircuitList(this.circuitQuery)
         this.ciulistlist = detail.data
@@ -358,10 +280,24 @@
       }
       this.listLoading = false
     },
+    resetLampQuery() {
+      this.lampQuery = {
+        lampCode: '',
+        status: '',
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
+      }
+    },
     async tabClick(tab, event) {
       this.listLoading = true
       if (tab.name === 'lamp') {
         this.bottombtn = 'lamp'
+        this.resetLampQuery()
+        this.showList = false
         this.getlamp('', '', '')
         this.lampQuery.status = ''
         this.lampQuery.circuitId = ''
@@ -471,20 +407,20 @@
     async initData() {
       const resDetail = await getLampStatus()
       this.status = resDetail.data
-      const lampDetail = await getLampList(this.lampQuery)
-      this.lamplist = lampDetail.data
-      this.list = this.lamplist
-      const circuitDetail = await getCircuitList()
-      this.circuitlist = circuitDetail.data
+      // const lampDetail = await getLampList(this.lampQuery)
+      // this.lamplist = lampDetail.data
+      // this.list = this.lamplist
+      // const circuitDetail = await getCircuitList()
+      // this.circuitlist = circuitDetail.data
       const lampboxDetail = await getLampBoxList()
       this.lampboxlist = lampboxDetail.data
       const alarmDetail = await getAlarmList()
       this.alarmlist = alarmDetail.data
-      this.getlamp('', '', '')
+      this.getlamp()
 
       // 获取道路列表
-      const streetList = await getAllStreet(null)
-      this.streetList = streetList.data
+      // const streetList = await getAllStreet(null)
+      // this.streetList = streetList.data
     },
     removemarkers() {
       for (var i = 0; i < this.iconlist.length; i++) {
@@ -529,9 +465,10 @@
     },
     async getlamp(status, circuitId, lampBoxId) {
       this.removemarkers()
-      this.lampQuery.status = status
-      this.lampQuery.circuitId = circuitId
-      this.lampQuery.lampBoxId = lampBoxId
+      // this.lampQuery.status = status
+      // this.lampQuery.circuitId = circuitId
+      // this.lampQuery.lampBoxId = lampBoxId
+      console.log('getLamp', this.lampQuery)
       const resDetail = await getLampList(this.lampQuery)
       this.lamplist = resDetail.data
       if (this.lamplist.length === 0) {
@@ -572,32 +509,42 @@
           }
           getlampDetail(e.target.options.id).then(response => {
             var data = response.data
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-                '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">路灯详情信息</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯编号：</label>' + data.lampCode	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯类型：</label>' + data.lampTypeName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯状态：</label>' + data.statusName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>' + data.groupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯功率(W)：</label>' + data.power	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>' + data.controllerCode	 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器类型：</label>' + data.controllerTypeName		 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器分组：</label>' + data.controllerGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>' + data.lamppostCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆名称：</label>' + data.lamppostName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆类型：</label>' + data.lamppostTypeName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆分组：</label>' + data.postGroupName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路编号：</label>' + data.circuitCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路名称：</label>' + data.circuitName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路分组：</label>' + data.circuitGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位/高度(m)：</label>' + data.latitude + ';' + data.longitude + ' / ' + data.height + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.height + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新电压(V)/电流值(A)：</label>' + data.latestVol + ' / ' + data.latestElec + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新功率(W)：</label>' + data.latestPower + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>' + data.latestTime + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-                '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号+设备状态
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '路灯' + data.lampCode
+            if (data.statusName) {
+              str += `——` + data.statusName
+            }
+            str += `</div>`
+            if (data.groupName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>` + data.groupName	 + `</div>`
+            }
+            if (data.controllerCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>` + data.controllerCode	 + `</div>`
+            }
+            if (data.lamppostCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>` + data.lamppostCode	 + `</div>`
+            }
+            if (data.height) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度(m)：</label>` + data.height	 + `</div>`
+            }
+            if (data.latestVol) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电压(V)：</label>` + data.latestVol	 + `</div>`
+            }
+            if (data.latestElec) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电流(A)：</label>` + data.latestElec	 + `</div>`
+            }
+            if (data.latestPower) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">功率(W)：</label>` + data.latestPower	 + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            // todo 开关灯按钮
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -631,25 +578,35 @@
           id: this.lampboxlist[i].id
         }).addTo(this.map)
         item.on('click', function(e) {
+          console.log(e.target.options)
           if (e.target.dragging._marker._popup) {
             e.target.dragging._marker.unbindPopup()
           }
           getLampBoxDetail(e.target.options.id).then(response => {
             var data = response.data
             console.log(response.data)
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">灯箱详情信息</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱编号：</label>' + data.lampboxCode	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>' + data.lampboxName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位：</label>' + data.latitude + ';' + data.longitude + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>' + data.elecA + ' / ' + data.elecB + ' / ' + data.elecC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>' + data.volA + ' / ' + data.volB + ' / ' + data.volC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>' + data.powerA + ' / ' + data.powerB + ' / ' + data.powerC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>' + data.upTime + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-              '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '灯箱' + data.lampboxCode + `</div>`
+            if (data.lampboxName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>` + data.lampboxName	 + `</div>`
+            }
+            if (data.elecA || data.elecB || data.elecC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>` + data.elecA + `/` + data.elecB + `/` + data.elecC + `</div>`
+            }
+            if (data.volA || data.volB || data.volC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>` + data.volA + `/` + data.volB + `/` + data.volC + `</div>`
+            }
+            if (data.powerA || data.powerB || data.powerC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>` + data.powerA + `/` + data.powerB + `/` + data.powerC + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -746,6 +703,7 @@
       }
       return 5
     },
+    // 初始化地图
     init() {
       const map = L.map('map', {
         minZoom: 2,
diff --git a/src/views/strategy/components/editStrategy.vue b/src/views/strategy/components/editStrategy.vue
index ae64c77..8bb6ed3 100644
--- a/src/views/strategy/components/editStrategy.vue
+++ b/src/views/strategy/components/editStrategy.vue
@@ -291,7 +291,7 @@
       this.deviceList = []
       this.strategyInfo.strategyInfo.groupIds = []
       getGroupList(this.strategyInfo.strategyInfo.deviceType).then(response => {
-        console.log(response,'111111111111111111')
+        console.log(response, '111111111111111111')
         for (var i = 0; i < response.data.length; i++) {
           var item = { name: response.data[i].groupName, value: response.data[i].id }
           this.deviceList.push(item)

diff --git a/config/index.js b/config/index.js
index 8abd37a..d1dc353 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/lampCr/',
 
     /**
      * Source Maps
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/overview.js b/src/api/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/street.js b/src/api/street.js
new file mode 100644
index 0000000..f3255ba
--- /dev/null
+++ b/src/api/street.js
@@ -0,0 +1,67 @@
+/**
+ * 道路管理接口
+ */
+
+import request from '@/utils/request'
+import qs from 'qs'
+import Vue from 'vue'
+
+// 查询道路
+export function getStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/listPage',
+    method: 'get',
+    params: params
+  })
+}
+
+// 不分页查询所有道路
+export function getAllStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 删除道路
+export function delStreets(ids) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/batchDelete',
+    method: 'post',
+    params: {
+      busBaseStreetIds: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 添加道路
+export function addStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/add',
+    method: 'post',
+    params
+  })
+}
+
+// 编辑道路
+export function updateStreet(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'busBaseStreet/update',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
diff --git a/src/layout/components/TagsView/AppHeader-new.vue b/src/layout/components/TagsView/AppHeader-new.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader-new.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/layout/components/TagsView/AppHeader.vue b/src/layout/components/TagsView/AppHeader.vue
new file mode 100644
index 0000000..c192d79
--- /dev/null
+++ b/src/layout/components/TagsView/AppHeader.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-header class="app-header">
+    <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-dropdown class="dropdown-container" trigger="click">
+      <div class="dropdown-wrapper">
+        <span style="line-height:50px;">欢迎您，{{ name }}</span>
+        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+        <i class="el-icon-arrow-down"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-item v-if="!baseConfig.singleSys">
+          <span style="display:block;" @click="backToIndex">回首页</span>
+        </el-dropdown-item>
+        <el-dropdown-item :divided="!baseConfig.singleSys">
+          <span style="display:block;" @click="resetPwd">修改密码</span>
+        </el-dropdown-item>
+        <el-dropdown-item divided>
+          <span style="display:block;" @click="logout">注销</span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
+  </el-header>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ResetPwd from '@/views/system/user/resetPwd'
+
+export default {
+  name: 'AppHeader',
+  components: { ResetPwd },
+  data() {
+    return {
+      title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
+      name: this.$store.getters.name, // 用户姓名
+      showSetPwd: false // 是否显示修改密码按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'currentSystem',
+      'systems'
+    ])
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('ToggleSideBar')
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload() // 为了重新实例化vue-router对象 避免bug
+      })
+    },
+    resetPwd() {
+      this.showSetPwd = true
+      this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+        // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  h3{
+    margin-left:24px;
+    display: inline-block;
+    float:left;
+  }
+  .dropdown-container {
+    /*height: 50px;*/
+    display: inline-block;
+    float: right;
+    z-index:500;
+    position: fixed;
+    top:0px;
+    right: 35px;
+    .dropdown-wrapper {
+      cursor: pointer;
+      margin-top: 5px;
+      position: relative;
+      line-height: initial;
+      .user-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+      .el-icon-caret-bottom {
+        font-size: 12px;
+      }
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b558038..222c1e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@
 import { reportRouters } from './modules/report'
 import { strategyRouters } from './modules/strategy'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -81,7 +80,6 @@
   ...alarmRouters,
   ...reportRouters,
   ...strategyRouters,
-  ...exampleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 18700f3..ae9cb55 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -59,6 +59,12 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/loginLog'] }
+    },
+    {
+      path: '/streetList',
+      component: () => import('@/views/base/street/streetList'),
+      name: 'StreetList',
+      meta: { title: '道路管理', permission: ['/streetList'] }
     }
   ]
 }]
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
index d598779..a6dcbd2 100644
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ b/src/views/alarmManage/components/alarmDetail.vue
@@ -53,7 +53,11 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { getDetail } from '@/api/system/alarm'
+=======
+import { getDetail } from '@/api/alarm'
+>>>>>>> 1145cce5f8785b189a11e92e2b225ced4a6b6661
 
 export default {
   name: 'AlarmDetail',
diff --git a/src/views/alarmManage/lampType/lampTypeList.vue b/src/views/alarmManage/lampType/lampTypeList.vue
index f10c63b..e0c5719 100644
--- a/src/views/alarmManage/lampType/lampTypeList.vue
+++ b/src/views/alarmManage/lampType/lampTypeList.vue
@@ -78,6 +78,7 @@
 import editLampType from '@/views/base/lampType/editLampType'
 import { getLampType, delLampType } from '@/api/system/base'
 
+
 export default {
   name: 'LampTypeList',
   components: { editLampType },
diff --git a/src/views/alarmManage/lampboxType/editLampboxType.vue b/src/views/alarmManage/lampboxType/editLampboxType.vue
index ae3a7c1..d3fd263 100644
--- a/src/views/alarmManage/lampboxType/editLampboxType.vue
+++ b/src/views/alarmManage/lampboxType/editLampboxType.vue
@@ -8,7 +8,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row v-show="false" :gutter="20">
         <el-col :span="20">
           <el-form-item label="是否启用离线报警" prop="offlineAlarm">
diff --git a/src/views/alarmManage/listAlarm.vue b/src/views/alarmManage/listAlarm.vue
index fe3e359..1ff7705 100644
--- a/src/views/alarmManage/listAlarm.vue
+++ b/src/views/alarmManage/listAlarm.vue
@@ -190,7 +190,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d98b641..4669fd6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -185,7 +185,6 @@
       if (val && val.page) {
         this.listQuery.offset = val.page
       }
-      this.fetchData()
     }
   }
 }
diff --git a/src/views/deviceManage/busController.vue b/src/views/deviceManage/busController.vue
index 4646bf2..d4e45ee 100644
--- a/src/views/deviceManage/busController.vue
+++ b/src/views/deviceManage/busController.vue
@@ -4,13 +4,10 @@
     <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable />
+        <el-input v-model.trim="listQuery.controllerCode" size="small" placeholder="控制器编号" clearable/>
       </search-item>
-      <search-item/>
       <search-item>
-        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable>
-          <el-option v-for="item in controllerTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-        </el-select>
+        <el-select v-model="listQuery.controllerType" size="small" placeholder="控制器类型" clearable/>
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptId" :dept-show="true" :need-top="true" size="small" placeholder="所属组织"/>
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..1579ec9
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="tab-block">
+    <el-radio-group v-model="type" @change="changeType">
+      <el-radio :label="'lamp'">按路灯</el-radio>
+      <el-radio :label="'lampbox'">按灯箱</el-radio>
+      <el-radio :label="'circuit'">按回路</el-radio>
+    </el-radio-group>
+    <!-- 按路灯搜索 -->
+    <div class="search-row">
+      <el-row v-if="type === 'lamp'" :gutter="10">
+        <el-col :span="6">
+          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
+            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按灯箱搜索 -->
+      <el-row v-if="type === 'lampbox'" :gutter="10">
+        <el-col :span="8">
+          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
+            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 按回路搜索 -->
+      <el-row v-if="type === 'circuit'" :gutter="10">
+        <el-col :span="10" :offset="2">
+          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
+        </el-col>
+        <el-col :span="10">
+          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
+            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
+          </el-select>
+        </el-col>
+      </el-row>
+      <!-- 搜索 & 开关灯 -->
+      <el-row class="button-row">
+        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
+        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
+      </el-row>
+    </div>
+    <!-- 搜索结果列表 -->
+    <el-table
+      v-loading="listLoading"
+      v-show="showList"
+      :row-style="{height: '33px'}"
+      :cell-style="{padding: '0px'}"
+      :data="lampList"
+      class="infinite-list"
+      border
+      infinite-scroll-disabled="disabled"
+      max-height="300px"
+      style="margin-top: 20px;"
+      @row-click="rowClick"
+      @selection-change="handleSelectionChange">
+      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
+      <el-table-column align="center" type="index" label="序号" width="50"/>
+      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
+      <el-table-column align="center" prop="lampName" label="路灯名称"/>
+      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getAllStreet } from '@/api/street'
+
+export default {
+  name: 'LampTabPane',
+  props: {
+    lampQuery: {
+      type: Object,
+      default: function() {
+        return {
+          lampCode: '',
+          status: '',
+          lampStreet: '',
+          lampArea: '',
+          lampboxCode: '',
+          lampboxStreet: '',
+          lampboxArea: '',
+          circuitCode: ''
+        }
+      }
+    }, // 查询条件
+    lampList: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, // 路灯列表
+    listLoading: {
+      type: Boolean,
+      default: false
+    }, // 列表加载
+    showList: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      type: 'lamp',
+      statusList: [
+        { value: '1', name: '开灯' },
+        { value: '2', name: '灭灯' },
+        { value: '3', name: '报警' },
+        { value: '4', name: '离线' }
+      ],
+      streetList: [],
+      areaList: []
+    }
+  },
+  created() {
+    this.initStreetList()
+    this.initAreaList()
+  },
+  methods: {
+    searchLamp() {
+      console.log('inQuery', this.lampQuery)
+      this.$emit('searchLamp')
+      // this.showList = true
+    },
+    controlLamp(lampIds, controlType) {
+      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
+    },
+    initStreetList() {
+      getAllStreet().then(res => {
+        this.streetList = res.data
+      })
+    },
+    initAreaList() {
+      getAllStreet().then(res => {
+        this.areaList = res.data
+      })
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 状态为"离线"，不能勾选
+    selectable(row, index) {
+      return row.status !== '4'
+    },
+    rowClick(row) {
+      this.$emit('rowClick', row)
+    },
+    changeType() {
+      this.$emit('changeType')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-radio-group{
+  margin: 10px;
+  margin-bottom: 0px;
+}
+.search-row{
+  margin: 10px;
+}
+.button-row{
+  /*margin: 10px;*/
+  margin-top: 10px;
+  margin-bottom: -15px;
+}
+.search-button{
+  margin: 10px;
+}
+  .infinite-list{
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index db279d8..9565f6b 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -70,102 +70,15 @@
       <div v-show="showtable">
         <el-tabs v-model="tab" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="路灯列表" name="lamp">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lamp'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-                    <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-                <el-col :span="6" class="edit_btns" style="margin-top:6px;text-align: right;margin-left: 8px">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','1')">开灯</el-button>
-                  <el-button class="edit_btn" size="mini" type="primary" @click="controlLamp('','0')">关灯</el-button>
-                </el-col>
-              </el-row>
-              <el-table
-                v-loading="listLoading"
-                :row-style="{height: '33px'}"
-                :cell-style="{padding: '0px'}"
-                :data="list"
-                class="infinite-list"
-                border
-                infinite-scroll-disabled="disabled"
-                height="300px"
-                style="margin-top: -10px;"
-                @row-click="rowClick"
-                @selection-change="handleSelectionChange">
-                <el-table-column align="center" type="selection" width="55"/>
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="回路列表" name="circuit">
-            <div class="tab-block">
-              <el-row v-if="tab === 'circuit'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="circuitQuery.circuitCode" size="small" placeholder="回路编号" clearable />
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="灯箱列表" name="lampbox">
-            <div class="tab-block">
-              <el-row v-if="tab === 'lampbox'" class="table-title" style="margin-top: -10px">
-                <el-col :span="7" style="margin-top:3px;margin-left: 5px">
-                  <el-input v-model.trim="lampboxQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-                </el-col>
-                <el-col :span="7" style="margin-top:3px;">
-                  <el-select v-model="lampboxQuery.streetId" size="small" placeholder="道路" filterable clearable>
-                    <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-                  </el-select>
-                </el-col>
-                <el-col :span="3" style="margin-top:6px;">
-                  <el-button class="edit_btn" size="mini" type="primary" @click="search">搜索</el-button>
-                </el-col>
-              </el-row>
-              <el-table v-loading="listLoading" :row-style="{height: '33px'}" :cell-style="{padding: '0px'}" :data="list" class="infinite-list" border infinite-scroll-disabled="disabled" height="300px" style="margin-top: -10px;" @row-click="rowClick">
-                <el-table-column align="center" type="index" label="序号" width="50"/>
-                <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span :class="column.class">{{ scope.row[column.value] }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="80" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'1')">开灯</el-button>
-                    <el-button type="text" size="mini" style="padding: 0px;margin: 0px" @click.native.stop="controlLamp(scope.row,'0')">关灯</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+            <lamp-tab-pane
+              :lamp-list="lamplist"
+              :lamp-query="lampQuery"
+              :list-loading="listLoading"
+              :show-list="showList"
+              @searchLamp="search"
+              @controlLamp="control(lampIds,'','',controlLamp)"
+              @rowClick="rowClick"
+              @changeType="resetLampQuery"/>
           </el-tab-pane>
           <el-tab-pane label="报警列表" name="alarm">
             <div class="tab-block">
@@ -202,10 +115,12 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getAllStreet } from '@/api/system/area'
-import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/system/overview'
+// import { getAllStreet } from '@/api/street'
+import { getLampStatus, getLampList, getlampDetail, getCircuitList, getLampBoxList, getLampBoxDetail, getAlarmList, getAlarmDetail, lampControl } from '@/api/overview'
+import LampTabPane from './lampTabPane'
 export default {
   name: 'Overview',
+  components: { LampTabPane },
   data() {
     return {
       bottombtn: 'lamp',
@@ -290,8 +205,12 @@
       lampQuery: {
         lampCode: '',
         status: '',
-        circuitId: '',
-        lampBoxId: ''
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
       },
       circuitQuery: {
         circuitCode: ''
@@ -303,7 +222,8 @@
       alarmQuery: {
         deviceType: '',
         alarmType: ''
-      }
+      },
+      showList: false
     }
   },
   mounted() {
@@ -311,15 +231,17 @@
     this.initData()
   },
   methods: {
+    // 隐藏或显示左侧列表
     tableclick() {
       this.showtable = !this.showtable
     },
+    // 点击列表中的行，调整地图视角
     rowClick(row) {
       if (this.tab === 'lamp') {
         for (var i = 0; i < this.iconlist.length; i++) {
           if (this.iconlist[i].options.id === row.lampId) {
             console.log(this.iconlist[i])
-            this.map.setView(this.iconlist[i]._latlng, 17)
+            this.map.setView(this.iconlist[i]._latlng, 19)
             // this.map.setView({ lat: cenLat, lng: cenLng }, 18)
           }
         }
@@ -338,11 +260,11 @@
       }
     },
     async search() {
+      console.log('outQuery', this.lampQuery)
       this.listLoading = true
       if (this.tab === 'lamp') {
-        const detail = await getLampList(this.lampQuery)
-        this.lamplist = detail.data
-        this.list = this.lamplist
+        await this.getlamp()
+        this.showList = true
       } else if (this.tab === 'circuit') {
         const detail = await getCircuitList(this.circuitQuery)
         this.ciulistlist = detail.data
@@ -358,10 +280,24 @@
       }
       this.listLoading = false
     },
+    resetLampQuery() {
+      this.lampQuery = {
+        lampCode: '',
+        status: '',
+        lampStreet: '',
+        lampArea: '',
+        lampboxCode: '',
+        lampboxStreet: '',
+        lampboxArea: '',
+        circuitCode: ''
+      }
+    },
     async tabClick(tab, event) {
       this.listLoading = true
       if (tab.name === 'lamp') {
         this.bottombtn = 'lamp'
+        this.resetLampQuery()
+        this.showList = false
         this.getlamp('', '', '')
         this.lampQuery.status = ''
         this.lampQuery.circuitId = ''
@@ -471,20 +407,20 @@
     async initData() {
       const resDetail = await getLampStatus()
       this.status = resDetail.data
-      const lampDetail = await getLampList(this.lampQuery)
-      this.lamplist = lampDetail.data
-      this.list = this.lamplist
-      const circuitDetail = await getCircuitList()
-      this.circuitlist = circuitDetail.data
+      // const lampDetail = await getLampList(this.lampQuery)
+      // this.lamplist = lampDetail.data
+      // this.list = this.lamplist
+      // const circuitDetail = await getCircuitList()
+      // this.circuitlist = circuitDetail.data
       const lampboxDetail = await getLampBoxList()
       this.lampboxlist = lampboxDetail.data
       const alarmDetail = await getAlarmList()
       this.alarmlist = alarmDetail.data
-      this.getlamp('', '', '')
+      this.getlamp()
 
       // 获取道路列表
-      const streetList = await getAllStreet(null)
-      this.streetList = streetList.data
+      // const streetList = await getAllStreet(null)
+      // this.streetList = streetList.data
     },
     removemarkers() {
       for (var i = 0; i < this.iconlist.length; i++) {
@@ -529,9 +465,10 @@
     },
     async getlamp(status, circuitId, lampBoxId) {
       this.removemarkers()
-      this.lampQuery.status = status
-      this.lampQuery.circuitId = circuitId
-      this.lampQuery.lampBoxId = lampBoxId
+      // this.lampQuery.status = status
+      // this.lampQuery.circuitId = circuitId
+      // this.lampQuery.lampBoxId = lampBoxId
+      console.log('getLamp', this.lampQuery)
       const resDetail = await getLampList(this.lampQuery)
       this.lamplist = resDetail.data
       if (this.lamplist.length === 0) {
@@ -572,32 +509,42 @@
           }
           getlampDetail(e.target.options.id).then(response => {
             var data = response.data
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-                '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">路灯详情信息</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯编号：</label>' + data.lampCode	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯类型：</label>' + data.lampTypeName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯状态：</label>' + data.statusName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>' + data.groupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯功率(W)：</label>' + data.power	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>' + data.controllerCode	 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器类型：</label>' + data.controllerTypeName		 + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器分组：</label>' + data.controllerGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>' + data.lamppostCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆名称：</label>' + data.lamppostName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆类型：</label>' + data.lamppostTypeName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆分组：</label>' + data.postGroupName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路编号：</label>' + data.circuitCode + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路名称：</label>' + data.circuitName + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">回路分组：</label>' + data.circuitGroupName	 + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位/高度(m)：</label>' + data.latitude + ';' + data.longitude + ' / ' + data.height + '</div>' +
-                // '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.height + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新电压(V)/电流值(A)：</label>' + data.latestVol + ' / ' + data.latestElec + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">最新功率(W)：</label>' + data.latestPower + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>' + data.latestTime + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-                '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-                '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号+设备状态
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '路灯' + data.lampCode
+            if (data.statusName) {
+              str += `——` + data.statusName
+            }
+            str += `</div>`
+            if (data.groupName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">路灯分组：</label>` + data.groupName	 + `</div>`
+            }
+            if (data.controllerCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">控制器编号：</label>` + data.controllerCode	 + `</div>`
+            }
+            if (data.lamppostCode) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯杆编号：</label>` + data.lamppostCode	 + `</div>`
+            }
+            if (data.height) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度(m)：</label>` + data.height	 + `</div>`
+            }
+            if (data.latestVol) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电压(V)：</label>` + data.latestVol	 + `</div>`
+            }
+            if (data.latestElec) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">电流(A)：</label>` + data.latestElec	 + `</div>`
+            }
+            if (data.latestPower) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">功率(W)：</label>` + data.latestPower	 + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上报时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            // todo 开关灯按钮
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -631,25 +578,35 @@
           id: this.lampboxlist[i].id
         }).addTo(this.map)
         item.on('click', function(e) {
+          console.log(e.target.options)
           if (e.target.dragging._marker._popup) {
             e.target.dragging._marker.unbindPopup()
           }
           getLampBoxDetail(e.target.options.id).then(response => {
             var data = response.data
             console.log(response.data)
-            var str = '<div style="font-size: 14px;padding: 6px"> ' +
-              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">灯箱详情信息</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱编号：</label>' + data.lampboxCode	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>' + data.lampboxName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">所属单位：</label>' + data.deptName	 + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">定位：</label>' + data.latitude + ';' + data.longitude + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>' + data.elecA + ' / ' + data.elecB + ' / ' + data.elecC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>' + data.volA + ' / ' + data.volB + ' / ' + data.volC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>' + data.powerA + ' / ' + data.powerB + ' / ' + data.powerC + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>' + data.upTime + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路：</label>' + data.streetName + '</div>' +
-              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>' + data.address + '</div>' +
-              '</div>'
+            var str = `<div style="font-size: 14px;padding: 6px">`
+            // 标题：设备类型（路灯/灯箱）+设备编号
+            str += `<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">` + '灯箱' + data.lampboxCode + `</div>`
+            if (data.lampboxName) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">灯箱名称：</label>` + data.lampboxName	 + `</div>`
+            }
+            if (data.elecA || data.elecB || data.elecC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电流(A)：</label>` + data.elecA + `/` + data.elecB + `/` + data.elecC + `</div>`
+            }
+            if (data.volA || data.volB || data.volC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相电压(V)：</label>` + data.volA + `/` + data.volB + `/` + data.volC + `</div>`
+            }
+            if (data.powerA || data.powerB || data.powerC) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">A/B/C相功率(W)：</label>` + data.powerA + `/` + data.powerB + `/` + data.powerC + `</div>`
+            }
+            if (data.latestTime) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">上传时间：</label>` + data.latestTime	 + `</div>`
+            }
+            if (data.streetName || data.address) {
+              str += `<div style="padding-bottom: 2px"><label style="padding-right: 5px">地址：</label>` + data.streetName + data.address	 + `</div>`
+            }
+            str += `</div>`
             var popup = L.popup().setContent(str)
             e.target.dragging._marker.bindPopup(popup).openPopup()
             e.target.dragging._marker.openPopup()
@@ -746,6 +703,7 @@
       }
       return 5
     },
+    // 初始化地图
     init() {
       const map = L.map('map', {
         minZoom: 2,
diff --git a/src/views/strategy/components/editStrategy.vue b/src/views/strategy/components/editStrategy.vue
index ae64c77..8bb6ed3 100644
--- a/src/views/strategy/components/editStrategy.vue
+++ b/src/views/strategy/components/editStrategy.vue
@@ -291,7 +291,7 @@
       this.deviceList = []
       this.strategyInfo.strategyInfo.groupIds = []
       getGroupList(this.strategyInfo.strategyInfo.deviceType).then(response => {
-        console.log(response,'111111111111111111')
+        console.log(response, '111111111111111111')
         for (var i = 0; i < response.data.length; i++) {
           var item = { name: response.data[i].groupName, value: response.data[i].id }
           this.deviceList.push(item)
diff --git a/static/project.config.json b/static/project.config.json
index 6e21f24..61357a7 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,6 +1,6 @@
 {
   "title": "智慧照明子系统",
-  "baseUrl": "http://111.198.10.15:11415/lamp/",
+  "baseUrl": "http://111.198.10.15:11409/",
   "lampBasePath": "",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": false,