diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},
diff --git a/src/views/socialLive/components/canteen/components/canteenCount.vue b/src/views/socialLive/components/canteen/components/canteenCount.vue
index 9470d04..9e8c619 100644
--- a/src/views/socialLive/components/canteen/components/canteenCount.vue
+++ b/src/views/socialLive/components/canteen/components/canteenCount.vue
@@ -6,28 +6,57 @@
 <template>
     <div style="width: 100%;height:100%;padding:0.1rem; padding-bottom:0.01rem;margin-left:-20px;" >
       <div class="block-container">
-        <div class="line"><div class="title">食堂数</div><div class="value">1</div></div>
-        <div class="line"><div class="title">窗口数</div><div class="value">2</div></div>
-        <div class="line"><div class="title">就餐卡发放</div><div class="value">1330</div></div>
-        <div class="line"><div class="title">今日就餐</div><div class="value">212</div></div>
+        <div class="line"><div class="title">食堂数</div><div class="value">{{canteen}}</div></div>
+        <div class="line"><div class="title">窗口数</div><div class="value">{{window}}</div></div>
+        <div class="line"><div class="title">就餐卡发放</div><div class="value">{{card}}</div></div>
+        <div class="line"><div class="title">今日就餐</div><div class="value">{{today}}</div></div>
       </div>
     </div>
 </template>
 
 <script>
