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/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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({

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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project

diff --git a/src/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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
index f5e5fd7..4a5fd8a 100644
--- a/src/views/order/editOrder.vue
+++ b/src/views/order/editOrder.vue
@@ -16,17 +16,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="所属类别" prop="category">
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="2">桥梁养护</el-radio>
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="1">道路养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item v-if="orderForm.category === '2'" label="所属桥梁" prop="bridgeId">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
           </el-form-item>
-          <el-form-item v-if="orderForm.category === '1'" label="所属道路" prop="roadId">
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
           </el-form-item>
@@ -58,15 +58,22 @@
             <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
               <el-option
                 v-for="item in personList"
-                :key="item.value"
+                :key="item.id"
                 :label="item.name"
-                :value="item.value"/>
+                :value="item.id"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="养护日期" prop="maintainTimeStr">
-            <el-input v-model.trim="orderForm.maintainTimeStr" :disabled="isDetailMode" type="text" placeholder="必填"/>
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -113,7 +120,7 @@
 </template>
 
 <script>
-import { addRecord, editRecord, getContentList } from '@/api/system/order'
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -192,7 +199,7 @@
         this.orderForm = {
           id: row.id,
           code: row.code,
-          category: row.maintainType,
+          category: row.category,
           type: row.type,
           name: row.name,
           status: row.status,
@@ -200,6 +207,7 @@
           roadId: row.roadId,
           personId: row.personId,
           maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
           content: row.content,
           tenderCompany: row.tenderCompany,
           tender: row.tender,
@@ -211,6 +219,7 @@
         this.isDetailMode = true
       }
       this.selectType()
+      this.fetchPersons()
       debugger
     },
     selectType() {
@@ -218,6 +227,11 @@
         this.orderForm.content = response.data
       })
     },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.orderForm = {

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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
index f5e5fd7..4a5fd8a 100644
--- a/src/views/order/editOrder.vue
+++ b/src/views/order/editOrder.vue
@@ -16,17 +16,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="所属类别" prop="category">
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="2">桥梁养护</el-radio>
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="1">道路养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item v-if="orderForm.category === '2'" label="所属桥梁" prop="bridgeId">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
           </el-form-item>
-          <el-form-item v-if="orderForm.category === '1'" label="所属道路" prop="roadId">
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
           </el-form-item>
@@ -58,15 +58,22 @@
             <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
               <el-option
                 v-for="item in personList"
-                :key="item.value"
+                :key="item.id"
                 :label="item.name"
-                :value="item.value"/>
+                :value="item.id"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="养护日期" prop="maintainTimeStr">
-            <el-input v-model.trim="orderForm.maintainTimeStr" :disabled="isDetailMode" type="text" placeholder="必填"/>
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -113,7 +120,7 @@
 </template>
 
 <script>
-import { addRecord, editRecord, getContentList } from '@/api/system/order'
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -192,7 +199,7 @@
         this.orderForm = {
           id: row.id,
           code: row.code,
-          category: row.maintainType,
+          category: row.category,
           type: row.type,
           name: row.name,
           status: row.status,
@@ -200,6 +207,7 @@
           roadId: row.roadId,
           personId: row.personId,
           maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
           content: row.content,
           tenderCompany: row.tenderCompany,
           tender: row.tender,
@@ -211,6 +219,7 @@
         this.isDetailMode = true
       }
       this.selectType()
+      this.fetchPersons()
       debugger
     },
     selectType() {
@@ -218,6 +227,11 @@
         this.orderForm.content = response.data
       })
     },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.orderForm = {
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
index db090b4..2d4f682 100644
--- a/src/views/order/listMaintainRecords.vue
+++ b/src/views/order/listMaintainRecords.vue
@@ -242,12 +242,12 @@
     },
     batchExport() {
       // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '下载中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
       // exportRecords(this.listQuery).then(res => {
       //   loading.close() // 关闭加载动画
       //   downloadFile(res.data, '工单列表')

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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
index f5e5fd7..4a5fd8a 100644
--- a/src/views/order/editOrder.vue
+++ b/src/views/order/editOrder.vue
@@ -16,17 +16,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="所属类别" prop="category">
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="2">桥梁养护</el-radio>
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="1">道路养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item v-if="orderForm.category === '2'" label="所属桥梁" prop="bridgeId">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
           </el-form-item>
-          <el-form-item v-if="orderForm.category === '1'" label="所属道路" prop="roadId">
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
           </el-form-item>
@@ -58,15 +58,22 @@
             <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
               <el-option
                 v-for="item in personList"
-                :key="item.value"
+                :key="item.id"
                 :label="item.name"
-                :value="item.value"/>
+                :value="item.id"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="养护日期" prop="maintainTimeStr">
-            <el-input v-model.trim="orderForm.maintainTimeStr" :disabled="isDetailMode" type="text" placeholder="必填"/>
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -113,7 +120,7 @@
 </template>
 
 <script>
-import { addRecord, editRecord, getContentList } from '@/api/system/order'
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -192,7 +199,7 @@
         this.orderForm = {
           id: row.id,
           code: row.code,
-          category: row.maintainType,
+          category: row.category,
           type: row.type,
           name: row.name,
           status: row.status,
@@ -200,6 +207,7 @@
           roadId: row.roadId,
           personId: row.personId,
           maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
           content: row.content,
           tenderCompany: row.tenderCompany,
           tender: row.tender,
@@ -211,6 +219,7 @@
         this.isDetailMode = true
       }
       this.selectType()
+      this.fetchPersons()
       debugger
     },
     selectType() {
@@ -218,6 +227,11 @@
         this.orderForm.content = response.data
       })
     },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.orderForm = {
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
index db090b4..2d4f682 100644
--- a/src/views/order/listMaintainRecords.vue
+++ b/src/views/order/listMaintainRecords.vue
@@ -242,12 +242,12 @@
     },
     batchExport() {
       // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '下载中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
       // exportRecords(this.listQuery).then(res => {
       //   loading.close() // 关闭加载动画
       //   downloadFile(res.data, '工单列表')
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..a29618c
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,197 @@
+<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() {
+      // todo
+      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/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/system/order.js b/src/api/system/order.js
index 7007c50..8f1124f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -32,6 +32,12 @@
     }
   })
 }
