From 5e056b56a7216a471d9d8e2e2f6c51a8000025c2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 26 Dec 2023 14:26:14 +0800
Subject: [PATCH] =?UTF-8?q?#105=E8=BD=A6=E9=97=B4=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E7=8E=87=E5=B0=8F=E6=95=B0=E4=BD=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_10dept.vue | 11 +++++++++--
 src/views/bigScreen/index_6dept.vue  |  2 +-
 src/views/bigScreen/index_7dept.vue  |  5 +++--
 src/views/bigScreen/index_photon.vue |  8 ++++----
 src/views/pm/utask_dept10.vue        |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/bigScreen/index_10dept.vue b/src/views/bigScreen/index_10dept.vue
index 7e4cc135..bedc054a 100644
--- a/src/views/bigScreen/index_10dept.vue
+++ b/src/views/bigScreen/index_10dept.vue
@@ -545,7 +545,13 @@ export default {
             that.$API.bi.dataset.exec.req('lineMonth', obj1).then((res1) => {
                 console.log('全年生产统计:',res1);
                 let list1 = res1.data2.ds0;
-                let seriesData1 = [];
+                let seriesData1 = [],xAxisData1=[];
+                for (let i = 0; i < 12; i++) {
+                    let day = i+1; 
+                    let text = day+'月';
+                    xAxisData1[i]=text;
+                    seriesData1[i] = 0;
+                }
                 if(list1.length>0){
                     list1.forEach(item1=>{
                         let index1 = item1.月-1;
@@ -583,11 +589,12 @@ export default {
                     let day = i+1; 
                     let text = day+'日';
                     xAxisData2[i]=text;
+                    seriesData2[i] = 0;
                 }
                 if(list2.length>0){
                     list2.forEach(item2=>{
                         let index2 = item2.日-1;
-                        seriesData2[index2] = item2.合格率;
+                        seriesData2[index2] =Math.round(item2.合格率) ;
                     }) 
                 }
                 console.log('xAxisData2',xAxisData2)
diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue
index 0a007ae7..1548bd18 100644
--- a/src/views/bigScreen/index_6dept.vue
+++ b/src/views/bigScreen/index_6dept.vue
@@ -163,7 +163,7 @@ export default {
                 },
                 yAxis: [
                     {
-                        name: "生产统计",
+                        name: "",
                         type: 'value',
                         nameTextStyle: {
                             color: '#ffffff'
diff --git a/src/views/bigScreen/index_7dept.vue b/src/views/bigScreen/index_7dept.vue
index 9cb1bf86..cfe7afc5 100644
--- a/src/views/bigScreen/index_7dept.vue
+++ b/src/views/bigScreen/index_7dept.vue
@@ -149,7 +149,7 @@ export default {
                 },
                 yAxis: [
                     {
-                        name: "生产统计",
+                        name: "",
                         type: 'value',
                         nameTextStyle: {
                             color: '#ffffff'
@@ -433,11 +433,12 @@ export default {
                     let day = i+1; 
                     let text = day+'日';
                     xAxisData2[i]=text;
+                    seriesData2[i]=0;
                 }
                 if(list2.length>0){
                     list2.forEach(item2=>{
                         let index2 = item2.日-1;
-                        seriesData2[index2] = item2.合格率;
+                        seriesData2[index2] =Math.round(item2.合格率);
                     }) 
                 }
                 console.log('xAxisData2',xAxisData2)
diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index 45851269..c814cbec 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -589,7 +589,7 @@ export default {
                         let date = item.年+'-'+item.月+'-'+item.日;
                         let index = this.weekDateList.indexOf(date);
                         countOkDept7[index] = item.合格数;
-                        countRateDept7[index] = item.合格率;
+                        countRateDept7[index] = Math.round(item.合格率);
                         countOk_dept7 = countOk_dept7+item.合格数;
                         that.dept7Data[0].value= that.dept7Data[0].value+item.炸纹;
                         that.dept7Data[1].value= that.dept7Data[1].value+item.条纹;
@@ -621,7 +621,7 @@ export default {
                         let date = item.年+'-'+item.月+'-'+item.日;
                         let index = this.weekDateList.indexOf(date);
                         countOkDept10[index] = item.合格数;
-                        countRateDept10[index] = item.合格率;
+                        countRateDept10[index] = Math.round(item.合格率);
                         countOk_dept10 = countOk_dept10+item.合格数;
                      });
 				}
@@ -692,7 +692,7 @@ export default {
                     yAxis: [
                         {
                             type: 'value',
-                            name: '完成度',
+                            name: '',
                             min: 0,
                             interval: 50,
                             nameTextStyle: {
@@ -1376,7 +1376,7 @@ export default {
                     },
                 },
                 yAxis: {
-                    name: '合格率(%)',
+                    name: '',
                     type: 'value',
                     nameTextStyle: {
                         color: '#ffffff'
diff --git a/src/views/pm/utask_dept10.vue b/src/views/pm/utask_dept10.vue
index a61a218c..008a04c7 100644
--- a/src/views/pm/utask_dept10.vue
+++ b/src/views/pm/utask_dept10.vue
@@ -70,7 +70,7 @@
                         <el-table-column label="合格数" prop="count_ok"> </el-table-column>
                         <el-table-column label="完成率" prop="count">
                             <template #default="scope">
-                                <span v-if="scope.row.count != 0&&scope.row.count_ok!= 0">{{ Math.floor((scope.row.count_ok / scope.row.count) * 100) }}%</span>
+                                <span v-if="scope.row.count != 0&&scope.row.count_ok!= 0">{{ Math.round((scope.row.count_ok / scope.row.count) * 100) }}%</span>
                                 <span v-else>0</span>
                             </template>
                         </el-table-column>