Merge remote-tracking branch 'origin/project9-8' into project9-8

# Conflicts:
#	src/views/controlPlatform/control.vue

src/api/controlPlatform/index.js

@@ -8,3 +8,12 @@ export function findCountIdByUpdateDate(query) {
     params: query
   })
 }
+
+// 查询数量根据修改时间
+export function findCountIdByFqYy(query) {
+  return request({
+    url: '/WeHomePage/findCountIdByFqYy',
+    method: 'get',
+    params: query
+  })
+}

src/views/controlPlatform/control.vue

@@ -218,7 +218,7 @@ import * as echarts from 'echarts'
 import judgeLeaveMessage from 'svg-sprite-loader/examples/custom-runtime-generator/build/main'
 // import { controlData } from './apis'
 // import { judgeLeaveMessage } from '@/views/judgeMessageManage/apis'
-import { findCountIdByUpdateDate } from '@/api/controlPlatform'
+import { findCountIdByUpdateDate,findCountIdByFqYy } from '@/api/controlPlatform'
 export default {
   name: 'Control',
   data() {
@@ -226,6 +226,7 @@ export default {
       sumUpdateList: [],
       dataList: [],
       numList: [],
+      sumFqYyList: [],
       isShow: true,
       isShow2: false,
       judgeMessageData: 0,
@@ -303,6 +304,7 @@ export default {
     this.handleGetJudgeMessageData()
     this.handleGetStatisticsData()
     this.getSumUpdateList()
+    this.getSumList()
     // 通过监听内容部分的宽度让图表resize
     var elementResizeDetectorMaker = require('element-resize-detector')
     var erd = elementResizeDetectorMaker()
@@ -345,6 +347,12 @@ export default {
     getSumUpdateList() {
       findCountIdByUpdateDate().then(res => {
         this.sumUpdateList = res.data
+        this.sumUpdateList = res.data
+      })
+    },
+    getSumList() {
+      findCountIdByFqYy().then(res => {
+        this.sumFqYyList = res.data
         console.log('res', res)
         this.sumUpdateList.forEach(item => {
           this.numList.push(item.sum)