Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/system/jbdHome/board/component/moreBar.vue

@@ -37,7 +37,7 @@ export default {
         getMiddleLeft () {
             const this_ = this
             const series = []
-
+            console.log(this_.info, this_.info.config.idSelector, '12')
             if (this_.info.data.source[0] == 999) {
                 this.showChart = false
                 return
@@ -56,18 +56,35 @@ export default {
             var chartDom = document.getElementById(this.info.config.idSelector)
             var myChart = echarts.init(chartDom)
             let interval = 7
-            let max = 0
-            console.log(this_.info.data.source)
-            this_.info.data.source.forEach(item => {
-                if (item.设备总数 > max) {
-                    max = item.设备总数
+            if (this_.info.config.idSelector === 'eqFinish') {
+                let max = 0
+                this_.info.data.source.forEach(item => {
+                    console.log(item.设备总数)
+                    if (item.设备总数 > max) {
+                        max = item.设备总数
+                    }
+                })
+                if (max < 7) {
+                    interval = 1
+                } else {
+                // interval = parseInt(max / 7)
+                    interval = Math.ceil((parseInt(max / 7) / 10)) * 10
                 }
-            })
-            if (max < 7) {
-                interval = 1
-            } else {
+            }
+            if (this_.info.config.idSelector === 'eqWeihu') {
+                let max = 0
+                this_.info.data.source.forEach(item => {
+                    console.log(item.计划数)
+                    if (item.计划数 > max) {
+                        max = item.计划数
+                    }
+                })
+                if (max < 7) {
+                    interval = 1
+                } else {
                 // interval = parseInt(max / 7)
-                interval = Math.ceil((parseInt(max / 7) / 10)) * 10
+                    interval = Math.ceil((parseInt(max / 7) / 10)) * 10
+                }
             }
             const option = {
                 legend: {

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -482,9 +482,11 @@ export default {
             let didian = ''
             this_.$store.getters.level.second ? didian = this_.$store.getters.level.second : didian = this_.$store.getters.level.first
             didian.includes(',') ? didian = didian.split(',')[0] : ''
+            // 计划数，查询设备维护计划表完成数
             const sql1 = `select DISTINCT(q.id_) ,q.name_,COUNT(*) AS total  FROM  
       (select DISTINCT(a.she_bei_bian_hao_),b.name_,b.id_ FROM t_mjsbwhjhzb AS a JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE a.parent_id_ IN 
       (select id_ FROM t_mjsbwhjhb WHERE (bian_zhi_shi_jian LIKE '%${this_.month.slice(0, 4)}%' OR create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND shi_fou_guo_shen_ = '已完成' AND di_dian_ = '${didian}') GROUP BY a.she_bei_bian_hao_) AS q  GROUP BY q.id_`
+            //   维护记录数
             const sql2 = `select DISTINCT(a.bian_zhi_bu_men_) ,name_,COUNT(*) AS total FROM t_mjsbwhbyjlby AS a JOIN ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE (a.bian_zhi_shi_jian LIKE '%${this_.month.slice(0, 4)}%' OR a.create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND a.shi_fou_guo_shen_ = '已完成' AND a.di_dian_ = '${didian}' GROUP BY a.bian_zhi_bu_men_`
             this.weihuBarData.data.dimensions = ['product', '计划数', '完成数']
             let data1, data2