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 @@
- {{ Math.floor((scope.row.count_ok / scope.row.count) * 100) }}%
+ {{ Math.round((scope.row.count_ok / scope.row.count) * 100) }}%
0