+
+import {fetchCanteenInfo} from '@/api/ecard'
 export default {
   name: 'canteenCount',
   components: {},
   data () {
     return {
-
+      canteen: 0,
+      window: 0,
+      card: 0,
+      today: 0
     }
   },
   created () {
     this.getData()
   },
   methods: {
+    getData () {
+      fetchCanteenInfo('canteen').then(response => {
+        if (response.code === 200) {
+          this.canteen = response.data.total
+        }
+      })
 
+      fetchCanteenInfo('window').then(response => {
+        if (response.code === 200) {
+          this.window = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('card').then(response => {
+        if (response.code === 200) {
+          this.card = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('today').then(response => {
+        if (response.code === 200) {
+          this.today = response.data.total
+        }
+      })
+    }
   }
 }
 </script>

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},
diff --git a/src/views/socialLive/components/canteen/components/canteenCount.vue b/src/views/socialLive/components/canteen/components/canteenCount.vue
index 9470d04..9e8c619 100644
--- a/src/views/socialLive/components/canteen/components/canteenCount.vue
+++ b/src/views/socialLive/components/canteen/components/canteenCount.vue
@@ -6,28 +6,57 @@
 <template>
     <div style="width: 100%;height:100%;padding:0.1rem; padding-bottom:0.01rem;margin-left:-20px;" >
       <div class="block-container">
-        <div class="line"><div class="title">食堂数</div><div class="value">1</div></div>
-        <div class="line"><div class="title">窗口数</div><div class="value">2</div></div>
-        <div class="line"><div class="title">就餐卡发放</div><div class="value">1330</div></div>
-        <div class="line"><div class="title">今日就餐</div><div class="value">212</div></div>
+        <div class="line"><div class="title">食堂数</div><div class="value">{{canteen}}</div></div>
+        <div class="line"><div class="title">窗口数</div><div class="value">{{window}}</div></div>
+        <div class="line"><div class="title">就餐卡发放</div><div class="value">{{card}}</div></div>
+        <div class="line"><div class="title">今日就餐</div><div class="value">{{today}}</div></div>
       </div>
     </div>
 </template>
 
 <script>
+
+import {fetchCanteenInfo} from '@/api/ecard'
 export default {
   name: 'canteenCount',
   components: {},
   data () {
     return {
-
+      canteen: 0,
+      window: 0,
+      card: 0,
+      today: 0
     }
   },
   created () {
     this.getData()
   },
   methods: {
+    getData () {
+      fetchCanteenInfo('canteen').then(response => {
+        if (response.code === 200) {
+          this.canteen = response.data.total
+        }
+      })
 
+      fetchCanteenInfo('window').then(response => {
+        if (response.code === 200) {
+          this.window = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('card').then(response => {
+        if (response.code === 200) {
+          this.card = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('today').then(response => {
+        if (response.code === 200) {
+          this.today = response.data.total
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/socialLive/components/canteen/components/canteenDetail.vue b/src/views/socialLive/components/canteen/components/canteenDetail.vue
index f922f2b..9bd1850 100644
--- a/src/views/socialLive/components/canteen/components/canteenDetail.vue
+++ b/src/views/socialLive/components/canteen/components/canteenDetail.vue
@@ -13,8 +13,9 @@
 import SimplePieChart from '@/components/pieChart/simplePieChart'
 import Corner1 from '@/components/corner/Corner1'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchOccupationByPark} from '@/api/cityManage'
+import {getCanteenStatistics} from '@/api/ecard'
 import ScrollBoard from '@/components/board/ScrollBoard'
+import { dateToString } from '@/utils/formatDate'
 export default {
   name: 'canteenDetail',
   components: {ScrollBoard, ChartLayout, Corner1, SimplePieChart},
@@ -32,18 +33,7 @@
         headerFontSize: '0.075rem', // 表头字体大小
         rowFontSize: '0.075rem', // 行字体大小
         columnWidth: [150],
-        data: [
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231]
-        ]
+        data: []
       }
     }
   },
@@ -52,19 +42,19 @@
   },
   methods: {
     getData () {
-      // fetchOccupationByPark().then(response => {
-      //   if (response.code === 200) {
-      //     const data = response.data
-      //     const list = data.map(item => {
-      //       const radio = Math.round(item.already / item.total * 100)
-      //       return [item.name, item.total, item.already, radio + '%']
-      //     })
-      //     this.boardConfig.data = list
-      //     const boardConfig = this.boardConfig
-      //     // this.$set(this, 'boardConfig', boardConfig)
-      //     this.boardConfig = Object.assign({}, boardConfig)
-      //   }
-      // })
+      const today = dateToString(new Date(), 'y-m-d')
+      const params = {params: [today, today]}
+      getCanteenStatistics(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          const list = data.map(item => {
+            return [item.name, item.breakfast, item.lunch, item.dinner]
+          })
+          this.boardConfig.data = list
+          const boardConfig = this.boardConfig
+          this.boardConfig = Object.assign({}, boardConfig)
+        }
+      })
     }
   }
 }

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},
diff --git a/src/views/socialLive/components/canteen/components/canteenCount.vue b/src/views/socialLive/components/canteen/components/canteenCount.vue
index 9470d04..9e8c619 100644
--- a/src/views/socialLive/components/canteen/components/canteenCount.vue
+++ b/src/views/socialLive/components/canteen/components/canteenCount.vue
@@ -6,28 +6,57 @@
 <template>
     <div style="width: 100%;height:100%;padding:0.1rem; padding-bottom:0.01rem;margin-left:-20px;" >
       <div class="block-container">
-        <div class="line"><div class="title">食堂数</div><div class="value">1</div></div>
-        <div class="line"><div class="title">窗口数</div><div class="value">2</div></div>
-        <div class="line"><div class="title">就餐卡发放</div><div class="value">1330</div></div>
-        <div class="line"><div class="title">今日就餐</div><div class="value">212</div></div>
+        <div class="line"><div class="title">食堂数</div><div class="value">{{canteen}}</div></div>
+        <div class="line"><div class="title">窗口数</div><div class="value">{{window}}</div></div>
+        <div class="line"><div class="title">就餐卡发放</div><div class="value">{{card}}</div></div>
+        <div class="line"><div class="title">今日就餐</div><div class="value">{{today}}</div></div>
       </div>
     </div>
 </template>
 
 <script>
+
+import {fetchCanteenInfo} from '@/api/ecard'
 export default {
   name: 'canteenCount',
   components: {},
   data () {
     return {
-
+      canteen: 0,
+      window: 0,
+      card: 0,
+      today: 0
     }
   },
   created () {
     this.getData()
   },
   methods: {
+    getData () {
+      fetchCanteenInfo('canteen').then(response => {
+        if (response.code === 200) {
+          this.canteen = response.data.total
+        }
+      })
 
+      fetchCanteenInfo('window').then(response => {
+        if (response.code === 200) {
+          this.window = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('card').then(response => {
+        if (response.code === 200) {
+          this.card = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('today').then(response => {
+        if (response.code === 200) {
+          this.today = response.data.total
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/socialLive/components/canteen/components/canteenDetail.vue b/src/views/socialLive/components/canteen/components/canteenDetail.vue
index f922f2b..9bd1850 100644
--- a/src/views/socialLive/components/canteen/components/canteenDetail.vue
+++ b/src/views/socialLive/components/canteen/components/canteenDetail.vue
@@ -13,8 +13,9 @@
 import SimplePieChart from '@/components/pieChart/simplePieChart'
 import Corner1 from '@/components/corner/Corner1'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchOccupationByPark} from '@/api/cityManage'
+import {getCanteenStatistics} from '@/api/ecard'
 import ScrollBoard from '@/components/board/ScrollBoard'
+import { dateToString } from '@/utils/formatDate'
 export default {
   name: 'canteenDetail',
   components: {ScrollBoard, ChartLayout, Corner1, SimplePieChart},
@@ -32,18 +33,7 @@
         headerFontSize: '0.075rem', // 表头字体大小
         rowFontSize: '0.075rem', // 行字体大小
         columnWidth: [150],
-        data: [
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231]
-        ]
+        data: []
       }
     }
   },
@@ -52,19 +42,19 @@
   },
   methods: {
     getData () {
-      // fetchOccupationByPark().then(response => {
-      //   if (response.code === 200) {
-      //     const data = response.data
-      //     const list = data.map(item => {
-      //       const radio = Math.round(item.already / item.total * 100)
-      //       return [item.name, item.total, item.already, radio + '%']
-      //     })
-      //     this.boardConfig.data = list
-      //     const boardConfig = this.boardConfig
-      //     // this.$set(this, 'boardConfig', boardConfig)
-      //     this.boardConfig = Object.assign({}, boardConfig)
-      //   }
-      // })
+      const today = dateToString(new Date(), 'y-m-d')
+      const params = {params: [today, today]}
+      getCanteenStatistics(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          const list = data.map(item => {
+            return [item.name, item.breakfast, item.lunch, item.dinner]
+          })
+          this.boardConfig.data = list
+          const boardConfig = this.boardConfig
+          this.boardConfig = Object.assign({}, boardConfig)
+        }
+      })
     }
   }
 }
diff --git a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
index 3cc1911..c03cc7e 100644
--- a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
+++ b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
@@ -35,9 +35,9 @@
         height: '100%',
         width: '100%',
         unit: '次',
-        xAxisData: ['9-3', '9-4', '9-5', '9-6', '9-7', '9-8', '9-9'],
+        xAxisData: ['', '', '', '', '', '', ''],
         seriesData: [
-          {name: '人流量', data: [120, 252, 101, 134, 290, 230, 110], color: '0,144,255'}
+          {name: '人流量', data: [0, 0, 0, 0, 0, 0, 0], color: '0,144,255'}
           // {name: '出场流量', data: [110, 222, 91, 82, 278, 200, 91], color: '0,144,255'}
         ]
       }
@@ -54,7 +54,11 @@
       fetchCanteenDayNum(params).then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          if (data.length === 0) {
+            this.options.xAxisData = []
+          } else {
+            this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          }
           const value = data.map(item => { return item.value === '' ? 0 : item.value })
           this.options.seriesData = [
             {name: '人流量', data: value, color: '0,144,255'}

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},
diff --git a/src/views/socialLive/components/canteen/components/canteenCount.vue b/src/views/socialLive/components/canteen/components/canteenCount.vue
index 9470d04..9e8c619 100644
--- a/src/views/socialLive/components/canteen/components/canteenCount.vue
+++ b/src/views/socialLive/components/canteen/components/canteenCount.vue
@@ -6,28 +6,57 @@
 <template>
     <div style="width: 100%;height:100%;padding:0.1rem; padding-bottom:0.01rem;margin-left:-20px;" >
       <div class="block-container">
-        <div class="line"><div class="title">食堂数</div><div class="value">1</div></div>
-        <div class="line"><div class="title">窗口数</div><div class="value">2</div></div>
-        <div class="line"><div class="title">就餐卡发放</div><div class="value">1330</div></div>
-        <div class="line"><div class="title">今日就餐</div><div class="value">212</div></div>
+        <div class="line"><div class="title">食堂数</div><div class="value">{{canteen}}</div></div>
+        <div class="line"><div class="title">窗口数</div><div class="value">{{window}}</div></div>
+        <div class="line"><div class="title">就餐卡发放</div><div class="value">{{card}}</div></div>
+        <div class="line"><div class="title">今日就餐</div><div class="value">{{today}}</div></div>
       </div>
     </div>
 </template>
 
 <script>
+
+import {fetchCanteenInfo} from '@/api/ecard'
 export default {
   name: 'canteenCount',
   components: {},
   data () {
     return {
-
+      canteen: 0,
+      window: 0,
+      card: 0,
+      today: 0
     }
   },
   created () {
     this.getData()
   },
   methods: {
+    getData () {
+      fetchCanteenInfo('canteen').then(response => {
+        if (response.code === 200) {
+          this.canteen = response.data.total
+        }
+      })
 
+      fetchCanteenInfo('window').then(response => {
+        if (response.code === 200) {
+          this.window = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('card').then(response => {
+        if (response.code === 200) {
+          this.card = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('today').then(response => {
+        if (response.code === 200) {
+          this.today = response.data.total
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/socialLive/components/canteen/components/canteenDetail.vue b/src/views/socialLive/components/canteen/components/canteenDetail.vue
index f922f2b..9bd1850 100644
--- a/src/views/socialLive/components/canteen/components/canteenDetail.vue
+++ b/src/views/socialLive/components/canteen/components/canteenDetail.vue
@@ -13,8 +13,9 @@
 import SimplePieChart from '@/components/pieChart/simplePieChart'
 import Corner1 from '@/components/corner/Corner1'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchOccupationByPark} from '@/api/cityManage'
+import {getCanteenStatistics} from '@/api/ecard'
 import ScrollBoard from '@/components/board/ScrollBoard'
+import { dateToString } from '@/utils/formatDate'
 export default {
   name: 'canteenDetail',
   components: {ScrollBoard, ChartLayout, Corner1, SimplePieChart},
@@ -32,18 +33,7 @@
         headerFontSize: '0.075rem', // 表头字体大小
         rowFontSize: '0.075rem', // 行字体大小
         columnWidth: [150],
-        data: [
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231]
-        ]
+        data: []
       }
     }
   },
@@ -52,19 +42,19 @@
   },
   methods: {
     getData () {
-      // fetchOccupationByPark().then(response => {
-      //   if (response.code === 200) {
-      //     const data = response.data
-      //     const list = data.map(item => {
-      //       const radio = Math.round(item.already / item.total * 100)
-      //       return [item.name, item.total, item.already, radio + '%']
-      //     })
-      //     this.boardConfig.data = list
-      //     const boardConfig = this.boardConfig
-      //     // this.$set(this, 'boardConfig', boardConfig)
-      //     this.boardConfig = Object.assign({}, boardConfig)
-      //   }
-      // })
+      const today = dateToString(new Date(), 'y-m-d')
+      const params = {params: [today, today]}
+      getCanteenStatistics(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          const list = data.map(item => {
+            return [item.name, item.breakfast, item.lunch, item.dinner]
+          })
+          this.boardConfig.data = list
+          const boardConfig = this.boardConfig
+          this.boardConfig = Object.assign({}, boardConfig)
+        }
+      })
     }
   }
 }
diff --git a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
index 3cc1911..c03cc7e 100644
--- a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
+++ b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
@@ -35,9 +35,9 @@
         height: '100%',
         width: '100%',
         unit: '次',
-        xAxisData: ['9-3', '9-4', '9-5', '9-6', '9-7', '9-8', '9-9'],
+        xAxisData: ['', '', '', '', '', '', ''],
         seriesData: [
-          {name: '人流量', data: [120, 252, 101, 134, 290, 230, 110], color: '0,144,255'}
+          {name: '人流量', data: [0, 0, 0, 0, 0, 0, 0], color: '0,144,255'}
           // {name: '出场流量', data: [110, 222, 91, 82, 278, 200, 91], color: '0,144,255'}
         ]
       }
@@ -54,7 +54,11 @@
       fetchCanteenDayNum(params).then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          if (data.length === 0) {
+            this.options.xAxisData = []
+          } else {
+            this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          }
           const value = data.map(item => { return item.value === '' ? 0 : item.value })
           this.options.seriesData = [
             {name: '人流量', data: value, color: '0,144,255'}
diff --git a/src/views/socialLive/components/eCard/components/ecardEarth.vue b/src/views/socialLive/components/eCard/components/ecardEarth.vue
index 3ba3989..f0a2dd2 100644
--- a/src/views/socialLive/components/eCard/components/ecardEarth.vue
+++ b/src/views/socialLive/components/eCard/components/ecardEarth.vue
@@ -12,7 +12,7 @@
 <script>
 
 import EarthViews from '@/components/EarthViews/EarthViews'
-import {fetchDataCommon} from '@/api/common'
+import {fetchCardInfo} from '@/api/ecard'
 export default {
   name: 'ecardEarth',
   components: {EarthViews},
@@ -36,9 +36,9 @@
     },
     // 获取一卡通注册人数
     getUserCount () {
-      fetchDataCommon('1130').then(response => {
+      fetchCardInfo('register').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
+          const count = response.data.value
           const data = {name: '注册人数', num: count}
           this.data.splice(0, 1, data)
         }
@@ -46,19 +46,19 @@
     },
     // 获取一卡通活跃注册人数
     getAliveUserCount () {
-      fetchDataCommon('1131').then(response => {
+      fetchCardInfo('login').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
+          const count = response.data.value
           const data = {name: '活跃人数', num: count}
           this.data.splice(1, 1, data)
         }
       })
     },
     getEnterpriseCount () {
-      fetchDataCommon('1130').then(response => {
+      fetchCardInfo('enterprise').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
-          const data = {name: '注册企业', num: 1}
+          const count = response.data.value
+          const data = {name: '注册企业', num: count}
           this.data.splice(2, 1, data)
         }
       })

diff --git a/src/api/cityManage.js b/src/api/cityManage.js
index 04cfea4..d8a790d 100644
--- a/src/api/cityManage.js
+++ b/src/api/cityManage.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import config from '@/utils/baseConfig'
-
+import qs from 'qs'
 // 城市治理接口
 // 城市基本信息：area面积，region区域数量，population人口，street街道数量，community社区数量，grid网格数量
 export function fetchBaseInfo (type) {
@@ -19,6 +19,24 @@
   })
 }
 
+// 设备数量
+export function fetchDeviceCount (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceCountByType',
+    method: 'get'
+  })
+}
+
+// 设备在线情况
+export function fetchDeviceState (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/iot/deviceStateByType',
+    method: 'get'
+  })
+}
+
 // 交通设施建设数量
 export function fetchTrafficCount (type) {
   return request({
@@ -49,7 +67,7 @@
 // 特殊人群人数
 export function fetchSpecial (type) {
   return request({
-    // baseURL: config.baseUrl,
+    baseURL: config.baseUrl,
     url: '/population/special',
     method: 'get'
   })
@@ -170,6 +188,18 @@
   })
 }
 
+// 7天收入
+export function smartParkIncomeByDay (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: 'smartPark/incomeByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
 // 日流量统计
 export function fetchParkFlowByDay () {
   return request({
@@ -200,3 +230,29 @@
     method: 'get'
   })
 }
+
+// 管网报警
+export function pipeAlarmByType (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByType',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 管网7日报警
+export function fetchAlarmCount (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/pipe/alarmByDay',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/ecard.js b/src/api/ecard.js
index 0141aa5..5a78023 100644
--- a/src/api/ecard.js
+++ b/src/api/ecard.js
@@ -46,3 +46,34 @@
     }
   })
 }
+
+// 今日就餐人次 today;就餐卡放放数 card;食堂总数 canteen
+export function fetchCanteenInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/' + type,
+    method: 'get'
+  })
+}
+
+// 各食堂每日用餐数量三餐
+export function getCanteenStatistics (params) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/canteen/statistics',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 一卡通情况
+export function fetchCardInfo (type) {
+  return request({
+    baseURL: config.baseUrl,
+    url: '/card/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index 3e39af2..7a1d425 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,6 @@
 export default {
   jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址
+  // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址
   baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址
   // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址
 }
diff --git a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
index bb748c8..c84de90 100644
--- a/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceCountBar.vue
@@ -20,7 +20,7 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceCount} from '@/api/cityManage'
 export default {
   name: 'deviceCountBar',
   components: {ChartLayout, ColorfulBarChart},
@@ -41,10 +41,10 @@
   },
   methods: {
     getData () {
-      fetchPipeCount().then(response => {
+      fetchDeviceCount().then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.name })
+          this.options.xAxisData = data.map(item => { return item.type })
           this.options.seriesData = data.map(item => { return item.value })
         }
       })
diff --git a/src/views/cityConstruction/components/iot/components/deviceOnline.vue b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
index f6f9787..79b94ce 100644
--- a/src/views/cityConstruction/components/iot/components/deviceOnline.vue
+++ b/src/views/cityConstruction/components/iot/components/deviceOnline.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import {fetchPipeCount} from '@/api/cityManage'
+import {fetchDeviceState} from '@/api/cityManage'
 import AnnularComp from '@/components/annularProgress/annularComp'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
 export default {
   name: 'deviceOnline',
   components: {SingleLayout, AnnularComp},
@@ -67,65 +67,91 @@
   },
   methods: {
     getData () {
-      this.data = [
-        {
-          name: '电子标识器', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '井盖状态监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '液位监测仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '燃气智能终端', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        {
-          name: '噪声记录仪', // 设备名称
-          total: 100, // 设备总数
-          online: 95, // 在线数
-          color: ['#fc5e5f', '#f90006']
-        },
-        {
-          name: '枪机', // 设备名称
-          total: 100, // 设备总数
-          online: 50, // 在线数
-          color: ['#39edfb', '#19ddff']
-        },
-        // {
-        //   id: 'onlineStatus_id7',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // },
-        // {
-        //   id: 'onlineStatus_id8',
-        //   name: '电子标识器', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 95, // 在线数
-        //   color: ['#fc5e5f', '#f90006']
-        // },
-        // {
-        //   id: 'onlineStatus_id9',
-        //   name: '井盖', // 设备名称
-        //   total: 100, // 设备总数
-        //   online: 50, // 在线数
-        //   color: ['#39edfb', '#19ddff']
-        // }
-      ]
+      fetchDeviceState().then(response => {
+        if (response.code === 200) {
+          this.data = []
+          var data = response.data
+          var item
+          for (let i = 0; i < data.length; i++) {
+            if (i % 2 === 0) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#fc5e5f', '#f90006']
+              }
+            } else if (i % 2 === 1) {
+              item = {
+                name: data[i].type,
+                total: data[i].value,
+                online: data[i].online,
+                color: ['#39edfb', '#19ddff']
+              }
+            }
+            this.data.push(item)
+          }
+        }
+      })
+      // this.data = [
+      //   {
+      //     name: '电子标识器', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '井盖状态监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '液位监测仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '燃气智能终端', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   },
+      //   {
+      //     name: '噪声记录仪', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 95, // 在线数
+      //     color: ['#fc5e5f', '#f90006']
+      //   },
+      //   {
+      //     name: '枪机', // 设备名称
+      //     total: 100, // 设备总数
+      //     online: 50, // 在线数
+      //     color: ['#39edfb', '#19ddff']
+      //   }
+
+      // {
+      //   id: 'onlineStatus_id7',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // },
+      // {
+      //   id: 'onlineStatus_id8',
+      //   name: '电子标识器', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 95, // 在线数
+      //   color: ['#fc5e5f', '#f90006']
+      // },
+      // {
+      //   id: 'onlineStatus_id9',
+      //   name: '井盖', // 设备名称
+      //   total: 100, // 设备总数
+      //   online: 50, // 在线数
+      //   color: ['#39edfb', '#19ddff']
+      // }
+      // ]
       // fetchPipeCount().then(response => {
       //   if (response.code === 200) {
       //     const data = response.data
diff --git a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
index 082c7e2..7b680bf 100644
--- a/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
+++ b/src/views/cityManage/components/parkingSystem/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
index 76fc736..d8f3c2c 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmBar.vue
@@ -18,6 +18,8 @@
 <script>
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import SingleLayout from '@/components/layout/singleLayout'
+import {pipeAlarmByType} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmBar',
   components: {SingleLayout, ColorfulBarChart},
@@ -28,14 +30,32 @@
         height: '100%',
         width: '100%',
         unit: '米',
-        xAxisData: ['井盖开启', '液位超限', '燃气泄漏', '消防栓', '爆管', '其他'],
-        seriesData: [67, 12, 2, 1, 0, 0]
+        xAxisData: ['', '', '', '', '', ''],
+        seriesData: [
+          {name: '报警数', data: [0, 0, 0, 0, 0, 0], color: '0,144,255'}
+        ]
       }
     }
   },
+  mounted () {
+    this.getData()
+  },
   methods: {
     getData () {
-
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      console.log(params)
+      pipeAlarmByType(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.type })
+          const value = data.map(item => { return item.value === '' ? 0 : item.value })
+          this.options.seriesData = [
+            {name: '报警数', data: value, color: '0,144,255'}
+          ]
+        }
+      })
     }
   }
 }
