检测看板调整

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

@@ -32,7 +32,7 @@
                 <!-- topBar -->
                 <top-bar v-if="topBarData.length" :info="topBarData" :color="colors"/>
                 <!-- middleCard -->
-                <middle-card v-if="middleCardData.flag" :info="middleCardData" />
+                <middle-card v-if="middleCardData.flag" :info="middleCardData" :list="tableData"/>
                 <!-- bottomCard -->
                 <bottom-card v-if="bottomCardData.flag" :info="bottomCardData" />
             </dv-border-box-1>
@@ -59,19 +59,19 @@
                 today: d.toJSON().slice(0, 10),
                 colors: [],
                 topBarData: [],
+                tableData: {
+                    header: [
+                        '检测项目',
+                        // '检测类型',
+                        '送检时间',
+                        '完成时间',
+                        '检测员'
+                    ],
+                    data: [],
+                    rowNum: 7,
+                    columnWidth: ['350','100','100','90']
+                },
                 middleCardData: {
-                    tableData: {
-                        header: [
-                            '检测项目',
-                            // '检测类型',
-                            '送检时间',
-                            '完成时间',
-                            '检测员'
-                        ],
-                        data: [],
-                        rowNum: 7,
-                        columnWidth: ['350','100','100','90']
-                    },
                     acceptData:[],
                     taskData: [],
                     flag: false
@@ -265,12 +265,12 @@
                     const data3 = res3.variables.data || []
                     // console.log(data1, data2)
 
-                    this.middleCardData.tableData.data = []
+                    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.names = item.names ? this.replaceSecondLetter(item.names) : ''
-                        this.middleCardData.tableData.data.push(Object.values(item))
+                        this.tableData.data.push(Object.values(item))
                     })
 
                     let result = []

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

@@ -36,6 +36,10 @@
             info: {
                 type: Object,
                 default: {}
+            },
+            list: {
+                type: Object,
+                default: {}
             }
         },
         components: {},
@@ -45,6 +49,12 @@
                     this.init()
                 },
                 deep: true
+            },
+            list: {
+                handler(value) {
+                    this.tableData = JSON.parse(JSON.stringify(value))
+                },
+                immediate: true
             }
         },
         data() {
@@ -71,7 +81,7 @@
                 monthOption.series[0].data = this.info.task
                 monthOption.series[1].data = this.info.complete
                 // taskOption.series[0].data = this.info.taskData
-                this.tableData = JSON.parse(JSON.stringify(this.info.tableData))
+                // this.tableData = JSON.parse(JSON.stringify(this.info.tableData))
 
                 //渲染
                 accept.setOption(acceptOption)

src/views/system/jbdHome/board/component/testing/topBar.vue

@@ -108,7 +108,7 @@
             }
             .title {
                 text-align: center;
-                font-size: 18px;
+                font-size: 20px;
                 font-weight: bold;
                 margin-bottom: 20px;
             }

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

@@ -168,24 +168,6 @@ export function* getRandomColor (shuffledColors) {
 
 let colorList = []
 
-const getOptions = () => {
-    let res = []
-    colorList = []
-    acceptList.forEach(item => {
-        let random =  parseInt(Math.random() * 12)
-        let color = colors[random]
-        let obj = {
-            name: item,
-            textStyle: {
-                color
-            }
-        }
-        res.push(obj)
-        colorList.push(color)
-    })
-    return res
-}
-
 export const acceptOption = {
     title: {
         show: true,
@@ -248,7 +230,7 @@ export const acceptOption = {
                         show: true,
                         position: 'outer',
                         // formatter: `占比：{d}%\n\n\r{b}:{c}`,
-                        formatter: `{b}:{c}`,
+                        formatter: `{b}:{d}%`,
                         fontSize: 14
                     },
                     labelLine: {