diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index 6440f03..1ef2e62 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -13,3 +13,12 @@
   })
 }
 
+// 统计一年每个月每座桥的养护/巡检次数
+export function countByMonth(params) {
+  return request({
+    url: 'bridge/maintain/countByMonth',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index 6440f03..1ef2e62 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -13,3 +13,12 @@
   })
 }
 
+// 统计一年每个月每座桥的养护/巡检次数
+export function countByMonth(params) {
+  return request({
+    url: 'bridge/maintain/countByMonth',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 01aff3f..9ad6a5a 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -63,7 +63,8 @@
               '<div class="popup-title">' + data.name + '</div>';
 
             if (data.photo !== '') {
-              popupStr += '<div><img src="' + data.photo + '" fit="fit" style="height: 180px; margin:5px; padding-right: 5px"' + '</image></div>'
+              const base = this.baseConfig.baseUrl + 'static/'
+              popupStr += '<div><img src="' + base + data.photo.split(';')[0] + '" fit="fit" style="width: 280px; margin:5px; padding-right: 5px"' + '</image></div>'
             }
 
             popupStr +=

diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index 6440f03..1ef2e62 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -13,3 +13,12 @@
   })
 }
 
+// 统计一年每个月每座桥的养护/巡检次数
+export function countByMonth(params) {
+  return request({
+    url: 'bridge/maintain/countByMonth',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 01aff3f..9ad6a5a 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -63,7 +63,8 @@
               '<div class="popup-title">' + data.name + '</div>';
 
             if (data.photo !== '') {
-              popupStr += '<div><img src="' + data.photo + '" fit="fit" style="height: 180px; margin:5px; padding-right: 5px"' + '</image></div>'
+              const base = this.baseConfig.baseUrl + 'static/'
+              popupStr += '<div><img src="' + base + data.photo.split(';')[0] + '" fit="fit" style="width: 280px; margin:5px; padding-right: 5px"' + '</image></div>'
             }
 
             popupStr +=
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
index a86e235..af882a8 100644
--- a/src/views/statistics/maintainStatistics.vue
+++ b/src/views/statistics/maintainStatistics.vue
@@ -14,16 +14,15 @@
       </el-row>
       <el-row>
         <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
+          <div class="chart-body-title">年度养护数量统计</div>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
+        <el-col :span="16" class="chart-body" >
+          <ve-histogram :data="chartList" :settings="chartSettings" />
         </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column align="center" type="index" label="排序" width="55"/>
+        <el-col :span="8" class="chart-body">
+          <el-table :data="list" class="table" border height="400">
             <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">
               <template slot-scope="scope">
                 <span>{{ scope.row[column.value] }}</span>
@@ -37,84 +36,158 @@
 </template>
 
 <script>
-import { countByYear } from '@/api/system/statistics'
-import { getDayTime } from '@/utils/dateutils'
-import DeptSelect from '@/components/DeptSelect/index'
+import { countByMonth } from '@/api/system/statistics'
 import PieChart from './pieChart'
 import BarChart from './barChart'
 
 export default {
   name: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
+  components: { BarChart, PieChart },
   data() {
     return {
       listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
+        year: ''
       },
       columns: [
         {
-          text: '养护类型',
-          value: 'typeName',
+          text: '时间',
+          value: 'month',
           align: 'center'
         },
         {
-          text: '养护数量',
+          text: '桥梁',
+          value: 'bridge',
+          align: 'center'
+        },
+        {
+          text: '次数',
           value: 'count',
           align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
-      chartList: [],
-      chartshow: false
+      chartList: {
+        'columns': ['时间'],
+        'rows': []
+      },
+      chartSettings: {
+        stack: { '时间': [] }
+      }
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()
-  },
-  activated() {
+    this.listQuery.year = new Date().getFullYear().toString()
     this.fetchData()
   },
   methods: {
     // 获取统计数据
     fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
+      countByMonth(this.listQuery).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+
+          const that = this
+          this.chartList.rows = []
+          for (let i = 1; i <= 12; i++) {
+            if (i < 10) {
+              this.chartList.rows.push({
+                '时间': this.listQuery.year + '-0' + i
+              })
+            } else {
+              this.chartList.rows.push({
+                '时间': this.listQuery.year + '-' + i
+              })
+            }
+          }
+
+          response.data.forEach(bridge => {
+            Object.keys(bridge).forEach(function(k) {
+              if (parseInt(k) === that.baseConfig.bridges[0].id) {
+                // columns属性
+                that.chartList.columns.push(that.baseConfig.bridges[0].name)
+
+                // rows属性
+                bridge[k].forEach(count => {
+                  const index = parseInt(count.name.substring(5, 7)) - 1
+                  that.chartList.rows[index][that.baseConfig.bridges[0].name] = count.count
+
+                  if (count.count > 0) {
+                    that.list.push({
+                      'month': count.name,
+                      'bridge': that.baseConfig.bridges[0].name,
+                      'count': count.count
+                    })
+                  }
+                })
+
+                // stack属性
+                that.chartSettings.stack['时间'].push(that.baseConfig.bridges[0].name)
+              } else if (parseInt(k) === that.baseConfig.bridges[1].id) {
+                // columns属性
+                that.chartList.columns.push(that.baseConfig.bridges[1].name)
+
+                // rows属性
+                bridge[k].forEach(count => {
+                  const index = parseInt(count.name.substring(5, 7)) - 1
+                  that.chartList.rows[index][that.baseConfig.bridges[1].name] = count.count
+
+                  if (count.count > 0) {
+                    that.list.push({
+                      'month': count.name,
+                      'bridge': that.baseConfig.bridges[1].name,
+                      'count': count.count
+                    })
+                  }
+                })
+
+                // stack属性
+                that.chartSettings.stack['时间'].push(that.baseConfig.bridges[1].name)
+              } else if (parseInt(k) === that.baseConfig.bridges[2].id) {
+                // columns属性
+                that.chartList.columns.push(that.baseConfig.bridges[2].name)
+
+                // rows属性
+                bridge[k].forEach(count => {
+                  const index = parseInt(count.name.substring(5, 7)) - 1
+                  that.chartList.rows[index][that.baseConfig.bridges[2].name] = count.count
+
+                  if (count.count > 0) {
+                    that.list.push({
+                      'month': count.name,
+                      'bridge': that.baseConfig.bridges[2].name,
+                      'count': count.count
+                    })
+                  }
+                })
+
+                // stack属性
+                that.chartSettings.stack['时间'].push(that.baseConfig.bridges[2].name)
+              } else if (parseInt(k) === that.baseConfig.bridges[3].id) {
+                // columns属性
+                that.chartList.columns.push(that.baseConfig.bridges[3].name)
+
+                // rows属性
+                bridge[k].forEach(count => {
+                  const index = parseInt(count.name.substring(5, 7)) - 1
+                  that.chartList.rows[index][that.baseConfig.bridges[3].name] = count.count
+
+                  if (count.count > 0) {
+                    that.list.push({
+                      'month': count.name,
+                      'bridge': that.baseConfig.bridges[3].name,
+                      'count': count.count
+                    })
+                  }
+                })
+
+                // stack属性
+                that.chartSettings.stack['时间'].push(that.baseConfig.bridges[3].name)
+              }
+            })
+          })
+        }
       })
-    },
-    changeDate(date) {
-      let beginTime, endTime
-      if (date === 'today') {
-        beginTime = getDayTime(new Date().getTime())
-        endTime = new Date()
-        this.timeRange = [beginTime, endTime]
-      } else if (date === 'yesterday') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
-        endTime = getDayTime(new Date().getTime())
-      } else if (date === 'sevendays') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-        endTime = new Date()
-      } else if (date === 'lastmonth') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-        endTime = new Date()
-      }
-      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
-      // this.fetchData()
     }
   }
 }