diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}

diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
index 3841e4c..0b5c2be 100644
--- a/src/api/system/bridge.js
+++ b/src/api/system/bridge.js
@@ -16,7 +16,7 @@
 
 export function updateBridge(params) {
   return request({
-    url: 'bridge/update',
+    url: 'bridge/bridge/update',
     method: 'post',
     params
   })

diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
index 3841e4c..0b5c2be 100644
--- a/src/api/system/bridge.js
+++ b/src/api/system/bridge.js
@@ -16,7 +16,7 @@
 
 export function updateBridge(params) {
   return request({
-    url: 'bridge/update',
+    url: 'bridge/bridge/update',
     method: 'post',
     params
   })
diff --git a/src/api/system/data.js b/src/api/system/data.js
deleted file mode 100644
index 4c95db5..0000000
--- a/src/api/system/data.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getHistoryList(params) {
-  return request({
-    url: '/data/hisListPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getHistory(params) {
-  return request({
-    url: '/data/hisList',
-    method: 'get',
-    params
-  })
-}
-
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}

diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
index 3841e4c..0b5c2be 100644
--- a/src/api/system/bridge.js
+++ b/src/api/system/bridge.js
@@ -16,7 +16,7 @@
 
 export function updateBridge(params) {
   return request({
-    url: 'bridge/update',
+    url: 'bridge/bridge/update',
     method: 'post',
     params
   })
diff --git a/src/api/system/data.js b/src/api/system/data.js
deleted file mode 100644
index 4c95db5..0000000
--- a/src/api/system/data.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getHistoryList(params) {
-  return request({
-    url: '/data/hisListPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getHistory(params) {
-  return request({
-    url: '/data/hisList',
-    method: 'get',
-    params
-  })
-}
-
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
index f379f91..bde8c5e 100644
--- a/src/views/bridge/components/detail.vue
+++ b/src/views/bridge/components/detail.vue
@@ -2,8 +2,14 @@
   <div class="info-block">
     <div class="block-body">
       <el-row class="table-title">
-        <el-col :span="3"><div class="title-header"><i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}</div></el-col>
-        <el-col :span="3" :offset="18"><el-button type="primary" icon="el-icon-edit" @click="edit">编辑</el-button></el-col>
+        <el-col :span="3">
+          <div class="title-header">
+            <i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}
+          </div>
+        </el-col>
+        <el-col :span="3" :offset="18">
+          <el-button v-if="!isEditMode" type="primary" icon="el-icon-edit-outline" @click="edit">编辑</el-button>
+        </el-col>
       </el-row>
 
       <el-form ref="dataForm" :label-position="labelPosition" :model="bridgeForm" label-width="120px">
@@ -23,12 +29,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="高度（m）" prop="high">
-              <el-input v-model="bridgeForm.high" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.high" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="长度（m）" prop="length">
-              <el-input v-model="bridgeForm.length" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.length" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -36,12 +42,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="建设时间" prop="buildTime">
-              <el-input v-model="bridgeForm.buildTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.buildTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="通车时间" prop="openTime">
-              <el-input v-model="bridgeForm.openTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.openTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,7 +55,7 @@
         <el-row>
           <el-col :span="21">
             <el-form-item label="简介" prop="description">
-              <el-input v-model="bridgeForm.description" :disabled="!isEditMode" type="textarea" autosize placeholder="未知" />
+              <el-input v-model="bridgeForm.description" disabled type="textarea" autosize placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,9 +74,11 @@
           <div class="img-box">
             <el-image
               :src="photo"
+              :preview-src-list="srcList"
               fit="cover"
               style="vertical-align: top;"/>
           </div>
+          <div style="margin-left: 120px; padding: 15px 0px;">共 {{ srcList.length }} 张，点击图片以预览大图</div>
         </el-col>
       </el-row>
     </div>
@@ -105,15 +113,19 @@
         </template>
       </normal-table>
     </div>
+
+    <edit-bridge ref="editBridge" @watchChild="fetchData" />
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/bridge'
+import { getDetail } from '@/api/system/bridge'
 import { getRecordList } from '@/api/system/order'
 import L from 'leaflet'
+import EditBridge from '@/views/bridge/components/editBridge'
 
 export default {
   name: 'Detail',
+  components: { EditBridge },
   data() {
     return {
       showMap: false,
@@ -123,6 +135,7 @@
       map: null,
       baseLayer: [],
       photo: '',
+      srcList: [],
       bridgeForm: {
         id: '',
         name: '',
@@ -190,11 +203,7 @@
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      listLoading: true, // 加载动画
-      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
-      // token: '?token=' + this.$store.getters.token, // token,
-      disabled: true,
-      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+      listLoading: true // 加载动画
     }
   },
   mounted() {
@@ -219,7 +228,23 @@
         getDetail(this.bridgeId).then(response => {
           if (response.code === 200) {
             this.bridgeForm = response.data
+
+            // 解析图片
             this.photo = this.bridgeForm.photo
+            this.srcList = []
+            if (this.photo !== '') {
+              const that = this
+              this.photo.split(';').forEach(img => {
+                if (img.indexOf('http') >= 0) {
+                  that.srcList.push(img)
+                } else {
+                  that.srcList.push(that.baseConfig.baseUrl + 'static/' + img)
+                }
+              })
+
+              this.photo = this.srcList[0]
+            }
+
             this.listLoading = false
           }
         })
@@ -257,80 +282,7 @@
       }).addTo(this.map)
     },
     edit() {
-      this.isEditMode = true
-    },
-    saveData() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        let index = this.photo.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.bridgeForm.photo = this.photo.substring(index)
-      }
-      updateBridge(this.bridgeForm).then(res => {
-        if (res.code === 200) {
-          this.$message.success('编辑成功')
-        }
-      })
-      this.isEditMode = false
-    },
-    // 图片上传
-    uploadPhoto(file) {
-      // console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
-
-      // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-        console.log(this.photo)
-      })
-    },
-    // 上传前判断文件格式及大小
-    handleBeforeUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
-      }
-      return res
-    },
-    // 上传成功后回显
-    handleSuccess(response, file) {
-      console.log('handleSuccess')
-      debugger
-      const base_url = process.env.BASE_API + '/static/'
-      if (response.code === 200) {
-        this.photo = base_url + response.data
-      } else {
-        this.$message.warning(response.message)
-      }
-    },
-    getBase64(file) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
-        // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
-        // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
-        // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+      this.$refs.editBridge.initDialog(true, this.bridgeForm)
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -341,9 +293,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    cancel() {
-      this.isEditMode = false
     }
   }
 }
