检测看板调整

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

@@ -128,6 +128,9 @@
                 this.$router.back(-1)
             },
             updateAll(e) {
+                if (e) {
+                    this.year = e.slice(0, 4)
+                }
                 this.colors = [...colors].sort(() => Math.random() - 0.5)
                 this.getTopBarData()
                 this.getMiddleData()
@@ -158,7 +161,7 @@
                     
                     if ( data && data.length ) {
                         const { month, accepted, approval, jcFinish, jcTotal, process, report, rwFinish, task, today, week, quarter, bgFinish } = data[0]
-                        this.middleCardData.taskData = [month, jcTotal, task, report]
+                        this.middleCardData.taskData = [month, task, jcTotal, report]
                         let result = [
                             {
                                 title: '委托',
@@ -187,7 +190,7 @@
                                 unit: '单'
                             },
                             {
-                                title: '任务分配',
+                                title: '样品分配',
                                 children: [
                                     {
                                         label: '总数',
@@ -276,8 +279,8 @@
 
                     this.tableData.data = []
                     data1.forEach(item => {
-                        item.startDate = item.startDate ? item.startDate.slice(0, 10) : ''
-                        item.endDate = item.endDate ? item.endDate.slice(0, 10) : ''
+                        item.startDate = item.startDate ? item.startDate.slice(5) : ''
+                        item.endDate = item.endDate ? item.endDate.slice(5) : ''
                         item.names = item.names ? this.replaceSecondLetter(item.names) : ''
                         this.tableData.data.push(Object.values(item))
                     })

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

@@ -244,7 +244,7 @@ export const taskOption = {
     },
     xAxis: {
         type: 'category',
-        data: ['委托', '任务分配', '检测', '报告'],
+        data: ['委托', '样品分配', '检测', '报告'],
         axisTick: {
             alignWithLabel: true
         },
@@ -740,8 +740,8 @@ export const yearOption = {
                     label: {
                         show: true,
                         position: 'outer',
-                        formatter: `占比：{d}%\n\n\r{b}:{c}`,
-                        // formatter: `{b}:{c}\n\n\r占比：{d}%`,
+                        // formatter: `占比：{d}%\t{b}:{c}`,
+                        formatter: `{b}:{c}\t占比：{d}%`,
                         fontSize: 14
                     },
                     labelLine: {