+export function getPersons() {
+  return request({
+    url: 'maintain/getUsers',
+    method: 'get'
+  })
+}
 // 批量导出报警
 export function batchExportAlarm(params) {
   return request({
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/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/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/utils/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
index f5e5fd7..4a5fd8a 100644
--- a/src/views/order/editOrder.vue
+++ b/src/views/order/editOrder.vue
@@ -16,17 +16,17 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="所属类别" prop="category">
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="2">桥梁养护</el-radio>
-            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="1">道路养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item v-if="orderForm.category === '2'" label="所属桥梁" prop="bridgeId">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
             <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
           </el-form-item>
-          <el-form-item v-if="orderForm.category === '1'" label="所属道路" prop="roadId">
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
             <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
           </el-form-item>
@@ -58,15 +58,22 @@
             <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
               <el-option
                 v-for="item in personList"
-                :key="item.value"
+                :key="item.id"
                 :label="item.name"
-                :value="item.value"/>
+                :value="item.id"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="养护日期" prop="maintainTimeStr">
-            <el-input v-model.trim="orderForm.maintainTimeStr" :disabled="isDetailMode" type="text" placeholder="必填"/>
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -113,7 +120,7 @@
 </template>
 
 <script>
-import { addRecord, editRecord, getContentList } from '@/api/system/order'
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -192,7 +199,7 @@
         this.orderForm = {
           id: row.id,
           code: row.code,
-          category: row.maintainType,
+          category: row.category,
           type: row.type,
           name: row.name,
           status: row.status,
@@ -200,6 +207,7 @@
           roadId: row.roadId,
           personId: row.personId,
           maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
           content: row.content,
           tenderCompany: row.tenderCompany,
           tender: row.tender,
@@ -211,6 +219,7 @@
         this.isDetailMode = true
       }
       this.selectType()
+      this.fetchPersons()
       debugger
     },
     selectType() {
@@ -218,6 +227,11 @@
         this.orderForm.content = response.data
       })
     },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.orderForm = {
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
index db090b4..2d4f682 100644
--- a/src/views/order/listMaintainRecords.vue
+++ b/src/views/order/listMaintainRecords.vue
@@ -242,12 +242,12 @@
     },
     batchExport() {
       // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '下载中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
       // exportRecords(this.listQuery).then(res => {
       //   loading.close() // 关闭加载动画
       //   downloadFile(res.data, '工单列表')
diff --git a/src/views/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
new file mode 100644
index 0000000..a29618c
--- /dev/null
+++ b/src/views/overview/lampTabPane.vue
@@ -0,0 +1,197 @@
+<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() {
+      // todo
+      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/static/project.config.json b/static/project.config.json
index 8fddbd3..e294b08 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,6 +1,6 @@
 {
   "title": "路桥养护子系统",
-  "baseUrl": "http://111.198.10.15:11413/bridge/",
+  "baseUrl": "http://192.168.1.108:8083/",
   "mainPage": "http://111.198.10.15:11404/dcms/",
   "singleSys": true,
   "city":"崇仁县",