@@ -352,26 +301,25 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   $left-width: 160px;
   .info-block {
-    /*overflow-y: scroll;*/
-    /*white-space: nowrap;*/
     margin: 10px 20px;
-    padding-bottom: 120px;
-    /*overflow: ;*/
+
     .block-title-div {
       font-size: 17px;
       color: #1f2d3d;
       font-weight: bold;
-      /*border-bottom: 1px solid #d3dce6;*/
+
       .block-title{
         padding-left: 10px;
         margin-bottom: 10px;
-        /*border-left: 5px solid #004493;*/
       }
     }
     .block-body {
       background-color: #fffffb !important;
       margin-top: 20px;
-      /*margin-left: 50px;*/
+
+      .table-container {
+        border-top: none !important;
+      }
 
       .table-title {
         margin-top: 10px;
@@ -392,9 +340,3 @@
     }
   }
 </style>
-
-<style>
-  .table-container {
-    border-top: none !important;
-  }
-</style>

diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
index 3841e4c..0b5c2be 100644
--- a/src/api/system/bridge.js
+++ b/src/api/system/bridge.js
@@ -16,7 +16,7 @@
 
 export function updateBridge(params) {
   return request({
-    url: 'bridge/update',
+    url: 'bridge/bridge/update',
     method: 'post',
     params
   })
diff --git a/src/api/system/data.js b/src/api/system/data.js
deleted file mode 100644
index 4c95db5..0000000
--- a/src/api/system/data.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getHistoryList(params) {
-  return request({
-    url: '/data/hisListPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getHistory(params) {
-  return request({
-    url: '/data/hisList',
-    method: 'get',
-    params
-  })
-}
-
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
index f379f91..bde8c5e 100644
--- a/src/views/bridge/components/detail.vue
+++ b/src/views/bridge/components/detail.vue
@@ -2,8 +2,14 @@
   <div class="info-block">
     <div class="block-body">
       <el-row class="table-title">
-        <el-col :span="3"><div class="title-header"><i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}</div></el-col>
-        <el-col :span="3" :offset="18"><el-button type="primary" icon="el-icon-edit" @click="edit">编辑</el-button></el-col>
+        <el-col :span="3">
+          <div class="title-header">
+            <i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}
+          </div>
+        </el-col>
+        <el-col :span="3" :offset="18">
+          <el-button v-if="!isEditMode" type="primary" icon="el-icon-edit-outline" @click="edit">编辑</el-button>
+        </el-col>
       </el-row>
 
       <el-form ref="dataForm" :label-position="labelPosition" :model="bridgeForm" label-width="120px">
@@ -23,12 +29,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="高度（m）" prop="high">
-              <el-input v-model="bridgeForm.high" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.high" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="长度（m）" prop="length">
-              <el-input v-model="bridgeForm.length" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.length" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -36,12 +42,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="建设时间" prop="buildTime">
-              <el-input v-model="bridgeForm.buildTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.buildTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="通车时间" prop="openTime">
-              <el-input v-model="bridgeForm.openTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.openTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,7 +55,7 @@
         <el-row>
           <el-col :span="21">
             <el-form-item label="简介" prop="description">
-              <el-input v-model="bridgeForm.description" :disabled="!isEditMode" type="textarea" autosize placeholder="未知" />
+              <el-input v-model="bridgeForm.description" disabled type="textarea" autosize placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,9 +74,11 @@
           <div class="img-box">
             <el-image
               :src="photo"
+              :preview-src-list="srcList"
               fit="cover"
               style="vertical-align: top;"/>
           </div>
+          <div style="margin-left: 120px; padding: 15px 0px;">共 {{ srcList.length }} 张，点击图片以预览大图</div>
         </el-col>
       </el-row>
     </div>
@@ -105,15 +113,19 @@
         </template>
       </normal-table>
     </div>
+
+    <edit-bridge ref="editBridge" @watchChild="fetchData" />
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/bridge'
+import { getDetail } from '@/api/system/bridge'
 import { getRecordList } from '@/api/system/order'
 import L from 'leaflet'
+import EditBridge from '@/views/bridge/components/editBridge'
 
 export default {
   name: 'Detail',
+  components: { EditBridge },
   data() {
     return {
       showMap: false,
@@ -123,6 +135,7 @@
       map: null,
       baseLayer: [],
       photo: '',
+      srcList: [],
       bridgeForm: {
         id: '',
         name: '',
@@ -190,11 +203,7 @@
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      listLoading: true, // 加载动画
-      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
-      // token: '?token=' + this.$store.getters.token, // token,
-      disabled: true,
-      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+      listLoading: true // 加载动画
     }
   },
   mounted() {
@@ -219,7 +228,23 @@
         getDetail(this.bridgeId).then(response => {
           if (response.code === 200) {
             this.bridgeForm = response.data
+
+            // 解析图片
             this.photo = this.bridgeForm.photo
+            this.srcList = []
+            if (this.photo !== '') {
+              const that = this
+              this.photo.split(';').forEach(img => {
+                if (img.indexOf('http') >= 0) {
+                  that.srcList.push(img)
+                } else {
+                  that.srcList.push(that.baseConfig.baseUrl + 'static/' + img)
+                }
+              })
+
+              this.photo = this.srcList[0]
+            }
+
             this.listLoading = false
           }
         })
@@ -257,80 +282,7 @@
       }).addTo(this.map)
     },
     edit() {
-      this.isEditMode = true
-    },
-    saveData() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        let index = this.photo.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.bridgeForm.photo = this.photo.substring(index)
-      }
-      updateBridge(this.bridgeForm).then(res => {
-        if (res.code === 200) {
-          this.$message.success('编辑成功')
-        }
-      })
-      this.isEditMode = false
-    },
-    // 图片上传
-    uploadPhoto(file) {
-      // console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
-
-      // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-        console.log(this.photo)
-      })
-    },
-    // 上传前判断文件格式及大小
-    handleBeforeUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
-      }
-      return res
-    },
-    // 上传成功后回显
-    handleSuccess(response, file) {
-      console.log('handleSuccess')
-      debugger
-      const base_url = process.env.BASE_API + '/static/'
-      if (response.code === 200) {
-        this.photo = base_url + response.data
-      } else {
-        this.$message.warning(response.message)
-      }
-    },
-    getBase64(file) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
-        // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
-        // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
-        // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+      this.$refs.editBridge.initDialog(true, this.bridgeForm)
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -341,9 +293,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    cancel() {
-      this.isEditMode = false
     }
   }
 }
