室间质控看板调整

src/views/InterLaboratory/interStatistics/chartA.vue

@@ -26,10 +26,7 @@ export default {
             showChart: true,
             option: {
                 grid: {
-                    x: 50,
-                    y: 50,
-                    x2: 50,
-                    y2: 50
+                    bottom: 70 // 距离容器下边界
                 },
                 legend: {
                     orient: 'vertical',
@@ -52,7 +49,7 @@ export default {
                 },
                 xAxis: { type: 'category' },
                 yAxis: {},
-                series: [{ barMaxWidth: 30, type: 'bar' }, { barMaxWidth: 30, type: 'bar' }, { barMaxWidth: 30, type: 'bar' }, { barMaxWidth: 30, type: 'bar' }]
+                series: [{ barMaxWidth: 30, type: 'bar' }, { barMaxWidth: 30, type: 'bar' }, { barMaxWidth: 30, type: 'bar' }]
             }
 
         }

src/views/InterLaboratory/interStatistics/chartB.vue

@@ -4,7 +4,7 @@
             {{ info.title || "" }}
         </div>
         <div style="width: 100%; height: 95%; display: inline-block; overflow: hidden">
-            <div :id="info.id" style="width: 100%; height: 100%; overflow: hidden;padding-right: 10px;" />
+            <div :id="info.id" style="width: 100%; height: 100%; overflow: hidden" />
         </div>
 
     </div>
@@ -24,6 +24,9 @@ export default {
     data () {
         return {
             showChart: true,
+            grid: {
+                bottom: 70 // 距离容器下边界
+            },
             option: {
                 tooltip: {
                     trigger: 'axis',
@@ -45,7 +48,7 @@ export default {
 
                                 var tdHeads = '<td  style="padding:0 10px">年份</td>'
                                 series.forEach(function (item) {
-                                    tdHeads += '<td style="padding: 0 10px">' + item.name + '</td>'
+                                    tdHeads += '<td style="padding: 0 10px">' + (item.name.includes('率') ? (item.name + '(%)') : item.name) + '</td>'
                                 })
                                 var table = '<table border="1" style="margin-left:20px;border-collapse:collapse;font-size:14px;text-align:center;color:#666"><tbody><tr>' + tdHeads + '</tr>'
                                 var tdBodys = ''

src/views/InterLaboratory/interStatistics/chartC.vue

@@ -25,6 +25,10 @@ export default {
         return {
             showChart: true,
             option: {
+                grid: {
+                    left: 50, // 距离容器左边界
+                    bottom: 70 // 距离容器下边界
+                },
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -43,7 +47,7 @@ export default {
                                 var series = opt.series
                                 var tdHeads = '<td  style="padding:0 10px">年份</td>'
                                 series.forEach(function (item) {
-                                    tdHeads += '<td style="padding: 0 10px">' + item.name + '</td>'
+                                    tdHeads += '<td style="padding: 0 10px">' + (item.name.includes('率') ? (item.name + '(%)') : item.name) + '</td>'
                                 })
                                 var table = '<table border="1" style="margin-left:20px;border-collapse:collapse;font-size:14px;text-align:center;color:#666"><tbody><tr>' + tdHeads + '</tr>'
                                 var tdBodys = ''

src/views/InterLaboratory/interStatistics/chartD.vue

@@ -25,6 +25,10 @@ export default {
         return {
             showChart: true,
             option: {
+                grid: {
+                    right: 50, // 距离容器右边界
+                    bottom: 70 // 距离容器下边界
+                },
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -43,7 +47,7 @@ export default {
                                 var series = opt.series
                                 var tdHeads = '<td  style="padding:0 10px">年份</td>'
                                 series.forEach(function (item) {
-                                    tdHeads += '<td style="padding: 0 10px">' + item.name + '</td>'
+                                    tdHeads += '<td style="padding: 0 10px">' + (item.name.includes('率') ? (item.name + '(%)') : item.name) + '</td>'
                                 })
                                 var table = '<table border="1" style="margin-left:20px;border-collapse:collapse;font-size:14px;text-align:center;color:#666"><tbody><tr>' + tdHeads + '</tr>'
                                 var tdBodys = ''

src/views/InterLaboratory/interStatistics/chartE.vue

@@ -25,6 +25,10 @@ export default {
         return {
             showChart: true,
             option: {
+                grid: {
+                    right: 50, // 距离容器右边界
+                    bottom: 70 // 距离容器下边界
+                },
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -43,7 +47,7 @@ export default {
                                 var series = opt.series
                                 var tdHeads = '<td  style="padding:0 10px">年份</td>'
                                 series.forEach(function (item) {
-                                    tdHeads += '<td style="padding: 0 10px">' + item.name + '</td>'
+                                    tdHeads += '<td style="padding: 0 10px">' + (item.name.includes('率') ? (item.name + '(%)') : item.name) + '</td>'
                                 })
                                 var table = '<table border="1" style="margin-left:20px;border-collapse:collapse;font-size:14px;text-align:center;color:#666"><tbody><tr>' + tdHeads + '</tr>'
                                 var tdBodys = ''

src/views/InterLaboratory/interStatistics/index.vue

@@ -20,7 +20,7 @@
                                 margin-top: 10px;
                             "
                         >
-                            室间质控看板
+                            质控看板
                         </div>
                         <dv-decoration-5
                             style="width: 30%; height: 50%; margin: 0 auto"
@@ -61,40 +61,43 @@
             >
                 <div style="height: 3%" />
                 <div class="botView">
-                    <div class="viewTop">
-                        <div class="topleft">
+
+                    <div class="viewBot">
+                        <div class="botleft">
                             <chartA :info="chartAData" />
+
                         </div>
                         <dv-decoration-2
                             :reverse="true"
                             style="width: 2%; height: 100%"
                         />
-                        <div class="topright">
+                        <div class="botmidd">
                             <chartB :info="chartBData" />
+
                         </div>
+                        <dv-decoration-2
+                            :reverse="true"
+                            style="width: 2%; height: 100%"
+                        />
+                        <div class="botright">
+                            <chartE :info="chartEData" />
+                        </div>
+
                     </div>
                     <dv-decoration-10
                         style="height: 2%; width: 100%; margin: 0 auto"
                     />
-                    <div class="viewBot">
-                        <div class="botleft">
+                    <div class="viewTop">
+                        <div class="topleft">
                             <chartC :info="chartCData" />
                         </div>
                         <dv-decoration-2
                             :reverse="true"
                             style="width: 2%; height: 100%"
                         />
-                        <div class="botmidd">
+                        <div class="topright">
                             <chartD :info="chartDData" />
                         </div>
-                        <dv-decoration-2
-                            :reverse="true"
-                            style="width: 2%; height: 100%"
-                        />
-                        <div class="botright">
-                            <chartE :info="chartEData" />
-                        </div>
-
                     </div>
                 </div></dv-border-box-1>
         </dv-full-screen-container>
@@ -274,32 +277,32 @@ export default {
             this.result = []
 
             let data1 = []
-            let data2 = []
-            const sql1 = `select LEFT(b.nian_du_, 4) as niandu, LEFT(a.bi_dui_lei_xing_, 2) as leixing ,COUNT(*) AS count from t_sjzphdjhylxqb a left join t_sjzphdjhylb b on a.parent_id_ = b.id_ WHERE find_in_set(LEFT(b.nian_du_, 4), '${this.yearStr}') GROUP BY LEFT(b.nian_du_, 4), LEFT(a.bi_dui_lei_xing_, 2)`
-            const sql2 = `select LEFT(bian_zhi_shi_jian, 4) as niandu,'实验室' as leixing, COALESCE(COUNT(*), 0) AS count from t_sysbdjlb bian_zhi_shi_jian where shi_fou_guo_shen_ = '已完成' and find_in_set(LEFT(bian_zhi_shi_jian, 4), '${this.yearStr}')`
+            const data2 = []
+            const sql1 = `select LEFT(b.nian_du_, 4) as niandu, LEFT(a.bi_dui_lei_xing_, 4) as leixing ,COUNT(*) AS count from t_sjzphdjhylxqb a left join t_sjzphdjhylb b on a.parent_id_ = b.id_ WHERE find_in_set(LEFT(b.nian_du_, 4), '${this.yearStr}') GROUP BY LEFT(b.nian_du_, 4), LEFT(a.bi_dui_lei_xing_, 2)`
+            // const sql2 = `select LEFT(bian_zhi_shi_jian, 4) as niandu,'实验室' as leixing, COALESCE(COUNT(*), 0) AS count from t_sysbdjlb bian_zhi_shi_jian where shi_fou_guo_shen_ = '已完成' and find_in_set(LEFT(bian_zhi_shi_jian, 4), '${this.yearStr}')`
 
             await this.$common.request('sql', sql1).then((res) => {
                 data1 = res.variables.data
             })
-            await this.$common.request('sql', sql2).then((res) => {
-                data2 = res.variables.data
-            })
+            // await this.$common.request('sql', sql2).then((res) => {
+            //     data2 = res.variables.data
+            // })
 
-            this.result.push(['product', '能力验证', '室间质评', '实验室', '其它'])
+            this.result.push(['product', '能力验证', '室间质评', '其它'])
             for (var item of this.yearArr) {
-                const m = data1.find((v) => { return v.niandu === item + '' && v.leixing === '能力' })
-                const n = data1.find((v) => { return v.niandu === item + '' && v.leixing === '室间' })
-                const f = data2.find((v) => { return v.niandu === item + '' && v.leixing === '实验室' })
-                const g = data1.find((v) => { return v.niandu === item + '' && v.leixing !== '能力' && v.leixing !== '室间' })
+                const m = data1.find((v) => { return v.niandu === item + '' && v.leixing === '能力验证' })
+                const n = data1.find((v) => { return v.niandu === item + '' && v.leixing === '室间质评' })
+                // const f = data2.find((v) => { return v.niandu === item + '' && v.leixing === '实验室' })
+                const g = data1.find((v) => { return v.niandu === item + '' && v.leixing !== '室间质评' && v.leixing !== '能力验证' })
 
                 const arr = []
                 arr[0] = item
                 arr[1] = m ? m.count : 0
                 arr[2] = n ? n.count : 0
-                arr[3] = f ? f.count : 0
-                arr[4] = g ? g.count : 0
+                // arr[3] = f ? f.count : 0
+                arr[3] = g ? g.count : 0
                 this.result.push(arr)
-                // console.log(this.result)
+                console.log(this.result)
             }
         },