diff --git a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
index 5dc976f..467cd5d 100644
--- a/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
+++ b/src/views/cityManage/components/pipeAlarm/components/pipeAlarmLine.vue
@@ -22,7 +22,9 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import SingleLayout from "../../../../../components/layout/singleLayout";
+import SingleLayout from '../../../../../components/layout/singleLayout'
+import {fetchAlarmCount} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'pipeAlarmLine',
   components: {SingleLayout, GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -41,6 +43,23 @@
         ]
       }
     }
+  },
+  created () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      fetchAlarmCount(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          this.options.seriesData = data.map(item => { return item.value })
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
index 4f347a7..173ca2b 100644
--- a/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
+++ b/src/views/cityManage/components/pipeAlarm/pipeAlarm.vue
@@ -27,7 +27,7 @@
 import PipeAlarmBar from './components/pipeAlarmBar'
 import PipeAlarmPie from './components/pipeAlarmPie'
 import PipeAlarmLine from './components/pipeAlarmLine'
-import PipeAlarmCount from "./components/pipeAlarmCount";
+import PipeAlarmCount from './components/pipeAlarmCount'
 export default {
   name: 'PipeAlarm',
   components: {PipeAlarmCount, PipeAlarmLine, PipeAlarmPie, PipeAlarmBar},
diff --git a/src/views/socialLive/components/canteen/components/canteenCount.vue b/src/views/socialLive/components/canteen/components/canteenCount.vue
index 9470d04..9e8c619 100644
--- a/src/views/socialLive/components/canteen/components/canteenCount.vue
+++ b/src/views/socialLive/components/canteen/components/canteenCount.vue
@@ -6,28 +6,57 @@
 <template>
     <div style="width: 100%;height:100%;padding:0.1rem; padding-bottom:0.01rem;margin-left:-20px;" >
       <div class="block-container">
-        <div class="line"><div class="title">食堂数</div><div class="value">1</div></div>
-        <div class="line"><div class="title">窗口数</div><div class="value">2</div></div>
-        <div class="line"><div class="title">就餐卡发放</div><div class="value">1330</div></div>
-        <div class="line"><div class="title">今日就餐</div><div class="value">212</div></div>
+        <div class="line"><div class="title">食堂数</div><div class="value">{{canteen}}</div></div>
+        <div class="line"><div class="title">窗口数</div><div class="value">{{window}}</div></div>
+        <div class="line"><div class="title">就餐卡发放</div><div class="value">{{card}}</div></div>
+        <div class="line"><div class="title">今日就餐</div><div class="value">{{today}}</div></div>
       </div>
     </div>
 </template>
 
 <script>
+
+import {fetchCanteenInfo} from '@/api/ecard'
 export default {
   name: 'canteenCount',
   components: {},
   data () {
     return {
-
+      canteen: 0,
+      window: 0,
+      card: 0,
+      today: 0
     }
   },
   created () {
     this.getData()
   },
   methods: {
+    getData () {
+      fetchCanteenInfo('canteen').then(response => {
+        if (response.code === 200) {
+          this.canteen = response.data.total
+        }
+      })
 
+      fetchCanteenInfo('window').then(response => {
+        if (response.code === 200) {
+          this.window = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('card').then(response => {
+        if (response.code === 200) {
+          this.card = response.data.total
+        }
+      })
+
+      fetchCanteenInfo('today').then(response => {
+        if (response.code === 200) {
+          this.today = response.data.total
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/socialLive/components/canteen/components/canteenDetail.vue b/src/views/socialLive/components/canteen/components/canteenDetail.vue
index f922f2b..9bd1850 100644
--- a/src/views/socialLive/components/canteen/components/canteenDetail.vue
+++ b/src/views/socialLive/components/canteen/components/canteenDetail.vue
@@ -13,8 +13,9 @@
 import SimplePieChart from '@/components/pieChart/simplePieChart'
 import Corner1 from '@/components/corner/Corner1'
 import ChartLayout from '@/components/layout/chartLayout'
-import {fetchOccupationByPark} from '@/api/cityManage'
+import {getCanteenStatistics} from '@/api/ecard'
 import ScrollBoard from '@/components/board/ScrollBoard'
+import { dateToString } from '@/utils/formatDate'
 export default {
   name: 'canteenDetail',
   components: {ScrollBoard, ChartLayout, Corner1, SimplePieChart},
@@ -32,18 +33,7 @@
         headerFontSize: '0.075rem', // 表头字体大小
         rowFontSize: '0.075rem', // 行字体大小
         columnWidth: [150],
-        data: [
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231],
-          ['管委会食堂', 231, 123, 231]
-        ]
+        data: []
       }
     }
   },
@@ -52,19 +42,19 @@
   },
   methods: {
     getData () {
-      // fetchOccupationByPark().then(response => {
-      //   if (response.code === 200) {
-      //     const data = response.data
-      //     const list = data.map(item => {
-      //       const radio = Math.round(item.already / item.total * 100)
-      //       return [item.name, item.total, item.already, radio + '%']
-      //     })
-      //     this.boardConfig.data = list
-      //     const boardConfig = this.boardConfig
-      //     // this.$set(this, 'boardConfig', boardConfig)
-      //     this.boardConfig = Object.assign({}, boardConfig)
-      //   }
-      // })
+      const today = dateToString(new Date(), 'y-m-d')
+      const params = {params: [today, today]}
+      getCanteenStatistics(params).then(response => {
+        if (response.code === 200) {
+          const data = response.data
+          const list = data.map(item => {
+            return [item.name, item.breakfast, item.lunch, item.dinner]
+          })
+          this.boardConfig.data = list
+          const boardConfig = this.boardConfig
+          this.boardConfig = Object.assign({}, boardConfig)
+        }
+      })
     }
   }
 }
diff --git a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
index 3cc1911..c03cc7e 100644
--- a/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
+++ b/src/views/socialLive/components/canteen/components/canteenFlowLine.vue
@@ -35,9 +35,9 @@
         height: '100%',
         width: '100%',
         unit: '次',
-        xAxisData: ['9-3', '9-4', '9-5', '9-6', '9-7', '9-8', '9-9'],
+        xAxisData: ['', '', '', '', '', '', ''],
         seriesData: [
-          {name: '人流量', data: [120, 252, 101, 134, 290, 230, 110], color: '0,144,255'}
+          {name: '人流量', data: [0, 0, 0, 0, 0, 0, 0], color: '0,144,255'}
           // {name: '出场流量', data: [110, 222, 91, 82, 278, 200, 91], color: '0,144,255'}
         ]
       }
@@ -54,7 +54,11 @@
       fetchCanteenDayNum(params).then(response => {
         if (response.code === 200) {
           const data = response.data
-          this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          if (data.length === 0) {
+            this.options.xAxisData = []
+          } else {
+            this.options.xAxisData = data.map(item => { return item.date.substring(5) })
+          }
           const value = data.map(item => { return item.value === '' ? 0 : item.value })
           this.options.seriesData = [
             {name: '人流量', data: value, color: '0,144,255'}
diff --git a/src/views/socialLive/components/eCard/components/ecardEarth.vue b/src/views/socialLive/components/eCard/components/ecardEarth.vue
index 3ba3989..f0a2dd2 100644
--- a/src/views/socialLive/components/eCard/components/ecardEarth.vue
+++ b/src/views/socialLive/components/eCard/components/ecardEarth.vue
@@ -12,7 +12,7 @@
 <script>
 
 import EarthViews from '@/components/EarthViews/EarthViews'
-import {fetchDataCommon} from '@/api/common'
+import {fetchCardInfo} from '@/api/ecard'
 export default {
   name: 'ecardEarth',
   components: {EarthViews},
@@ -36,9 +36,9 @@
     },
     // 获取一卡通注册人数
     getUserCount () {
-      fetchDataCommon('1130').then(response => {
+      fetchCardInfo('register').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
+          const count = response.data.value
           const data = {name: '注册人数', num: count}
           this.data.splice(0, 1, data)
         }
@@ -46,19 +46,19 @@
     },
     // 获取一卡通活跃注册人数
     getAliveUserCount () {
-      fetchDataCommon('1131').then(response => {
+      fetchCardInfo('login').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
+          const count = response.data.value
           const data = {name: '活跃人数', num: count}
           this.data.splice(1, 1, data)
         }
       })
     },
     getEnterpriseCount () {
-      fetchDataCommon('1130').then(response => {
+      fetchCardInfo('enterprise').then(response => {
         if (response.code === 200) {
-          const count = response.data[0].COUNT
-          const data = {name: '注册企业', num: 1}
+          const count = response.data.value
+          const data = {name: '注册企业', num: count}
           this.data.splice(2, 1, data)
         }
       })
diff --git a/src/views/socialLive/components/parkingSystem/components/parkIncomLine.vue b/src/views/socialLive/components/parkingSystem/components/parkIncomLine.vue
index 3d98184..afe821a 100644
--- a/src/views/socialLive/components/parkingSystem/components/parkIncomLine.vue
+++ b/src/views/socialLive/components/parkingSystem/components/parkIncomLine.vue
@@ -22,7 +22,8 @@
 import ChartLayout from '@/components/layout/chartLayout'
 import ColorfulBarChart from '@/components/barChart/colorfulBarChart'
 import GradientLineChart from '@/components/lineChart/gradientLineChart'
-import {fetchParkIncomeByDay} from '@/api/cityManage'
+import {smartParkIncomeByDay} from '@/api/cityManage'
+import { dateToString, getLastWeek } from '@/utils/formatDate'
 export default {
   name: 'parkIncomeLine',
   components: {GradientLineChart, ColorfulBarChart, ChartLayout},
@@ -46,7 +47,10 @@
   },
   methods: {
     getData () {
-      fetchParkIncomeByDay().then(response => {
+      const today = dateToString(new Date(), 'y-m-d')
+      const sevenday = dateToString(getLastWeek(), 'y-m-d')
+      const params = {params: [sevenday, today]}
+      smartParkIncomeByDay(params).then(response => {
         if (response.code === 200) {
           const data = response.data
           this.options.xAxisData = data.map(item => { return item.name })