@@ -352,26 +301,25 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   $left-width: 160px;
   .info-block {
-    /*overflow-y: scroll;*/
-    /*white-space: nowrap;*/
     margin: 10px 20px;
-    padding-bottom: 120px;
-    /*overflow: ;*/
+
     .block-title-div {
       font-size: 17px;
       color: #1f2d3d;
       font-weight: bold;
-      /*border-bottom: 1px solid #d3dce6;*/
+
       .block-title{
         padding-left: 10px;
         margin-bottom: 10px;
-        /*border-left: 5px solid #004493;*/
       }
     }
     .block-body {
       background-color: #fffffb !important;
       margin-top: 20px;
-      /*margin-left: 50px;*/
+
+      .table-container {
+        border-top: none !important;
+      }
 
       .table-title {
         margin-top: 10px;
@@ -392,9 +340,3 @@
     }
   }
 </style>
-
-<style>
-  .table-container {
-    border-top: none !important;
-  }
-</style>
diff --git a/src/views/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
index 6182fee..ac5a1e4 100644
--- a/src/views/bridge/components/editBridge.vue
+++ b/src/views/bridge/components/editBridge.vue
@@ -1,119 +1,106 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <div class="item-div">
-                <span class="item-title">桥梁名称：</span>
-                <span class="item-value-middle">{{ bridgeForm.name }}</span>
-                <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">桥型：</span>
-                <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
-                <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="item-div">
-                <span class="item-title">柱号：</span>
-                <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">道路名称：</span>
-                <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
-                <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">高度（m）：</span>
-                <span class="item-value-middle">{{ bridgeForm.height }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">长度（m）：</span>
-                <span class="item-value-middle">{{ bridgeForm.length }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">开建时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.buildTime }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁位置：</span>
-                <span class="item-value-middle">{{ bridgeForm.position }}</span>
-                <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
-                <div v-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
+  <el-dialog :visible.sync="dialogFormVisible" :title="bridgeForm.name" :close-on-click-modal="false" width="75%" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <div class="info-block">
+        <div class="block-body">
+          <el-form ref="dataForm" :model="bridgeForm" :rules="rules" label-position="right" label-width="120px">
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="高度（m）" prop="high">
+                  <el-input v-model="bridgeForm.high" type="text" placeholder="必填" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10" :offset="1">
+                <el-form-item label="长度（m）" prop="length">
+                  <el-input v-model="bridgeForm.length" type="text" placeholder="必填" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="建设时间" prop="buildTime">
+                  <el-date-picker v-model="bridgeForm.buildTimeStr" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10" :offset="1">
+                <el-form-item label="通车时间" prop="openTime">
+                  <el-date-picker v-model="bridgeForm.openTimeStr" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="21">
+                <el-form-item label="简介" prop="description">
+                  <el-input v-model="bridgeForm.description" type="textarea" autosize clearable placeholder="必填" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="图片" prop="images">
+                  <el-upload
+                    ref="upload"
+                    :before-upload="handleBeforeUpload"
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleRemove"
+                    :on-exceed="handleExceed"
+                    :on-change="handleChange"
+                    :http-request="uploadFile"
+                    :file-list="imageList"
+                    :limit="4"
+                    :class="{hide:hideUpload}"
+                    multiple
+                    action="string"
+                    accept=".jpg,.jpeg,.png "
+                    list-type="picture-card">
+                    <i class="el-icon-plus"/>
+                  </el-upload>
+                  <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                    <div class="imgBox">
+                      <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                    </div>
+                  </el-dialog>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+                <el-button size="medium" @click="cancel"> 取消</el-button>
+                <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存</el-button>
+              </el-col>
+            </el-row>
+
+          </el-form>
         </div>
-        <!--<div class="clearfloat"/>-->
       </div>
-    </div>
+    </el-scrollbar>
   </el-dialog>
 </template>
 <script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
+import { updateBridge } from '@/api/system/bridge'
+import { Uploadimg } from '@/api/common'
+
+const validateInt = (rule, value, callback) => {
+  if (value !== '') {
+    if ((/^\d+$/).test(value) === false) {
+      callback(new Error('请填写大于0的整数'))
+    } else {
+      callback()
+    }
+  } else {
+    callback(new Error('不能为空'))
+  }
+}
 
 export default {
   name: 'EditBridge',
   data() {
     return {
       dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
       bridgeForm: {
         id: '',
         name: '',
@@ -131,6 +118,15 @@
         statusName: '',
         photo: ''
       },
+      hideUpload: false,
+      imageList: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      rules: {
+        high: [{ required: true, trigger: ['blur', 'change'], validator: validateInt }],
+        length: [{ required: true, trigger: ['blur', 'change'], validator: validateInt }],
+        description: [{ required: true, message: '请填写桥梁简介', trigger: ['blur', 'change'] }]
+      },
       // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
       // token: '?token=' + this.$store.getters.token, // token,
       disabled: true,
@@ -140,37 +136,117 @@
   mounted() {
   },
   methods: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
+    initDialog: function(dialogFormVisible, bridge = '') {
       this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
+      this.bridgeForm = bridge
+
+      if (bridge.photo !== '') {
+        const that = this
+        this.imageList = []
+        bridge.photo.split(';').forEach(pic => {
+          // 将已有的图片添加到组件中
+          that.imageList.push({
+            name: pic.substring(pic.lastIndexOf('/') + 1, pic.lastIndexOf('.')),
+            uid: pic.substring(pic.lastIndexOf('/') + 1, pic.lastIndexOf('.')),
+            url: that.baseConfig.baseUrl + 'static/' + pic
+          })
+        })
+      }
     },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
+    saveData() {
+      const editForm = {
+        id: this.bridgeForm.id,
+        bridgeCode: this.bridgeForm.bridgeCode,
+        name: this.bridgeForm.name
+      }
+
+      editForm.buildTime = this.bridgeForm.buildTimeStr
+      editForm.description = this.bridgeForm.description
+      editForm.high = this.bridgeForm.high
+      editForm.length = this.bridgeForm.length
+      editForm.openTime = this.bridgeForm.openTimeStr
+
+      editForm.photo = ''
+      // 照片不为空则对照片进行处理
+      if (this.imageList.length > 0) {
+        const base_url = this.baseConfig.baseUrl + 'static/'
+        this.imageList.forEach(img => {
+          const url = img.url
+          if (url.indexOf(base_url) >= 0) {
+            editForm.photo += url.substring(base_url.length, url.length) + ';'
+          } else {
+            editForm.photo += url + ';'
+          }
+        })
+        editForm.photo = editForm.photo.substring(0, editForm.photo.length - 1)
+      }
+
+      console.log(editForm)
+
+      updateBridge(editForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        }
       })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
     },
     cancel() {
       this.dialogFormVisible = false
-      this.$emit('watchChild')
+    },
+    uploadFile(file) {
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data.replace('\\', '/') })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
     }
   }
 }
