检测管理看板调整

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

@@ -40,6 +40,7 @@
 <script>
     import screenfull from 'screenfull'
     import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
+    import { acceptList } from './data.js'
     export default {
         name: 'checkBoard',
         components: {
@@ -132,20 +133,20 @@
                 let quarter = this.getDateRange('quarter')
                 let week = this.getDateRange('week')
                 // 获取委托数及受理数
-                const sql = `select wt.month as month, wt.accepted as accepted, wt2.today as today, wt2.week as week, wt2.quarter as quarter, jc.total as jcTotal, jc.finished as jcFinish, rw.task as task, rw.finished as rwFinish, bg.report as report, bg.process as process,bg.approval as approval
+                const sql = `select wt.month as month, wt.accepted as accepted, wt2.today as today, wt2.week as week, wt2.quarter as quarter, jc.total as jcTotal, jc.finished as jcFinish, rw.task as task, rw.finished as rwFinish, bg.report as report, bg.process as process, bg.approval as approval, bg.finished as bgFinish
                 from
                 (select count(id_) as month, count(zhuang_tai_ = '委托结束' or null) as accepted from t_mjwtsqb where create_time_ LIKE '${this.month}%') wt,
                 (select count(create_time_ like '${this.today}' or null) as today, count(create_time_ between '${week.start}' and '${week.end}' or null) as week, count(create_time_ between '${quarter.start}' and '${quarter.end}' or null) as quarter from t_mjwtsqb) wt2,
                 (select count(id_) as total, count(jian_ce_zhuang_ta = '已完成' or null) as finished from t_jchzb where create_time_ LIKE '${this.month}%') jc,
                 (select count(id_) as task, count(zhuang_tai_ = '任务已完成' or null) as finished from t_rwfpb where create_time_ LIKE '${this.month}%') rw,
-                (select count(id_) as report, count(zhuang_tai_ = '报告待审核' or null) as process, count(zhuang_tai_ = '报告待审批' or null) as approval from t_mjjcbg where create_time_ LIKE '${this.month}%') bg`
+                (select count(id_) as report, count(zhuang_tai_ = '报告待审核' or null) as process, count(zhuang_tai_ = '报告待审批' or null) as approval, count(zhuang_tai_ = '完成' or zhuang_tai_ = '待发放' or null) as finished from t_mjjcbg where create_time_ LIKE '${this.month}%') bg`
                 // console.log(sql)
                 curdPost('sql', sql).then(res => {
                     const data = res.variables.data
-                    console.log(data)
+                    // console.log(data)
                     
                     if ( data && data.length ) {
-                        const { month, accepted, approval, jcFinish, jcTotal, process, report, rwFinish, task, today, week, quarter } = data[0]
+                        const { month, accepted, approval, jcFinish, jcTotal, process, report, rwFinish, task, today, week, quarter, bgFinish } = data[0]
                         this.middleCardData.taskData = [month, jcTotal, task, report]
                         let result = [
                             {
@@ -216,7 +217,7 @@
                                     },
                                     {
                                         label: '已完成',
-                                        value: report - approval - process
+                                        value: bgFinish
                                     },
                                     {
                                         label: '待审批',
@@ -242,7 +243,12 @@
                 // const sql1 = `select tm.jian_ce_xiang_mu_, tm.jian_ce_lei_bie_, IFNULL(rw.qi_wang_wan_cheng, '') as qi_wang_wan_cheng, rw.zhuang_tai_, ipe.NAME_ from t_rwfpb rw, ibps_party_employee ipe, t_mjjcnlfw tm where rw.jian_ce_yuan_ = ipe.ID_ and rw.jian_ce_xiang_mu_ = tm.id_ and rw.create_time_ like '${this.month}%'`
                 const sql1 = `select tm.jian_ce_xiang_mu_, tm.jian_ce_lei_bie_, IFNULL(rwz.wan_cheng_shi_jia, '') as qi_wang_wan_cheng, rw.zhuang_tai_, ipe.NAME_ from t_rwfpb rw, ibps_party_employee ipe, t_mjjcnlfw tm, t_mjrwfpzb rwz where rwz.jian_ce_yuan_ = ipe.ID_ and rwz.ren_wu_bian_hao_ = tm.id_ and rw.id_ = rwz.wai_jian_ and rw.create_time_ like '${this.month}%'`
                 // 获取检测受理类型数据
-                const sql2 = `select count(tm.jian_ce_lei_bie_ = '理化' or null) as lh, count(tm.jian_ce_lei_bie_ = '微生物' or null) as wsw, count(tm.jian_ce_lei_bie_ = '细胞活率' or null) as xbhl, count(tm.jian_ce_lei_bie_ = '残留检测' or null) as cljc, count(tm.jian_ce_lei_bie_ = '细胞鉴别' or null) as xbjb from t_jchzb tj, t_mjjcnlfw tm where tj.jian_ce_xiang_mu_ = tm.id_ and tj.create_time_ like '${this.month}%'`
+                let sqlStr = ''
+                acceptList.forEach((item, index) => {
+                    sqlStr += `count(tm.jian_ce_lei_bie_ = '${item}' or null) as r${index}${index === acceptList.length - 1 ? '' : ', '}`
+                })
+                const sql2 = `select ${sqlStr} from t_jchzb tj, t_mjjcnlfw tm where tj.jian_ce_xiang_mu_ = tm.id_ and tj.create_time_ like '${this.month}%'`
+                // console.log(sqlStr, sql2)
 
                 Promise.all([
                     curdPost('sql', sql1),
@@ -257,7 +263,16 @@
                         this.middleCardData.tableData.data.push(Object.values(item))
                     })
 
-                    this.middleCardData.acceptData = Object.values(data2[0])
+                    let result = []
+                    let tempRes = Object.values(data2[0])
+                    acceptList.forEach((item, index) => {
+                        let o = {
+                            name: item,
+                            value: tempRes[index]
+                        }
+                        result.push(o)
+                    })
+                    this.middleCardData.acceptData = result
                     this.middleCardData.flag = true
                 }).catch(error => {
                     console.log(error)
@@ -383,7 +398,7 @@
         z-index: 999;
         :global {
             #dv-full-screen-container {
-                background-image: url('../datav/img/bg.png');
+                background-image: url('./img/bg.png');
                 background-size: 100% 100%;
                 box-shadow: 0 0 3px blue;
                 display: flex;

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

@@ -86,8 +86,8 @@
             width: 24%;
             height: 100%;
             background-color: rgba(6, 30, 93, 0.5);
-            &:last-child {
-                width: 49%;
+            &:first-child, &:last-child {
+                width: 36%;
             }
             .no_data {
                 font-size: 20px;

src/views/system/jbdHome/board/data.js

@@ -1,6 +1,6 @@
 import echarts from "echarts"
 
-export const acceptOption = {
+export const acceptOption1 = {
     // 图表标题
     title: {
         show: true,
@@ -110,6 +110,130 @@ export const acceptOption = {
     }
 }
 
+export const acceptList = [
+    '细胞鉴别',
+    '无菌检查',
+    '支原体检查',
+    '成瘤性检查',
+    '致瘤性检查',
+    '细胞活性检测',
+    '生物学有效性',
+    '免疫学反应检测',
+    '细菌内毒素检测',
+    '残留物检测',
+    '制剂检查',
+    '免疫细胞检测',
+    '细胞内、外源病毒因子检查',
+    '其他检测'
+]
+
+const colors = [
+    '#d20962',
+    '#f47721',
+    '#7ac143',
+    '#00a78e',
+    '#00bce4',
+    '#7d3f98',
+    '#037ef3',
+    '#f85a40',
+    '#00c16e',
+    '#ffd900',
+    '#0cb9c1',
+    '#7552cc'
+]
+
+let colorList = []
+
+const getOptions = () => {
+    let res = []
+    colorList = []
+    acceptList.forEach(item => {
+        let random =  parseInt(Math.random() * 12)
+        let obj = {
+            name: item,
+            textStyle: {
+                color: colors[random]
+            }
+        }
+        res.push(obj)
+        colorList.push(colors[random])
+    })
+    return res
+}
+
+export const acceptOption = {
+    title: {
+        show: true,
+        text: '检测类型',
+        textStyle: {
+            color: '#fff',
+            fontSize: 20,
+            fontWeight: '600'
+        },
+        textAlign: 'center',
+        left: '50%',
+        top: '20px'
+    },
+    legend: {
+        type: 'scroll',
+        orient: 'vertical',
+        show: true,
+        // left: 'center',
+        // bottom: 10,
+        right: 10,
+        top: 50,
+        formatter: ['{a|{name}}'].join('\n'),
+        textStyle: {
+            rich: {
+                a: {
+                    width: 80,
+                    overflow: 'break',
+                    lineHeight: 12
+                }
+            }
+        },
+        z: 3,
+        itemWidth: 25,
+        itemHeight: 14,
+        itemGap: 10,
+        data: getOptions()
+    },
+    series: [
+        {
+            name: '任务完成情况',
+            type: 'pie',
+            radius: '55%',
+            center: ['40%', '50%'],
+            data: [],
+            itemStyle: {
+                emphasis: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                },
+                normal: {
+                    label: {
+                        show: true,
+                        position: 'outer',
+                        // formatter: `占比：{d}%\n\n\r{b}:{c}`,
+                        formatter: `{b}:{c}`,
+                        fontSize: 12
+                    },
+                    labelLine: {
+                        show: true
+                    }
+                }
+            }
+        }
+    ],
+    color: colorList,
+    tooltip: {
+        show: true,
+        trigger: 'item',
+        formatter: '任务情况<br/>{b}：{c}<br/>占比：{d}%'
+    }
+}
+
 export const taskOption = {
     // 图表标题
     title: {