Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

9 小时以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 admin/src/views/index.vue

@@ -244,11 +244,11 @@
      warningTotal: 0,
      funcList: [
        { name: '访客报备', path: '', url: require('@/assets/icons/home_func1.png'), path: '/business/reportRecord' },
        { name: '隐患随手拍', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
        { name: '预约会议室', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
        // { name: '隐患随手拍', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
        // { name: '预约会议室', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
        { name: '公务车预约', path: '', url: require('@/assets/icons/home_func5.png'), path: '/operation/serviceCar/apprRecord' },
        { name: '考勤工作台', path: '', url: require('@/assets/icons/home_func4.png') },
        { name: '食堂消费', path: '', url: require('@/assets/icons/8.png') }
        // { name: '考勤工作台', path: '', url: require('@/assets/icons/home_func4.png') },
        // { name: '食堂消费', path: '', url: require('@/assets/icons/8.png') }
      ],
      isShowDetail: false,
      isShowReport: false,
@@ -396,6 +396,7 @@
    },
    getWorkBody () {
      getWorkbenchData({ queryType: 2 }).then(res => {
        console.log(res)
        this.staticData = res || {}
        this.initEchart2()
        this.initEchart21()
@@ -517,6 +518,7 @@
      if (!document.getElementById('echart2')) {
        return
      }
      echarts.dispose(document.getElementById('echart2'))
      const myChart = echarts.init(document.getElementById('echart2'))
      const that = this
      var ydata = that.staticData.internalList.map(i => i.num)
@@ -621,11 +623,11 @@
      })
    },
    initEchart21 () {
      console.log('initEchart21')
      console.log('initEchart21',this.staticData.lwList)
      if (!document.getElementById('echart21')) {
        return
      }

      echarts.dispose(document.getElementById('echart21'))
      const myChart = echarts.init(document.getElementById('echart21'))
      const that = this
      var le1 = that.staticData.internalList.length