@@ -178,62 +254,37 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*overflow: ;*/
-    .block-title-div{
+  .info-block {
+    margin: 10px 20px;
+
+    .block-title-div {
       font-size: 17px;
       color: #1f2d3d;
       font-weight: bold;
-      /*border-bottom: 1px solid #d3dce6;*/
+
       .block-title{
         padding-left: 10px;
-        /*margin-bottom: 10px;*/
-        /*border-left: 5px solid #004493;*/
+        margin-bottom: 10px;
       }
     }
-    .block-body{
-      /*margin-top: 20px;*/
-      /*margin-left: 50px;*/
-      .body-left{
-        width: $left-width;
-        /*float: left;*/
+    .block-body {
+      background-color: #fffffb !important;
+      margin-top: 20px;
+
+      .table-container {
+        border-top: none !important;
       }
-      .body-right{
-        width: calc( 100% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
+
+      .table-title {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        .title-header {
+          height: 40px;
+          padding: 10px;
+          color: #606266;
         }
       }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
 
+    }
   }
 </style>

diff --git a/src/api/system/alarm.js b/src/api/system/alarm.js
deleted file mode 100644
index 1c3a7ab..0000000
--- a/src/api/system/alarm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getAlarmNowList(params) {
-  return request({
-    url: '/alarm/listNowPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getAlarmHistoryList(params) {
-  return request({
-    url: '/alarm/listHisPage',
-    method: 'get',
-    params
-  })
-}
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
index 3841e4c..0b5c2be 100644
--- a/src/api/system/bridge.js
+++ b/src/api/system/bridge.js
@@ -16,7 +16,7 @@
 
 export function updateBridge(params) {
   return request({
-    url: 'bridge/update',
+    url: 'bridge/bridge/update',
     method: 'post',
     params
   })
diff --git a/src/api/system/data.js b/src/api/system/data.js
deleted file mode 100644
index 4c95db5..0000000
--- a/src/api/system/data.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 人员管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取当前报警列表
-export function getHistoryList(params) {
-  return request({
-    url: '/data/hisListPage',
-    method: 'get',
-    params
-  })
-}
-
-// 获取当前报警列表
-export function getHistory(params) {
-  return request({
-    url: '/data/hisList',
-    method: 'get',
-    params
-  })
-}
-
-
-
-// 批量消警
-export function clearAll(params) {
-  return request({
-    url: '/alarm/allClear',
-    method: 'get',
-    params
-  })
-}
-
-// 消警
-export function clearAlarm(params) {
-  return request({
-    url: '/alarm/cancel',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出报警
-export function batchExportAlarm(params) {
-  return request({
-    url: 'person/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 设置报警阈值
-export function setThresh(params) {
-  return request({
-    url: '/alarm/resetAlarmRule',
-    method: 'post',
-    params
-  })
-}
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
index f379f91..bde8c5e 100644
--- a/src/views/bridge/components/detail.vue
+++ b/src/views/bridge/components/detail.vue
@@ -2,8 +2,14 @@
   <div class="info-block">
     <div class="block-body">
       <el-row class="table-title">
-        <el-col :span="3"><div class="title-header"><i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}</div></el-col>
-        <el-col :span="3" :offset="18"><el-button type="primary" icon="el-icon-edit" @click="edit">编辑</el-button></el-col>
+        <el-col :span="3">
+          <div class="title-header">
+            <i class="el-icon-menu" style="margin-right: 10px;"/>{{ bridgeForm.name }}
+          </div>
+        </el-col>
+        <el-col :span="3" :offset="18">
+          <el-button v-if="!isEditMode" type="primary" icon="el-icon-edit-outline" @click="edit">编辑</el-button>
+        </el-col>
       </el-row>
 
       <el-form ref="dataForm" :label-position="labelPosition" :model="bridgeForm" label-width="120px">
@@ -23,12 +29,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="高度（m）" prop="high">
-              <el-input v-model="bridgeForm.high" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.high" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="长度（m）" prop="length">
-              <el-input v-model="bridgeForm.length" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-input v-model="bridgeForm.length" disabled type="text" placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -36,12 +42,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="建设时间" prop="buildTime">
-              <el-input v-model="bridgeForm.buildTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.buildTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
             <el-form-item label="通车时间" prop="openTime">
-              <el-input v-model="bridgeForm.openTimeStr" :disabled="!isEditMode" type="text" placeholder="未知" />
+              <el-date-picker v-model="bridgeForm.openTimeStr" disabled type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,7 +55,7 @@
         <el-row>
           <el-col :span="21">
             <el-form-item label="简介" prop="description">
-              <el-input v-model="bridgeForm.description" :disabled="!isEditMode" type="textarea" autosize placeholder="未知" />
+              <el-input v-model="bridgeForm.description" disabled type="textarea" autosize placeholder="未知" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,9 +74,11 @@
           <div class="img-box">
             <el-image
               :src="photo"
+              :preview-src-list="srcList"
               fit="cover"
               style="vertical-align: top;"/>
           </div>
+          <div style="margin-left: 120px; padding: 15px 0px;">共 {{ srcList.length }} 张，点击图片以预览大图</div>
         </el-col>
       </el-row>
     </div>
@@ -105,15 +113,19 @@
         </template>
       </normal-table>
     </div>
+
+    <edit-bridge ref="editBridge" @watchChild="fetchData" />
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/bridge'
+import { getDetail } from '@/api/system/bridge'
 import { getRecordList } from '@/api/system/order'
 import L from 'leaflet'
+import EditBridge from '@/views/bridge/components/editBridge'
 
 export default {
   name: 'Detail',
+  components: { EditBridge },
   data() {
     return {
       showMap: false,
@@ -123,6 +135,7 @@
       map: null,
       baseLayer: [],
       photo: '',
+      srcList: [],
       bridgeForm: {
         id: '',
         name: '',
@@ -190,11 +203,7 @@
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      listLoading: true, // 加载动画
-      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
-      // token: '?token=' + this.$store.getters.token, // token,
-      disabled: true,
-      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+      listLoading: true // 加载动画
     }
   },
   mounted() {
@@ -219,7 +228,23 @@
         getDetail(this.bridgeId).then(response => {
           if (response.code === 200) {
             this.bridgeForm = response.data
+
+            // 解析图片
             this.photo = this.bridgeForm.photo
+            this.srcList = []
+            if (this.photo !== '') {
+              const that = this
+              this.photo.split(';').forEach(img => {
+                if (img.indexOf('http') >= 0) {
+                  that.srcList.push(img)
+                } else {
+                  that.srcList.push(that.baseConfig.baseUrl + 'static/' + img)
+                }
+              })
+
+              this.photo = this.srcList[0]
+            }
+
             this.listLoading = false
           }
         })
@@ -257,80 +282,7 @@
       }).addTo(this.map)
     },
     edit() {
-      this.isEditMode = true
-    },
-    saveData() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        let index = this.photo.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.bridgeForm.photo = this.photo.substring(index)
-      }
-      updateBridge(this.bridgeForm).then(res => {
-        if (res.code === 200) {
-          this.$message.success('编辑成功')
-        }
-      })
-      this.isEditMode = false
-    },
-    // 图片上传
-    uploadPhoto(file) {
-      // console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
-
-      // 转base64
-      this.getBase64(file.file).then(resBase64 => {
-        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
-        console.log(this.photo)
-      })
-    },
-    // 上传前判断文件格式及大小
-    handleBeforeUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      console.log(file.size)
-      const isLt2M = file.size / 1024 < 200
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 200KB!')
-        res = false
-      }
-      return res
-    },
-    // 上传成功后回显
-    handleSuccess(response, file) {
-      console.log('handleSuccess')
-      debugger
-      const base_url = process.env.BASE_API + '/static/'
-      if (response.code === 200) {
-        this.photo = base_url + response.data
-      } else {
-        this.$message.warning(response.message)
-      }
-    },
-    getBase64(file) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        let fileResult = ''
-        reader.readAsDataURL(file)
-        // 开始转
-        reader.onload = function() {
-          fileResult = reader.result
-        }
-        // 转 失败
-        reader.onerror = function(error) {
-          reject(error)
-        }
-        // 转 结束  咱就 resolve 出去
-        reader.onloadend = function() {
-          resolve(fileResult)
-        }
-      })
+      this.$refs.editBridge.initDialog(true, this.bridgeForm)
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
@@ -341,9 +293,6 @@
         this.listQuery.offset = val.page
       }
       this.fetchData()
-    },
-    cancel() {
-      this.isEditMode = false
     }
   }
 }
@@ -352,26 +301,25 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   $left-width: 160px;
   .info-block {
-    /*overflow-y: scroll;*/
-    /*white-space: nowrap;*/
     margin: 10px 20px;
-    padding-bottom: 120px;
-    /*overflow: ;*/
+
     .block-title-div {
       font-size: 17px;
       color: #1f2d3d;
       font-weight: bold;
-      /*border-bottom: 1px solid #d3dce6;*/
+
       .block-title{
         padding-left: 10px;
         margin-bottom: 10px;
-        /*border-left: 5px solid #004493;*/
       }
     }
     .block-body {
       background-color: #fffffb !important;
       margin-top: 20px;
-      /*margin-left: 50px;*/
+
+      .table-container {
+        border-top: none !important;
+      }
 
       .table-title {
         margin-top: 10px;
@@ -392,9 +340,3 @@
     }
   }
 </style>
-
-<style>
-  .table-container {
-    border-top: none !important;
-  }
-</style>
diff --git a/src/views/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
index 6182fee..ac5a1e4 100644
--- a/src/views/bridge/components/editBridge.vue
+++ b/src/views/bridge/components/editBridge.vue
@@ -1,119 +1,106 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <div class="item-div">
-                <span class="item-title">桥梁名称：</span>
-                <span class="item-value-middle">{{ bridgeForm.name }}</span>
-                <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">桥型：</span>
-                <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
-                <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="item-div">
-                <span class="item-title">柱号：</span>
-                <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">道路名称：</span>
-                <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
-                <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">高度（m）：</span>
-                <span class="item-value-middle">{{ bridgeForm.height }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">长度（m）：</span>
-                <span class="item-value-middle">{{ bridgeForm.length }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">开建时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.buildTime }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁位置：</span>
-                <span class="item-value-middle">{{ bridgeForm.position }}</span>
-                <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
-                <div v-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
+  <el-dialog :visible.sync="dialogFormVisible" :title="bridgeForm.name" :close-on-click-modal="false" width="75%" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <div class="info-block">
+        <div class="block-body">
+          <el-form ref="dataForm" :model="bridgeForm" :rules="rules" label-position="right" label-width="120px">
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="高度（m）" prop="high">
+                  <el-input v-model="bridgeForm.high" type="text" placeholder="必填" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10" :offset="1">
+                <el-form-item label="长度（m）" prop="length">
+                  <el-input v-model="bridgeForm.length" type="text" placeholder="必填" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="建设时间" prop="buildTime">
+                  <el-date-picker v-model="bridgeForm.buildTimeStr" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10" :offset="1">
+                <el-form-item label="通车时间" prop="openTime">
+                  <el-date-picker v-model="bridgeForm.openTimeStr" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="21">
+                <el-form-item label="简介" prop="description">
+                  <el-input v-model="bridgeForm.description" type="textarea" autosize clearable placeholder="必填" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="图片" prop="images">
+                  <el-upload
+                    ref="upload"
+                    :before-upload="handleBeforeUpload"
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleRemove"
+                    :on-exceed="handleExceed"
+                    :on-change="handleChange"
+                    :http-request="uploadFile"
+                    :file-list="imageList"
+                    :limit="4"
+                    :class="{hide:hideUpload}"
+                    multiple
+                    action="string"
+                    accept=".jpg,.jpeg,.png "
+                    list-type="picture-card">
+                    <i class="el-icon-plus"/>
+                  </el-upload>
+                  <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                    <div class="imgBox">
+                      <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                    </div>
+                  </el-dialog>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+                <el-button size="medium" @click="cancel"> 取消</el-button>
+                <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存</el-button>
+              </el-col>
+            </el-row>
+
+          </el-form>
         </div>
-        <!--<div class="clearfloat"/>-->
       </div>
-    </div>
+    </el-scrollbar>
   </el-dialog>
 </template>
 <script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
+import { updateBridge } from '@/api/system/bridge'
+import { Uploadimg } from '@/api/common'
+
+const validateInt = (rule, value, callback) => {
+  if (value !== '') {
+    if ((/^\d+$/).test(value) === false) {
+      callback(new Error('请填写大于0的整数'))
+    } else {
+      callback()
+    }
+  } else {
+    callback(new Error('不能为空'))
+  }
+}
 
 export default {
   name: 'EditBridge',
   data() {
     return {
       dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
       bridgeForm: {
         id: '',
         name: '',
@@ -131,6 +118,15 @@
         statusName: '',
         photo: ''
       },
+      hideUpload: false,
+      imageList: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      rules: {
+        high: [{ required: true, trigger: ['blur', 'change'], validator: validateInt }],
+        length: [{ required: true, trigger: ['blur', 'change'], validator: validateInt }],
+        description: [{ required: true, message: '请填写桥梁简介', trigger: ['blur', 'change'] }]
+      },
       // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
       // token: '?token=' + this.$store.getters.token, // token,
       disabled: true,
@@ -140,37 +136,117 @@
   mounted() {
   },
   methods: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
+    initDialog: function(dialogFormVisible, bridge = '') {
       this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
+      this.bridgeForm = bridge
+
+      if (bridge.photo !== '') {
+        const that = this
+        this.imageList = []
+        bridge.photo.split(';').forEach(pic => {
+          // 将已有的图片添加到组件中
+          that.imageList.push({
+            name: pic.substring(pic.lastIndexOf('/') + 1, pic.lastIndexOf('.')),
+            uid: pic.substring(pic.lastIndexOf('/') + 1, pic.lastIndexOf('.')),
+            url: that.baseConfig.baseUrl + 'static/' + pic
+          })
+        })
+      }
     },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
+    saveData() {
+      const editForm = {
+        id: this.bridgeForm.id,
+        bridgeCode: this.bridgeForm.bridgeCode,
+        name: this.bridgeForm.name
+      }
+
+      editForm.buildTime = this.bridgeForm.buildTimeStr
+      editForm.description = this.bridgeForm.description
+      editForm.high = this.bridgeForm.high
+      editForm.length = this.bridgeForm.length
+      editForm.openTime = this.bridgeForm.openTimeStr
+
+      editForm.photo = ''
+      // 照片不为空则对照片进行处理
+      if (this.imageList.length > 0) {
+        const base_url = this.baseConfig.baseUrl + 'static/'
+        this.imageList.forEach(img => {
+          const url = img.url
+          if (url.indexOf(base_url) >= 0) {
+            editForm.photo += url.substring(base_url.length, url.length) + ';'
+          } else {
+            editForm.photo += url + ';'
+          }
+        })
+        editForm.photo = editForm.photo.substring(0, editForm.photo.length - 1)
+      }
+
+      console.log(editForm)
+
+      updateBridge(editForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        }
       })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
     },
     cancel() {
       this.dialogFormVisible = false
-      this.$emit('watchChild')
+    },
+    uploadFile(file) {
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data.replace('\\', '/') })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
     }
   }
 }
@@ -178,62 +254,37 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*overflow: ;*/
-    .block-title-div{
+  .info-block {
+    margin: 10px 20px;
+
+    .block-title-div {
       font-size: 17px;
       color: #1f2d3d;
       font-weight: bold;
-      /*border-bottom: 1px solid #d3dce6;*/
+
       .block-title{
         padding-left: 10px;
-        /*margin-bottom: 10px;*/
-        /*border-left: 5px solid #004493;*/
+        margin-bottom: 10px;
       }
     }
-    .block-body{
-      /*margin-top: 20px;*/
-      /*margin-left: 50px;*/
-      .body-left{
-        width: $left-width;
-        /*float: left;*/
+    .block-body {
+      background-color: #fffffb !important;
+      margin-top: 20px;
+
+      .table-container {
+        border-top: none !important;
       }
-      .body-right{
-        width: calc( 100% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
+
+      .table-title {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        .title-header {
+          height: 40px;
+          padding: 10px;
+          color: #606266;
         }
       }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
 
+    }
   }
 </style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
index 77d35e3..cc4f4e0 100644
--- a/src/views/order/listMaintainRecords.vue
+++ b/src/views/order/listMaintainRecords.vue
@@ -229,4 +229,8 @@
       width: 220px;
     }
   }
+
+  .table-container {
+    padding: 0px 10px;
+  }
 </style>