fix:维护记录数修改

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

@@ -74,7 +74,7 @@ export default {
                     formatter: '{d}%'
                 },
                 label: {
-                    formatter: '{b}\n{c}，{d}%',
+                    formatter: '{c}，{d}%\n{b}',
                     edgeDistance: '20%'
                 },
 

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

@@ -141,7 +141,7 @@ export default {
                 color: ['#339933', '#3870e0', '#FF0033']
             },
             allWeihuSheBeiData: {
-                data: [{ name: '计划数', value: 0 }, { name: '完成数', value: 0 }],
+                data: [{ name: '待处理', value: 0 }, { name: '已完成', value: 0 }],
                 config: { title: '检验科设备维护完成情况', idSelector: 'allWeihuShebei' },
                 color: ['#3870e0', '#FFFF66']
             },
@@ -483,15 +483,11 @@ export default {
             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 sql1 = `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_`
+            const sql1 = `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_.today}%' OR a.create_time_ LIKE '%${this_.today}%') AND a.shi_fou_guo_shen_ != '已完成' AND a.di_dian_ = '${didian}' GROUP BY a.bian_zhi_bu_men_`
+            console.log(sql1, '计划数')
             //   维护记录数
-            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', '计划数', '完成数']
+            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_.today}%' OR a.create_time_ LIKE '%${this_.today}%') 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
             await Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state === 200) {
@@ -501,24 +497,13 @@ export default {
                     data2 = res2.variables.data
                 }
             })
-
-            data2 = [
-
-                { bian_zhi_bu_men_: '1166373523464126464', name_: '检验科', total: 4 },
-
-                { bian_zhi_bu_men_: '1166703356459089920', name_: '临检组', total: 2544 },
-
-                { bian_zhi_bu_men_: '1166703455549521920', name_: '生化组', total: 2559 },
-
-                { bian_zhi_bu_men_: '1166703521244905472', name_: '免疫组', total: 1331 },
-
-                { bian_zhi_bu_men_: '1166703593022029824', name_: '微生物组', total: 2055 }]
+            data2 = []
             const source = []
             data1.forEach((item, index) => {
                 source.push({
                     product: item.name_,
-                    '计划数': item.total,
-                    '完成数': 0
+                    '待处理': item.total,
+                    '已完成': 0
                 })
             })
             data2.forEach(item => {
@@ -530,16 +515,16 @@ export default {
                     } else if (lock && index === source.length - 1) {
                         source.push({
                             product: item.name_,
-                            '计划数': 0,
-                            '完成数': item.total
+                            '待处理': 0,
+                            '已完成': item.total
                         })
                     }
                 })
             })
             let allPlan = 0; let finishs = 0
             source.forEach(item => {
-                allPlan += item['计划数']
-                finishs += item['完成数']
+                allPlan += item['待处理']
+                finishs += item['已完成']
             })
             this.allWeihuSheBeiData.data[0].value = allPlan
             this.allWeihuSheBeiData.data[1].value = finishs
@@ -552,8 +537,8 @@ export default {
                     if (item.product !== el.product && index === source.length - 1 && lock) {
                         source.push({
                             product: item.product,
-                            '计划数': 0,
-                            '完成数': 0
+                            '待处理': 0,
+                            '已完成': 0
                         })
                     }
                 })