fix:大屏更改

This commit is contained in:
shijing 2024-11-21 13:28:28 +08:00
parent 0752000f24
commit 6a7975e6ce
1 changed files with 439 additions and 153 deletions

View File

@ -54,7 +54,7 @@
<div>任务产量</div> <div>任务产量</div>
</div> </div>
<div class="itemBody itemBody1"> <div class="itemBody itemBody1">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-around;">
<div class="block1NumberWrap"> <div class="block1NumberWrap">
<div class="block1Numberinner"> <div class="block1Numberinner">
<span class="block1Text">日产量</span> <span class="block1Text">日产量</span>
@ -68,7 +68,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-around;">
<div class="block1NumberWrap"> <div class="block1NumberWrap">
<div class="block1Numberinner"> <div class="block1Numberinner">
<span class="block1Text">周产量</span> <span class="block1Text">周产量</span>
@ -82,7 +82,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-around;">
<div class="block1NumberWrap"> <div class="block1NumberWrap">
<div class="block1Numberinner"> <div class="block1Numberinner">
<span class="block1Text">月产量</span> <span class="block1Text">月产量</span>
@ -105,8 +105,7 @@
<div>设备运转状态</div> <div>设备运转状态</div>
</div> </div>
<div class="itemBody"> <div class="itemBody">
<!-- <scEcharts v-if="eqChartShow" height="250px" width="335px" :option="option_eq"></scEcharts> --> <div id="eqPieChart" style="width: 310px;height: 220px;"></div>
<div id="eqPieChart" style="width: 240px;height: 220px;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -130,14 +129,12 @@
<dv-scroll-board <dv-scroll-board
:config="configDataProd" :config="configDataProd"
class="boxmain" class="boxmain"
style="width:98%;margin:auto;"
/> />
</el-carousel-item> </el-carousel-item>
<el-carousel-item> <el-carousel-item>
<dv-scroll-board <dv-scroll-board
:config="configData30" :config="configData30"
class="boxmain" class="boxmain"
style="width:98%;margin:auto"
/> />
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
@ -149,11 +146,11 @@
<div>质量分析</div> <div>质量分析</div>
</div> </div>
<div class="itemBody3"> <div class="itemBody3">
<scEcharts height="155px" width="88px" :option="options"></scEcharts> <scEcharts height="165px" width="128px" :option="options"></scEcharts>
<scEcharts height="155px" width="88px" :option="option1"></scEcharts> <scEcharts height="165px" width="128px" :option="option1"></scEcharts>
<scEcharts height="155px" width="88px" :option="option2"></scEcharts> <scEcharts height="165px" width="128px" :option="option2"></scEcharts>
<scEcharts height="155px" width="88px" :option="option3"></scEcharts> <scEcharts height="165px" width="128px" :option="option3"></scEcharts>
<scEcharts height="155px" width="88px" :option="option4"></scEcharts> <scEcharts height="165px" width="128px" :option="option4"></scEcharts>
</div> </div>
</div> </div>
</div> </div>
@ -192,20 +189,20 @@
</article> </article>
</div> </div>
</div> </div>
<div class="viewsItem"> <!-- <div class="viewsItem">
<div class="viewsItem_wrap"> <div class="viewsItem_wrap">
<img style="float: left;" class="viewsItem_img" src="img/gz_logo.png"> <img style="float: left;" class="viewsItem_img" src="img/gz_logo.png">
<article> <article>
紧绷安全弦筑牢防护网光芯科技开展五一节前安全生产大检查紧绷安全弦筑牢防护网光芯科技开展五一节前安全生产大检查 紧绷安全弦筑牢防护网光芯科技开展五一节前安全生产大检查紧绷安全弦筑牢防护网光芯科技开展五一节前安全生产大检查
</article> </article>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
<div class="bottom_block"> <div class="bottom_block">
<div id="scroll" class="bottom_block2"> <div id="scroll" class="bottom_block2">
<div class="flexItem3"> <!-- <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="itemTitle itemTitle_b">
<div>切片</div> <div>切片</div>
</div> </div>
@ -215,24 +212,22 @@
class="inmBoxmain" class="inmBoxmain"
/> />
</div> </div>
</div>
<!-- <div class="flexItem3">
<div class="itemTitle itemTitle_b">
<div>白片抛</div>
</div>
<div class="itemBody">
<dv-scroll-board
:config="configData1"
class="inmBoxmain"
style="width:98%;margin:auto"
/>
</div>
</div> --> </div> -->
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">切片</div>
<div>扫边A</div> <div class="flexItem3Body">
<dv-scroll-board
:config="configData0"
class="inmBoxmain"
/>
<!-- <scEcharts height="165px" width="128px" :option="options"></scEcharts> -->
<scEcharts width="370px" height="150px" :option="options0"></scEcharts>
</div> </div>
<div class="itemBody"> </div>
<div class="flexItem3">
<div class="flexItem3_title">扫边A</div>
<div class="flexItem3Body">
<dv-scroll-board <dv-scroll-board
:config="configData2" :config="configData2"
class="inmBoxmain" class="inmBoxmain"
@ -240,10 +235,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">黑化</div>
<div>黑化</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData3" :config="configData3"
class="inmBoxmain" class="inmBoxmain"
@ -251,10 +244,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">退火</div>
<div>退火</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData4" :config="configData4"
class="inmBoxmain" class="inmBoxmain"
@ -262,10 +253,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">减薄A</div>
<div>减薄A</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData5" :config="configData5"
class="inmBoxmain" class="inmBoxmain"
@ -273,10 +262,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">减薄B</div>
<div>减薄B</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData6" :config="configData6"
class="inmBoxmain" class="inmBoxmain"
@ -296,10 +283,8 @@
</div> </div>
</div> --> </div> -->
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">精雕</div>
<div>精雕</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData8" :config="configData8"
class="inmBoxmain" class="inmBoxmain"
@ -307,10 +292,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">一次抛</div>
<div>一次抛</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData9" :config="configData9"
class="inmBoxmain" class="inmBoxmain"
@ -318,10 +301,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">扫边B</div>
<div>扫边B</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData10" :config="configData10"
class="inmBoxmain" class="inmBoxmain"
@ -329,10 +310,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">成品抛</div>
<div>成品抛</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData11" :config="configData11"
class="inmBoxmain" class="inmBoxmain"
@ -340,10 +319,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">倒角</div>
<div>倒角</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData12" :config="configData12"
class="inmBoxmain" class="inmBoxmain"
@ -351,10 +328,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">一次超洗</div>
<div>一次超洗</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData13" :config="configData13"
class="inmBoxmain" class="inmBoxmain"
@ -362,10 +337,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">二次超洗</div>
<div>二次超洗</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData14" :config="configData14"
class="inmBoxmain" class="inmBoxmain"
@ -373,10 +346,8 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">三次超洗</div>
<div>三次超洗</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData15" :config="configData15"
class="inmBoxmain" class="inmBoxmain"
@ -384,14 +355,13 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="itemTitle itemTitle_b"> <div class="flexItem3_title">切片</div>
<div>切片</div> <div class="flexItem3Body">
</div>
<div class="itemBody">
<dv-scroll-board <dv-scroll-board
:config="configData0" :config="configData0"
class="inmBoxmain" class="inmBoxmain"
/> />
</div> </div>
</div> </div>
</div> </div>
@ -417,13 +387,145 @@ import "animate.css";
const configData={ const configData={
header : ['物料批次','未加工','进行中','已完成'], header : ['物料批次','未加工','进行中','已完成'],
headerBGC : '#0a3f44', headerBGC : '#0a3f44',
rowNum : 8, rowNum : 3,
headerHeight : 35, headerHeight : 35,
align : 'center', align : 'center',
waitTime : 150000, waitTime : 150000,
columnWidth: [110,70,70,70], columnWidth: [110,70,70,70],
data : [], data : [],
} }
const baseOption={
color: ['rgb(255,160,0)','rgb(64,158,255)','rgb(54,256,158)'],
tooltip: {
trigger: 'item',
},
grid:{
top: '10%',
bottom: '10%',
},
xAxis:{
type: 'category',
axisLine: {
lineStyle: {
color: '#fff',
}
},
axisLabel: {
interval: 0,
rotate: 40,
fontSize: 10,
color: '#fff',
},
data:[1,2,3,4,5,6,7]
},
yAxis:[
{
type: 'value',
name: '数量',
axisLine: {
lineStyle: {
color: '#fff',
}
},
axisLabel: {
fontSize: 10,
color: '#fff',
},
},
{
type: "value",
name: "合格率",
position: "right",
alignTicks: true,
offset: 0,
axisLine: {
show: true,
lineStyle: {
fontSize: 8,
color: "rgb(54,256,158)",
},
},
axisLabel: {
formatter: "{value}",
},
}
],
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '0.5%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [
{
name:'生产数',
type: 'bar',
barWidth: 10,
yAxisIndex: 0,
itemStyle: {
borderRadius: [ 5, 5, 0,0]
},
data: [0,0,0,0,0,0,0]
},
{
name: '合格数',
type: 'bar',
barWidth: 10,
yAxisIndex: 0,
itemStyle: {
borderRadius: [ 5, 5, 0,0]
},
data: [0,0,0,0,0,0,0]
},
{
name: '合格率',
type: 'line',
yAxisIndex: 1,
data: [0,0,0,0,0,0,0]
}
]
}
const baseOption2= {
title: {
text: '总计',
left: 'center',
textStyle:{
fontSize: 16,
color: '#fff',
}
},
tooltip: {
trigger: 'item',
},
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{
type: 'pie',
radius: ['40%', '70%'],
center: ['50%', '50%'],
label: false,
itemStyle: {
borderRadius: 5
},
data: [
{value: 860, name: '合格'},
{value: 10, name: '不合格'},
]
}]
}
export default { export default {
components: { components: {
scEcharts scEcharts
@ -484,21 +586,29 @@ export default {
options: { options: {
title: { title: {
text: '总计', text: '总计',
left: 'center',
textStyle:{ textStyle:{
fontSize: 16,
color: '#fff', color: '#fff',
} }
},
grid: {
top: '5%'
}, },
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
}, },
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{ series: [{
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['40%', '70%'],
center: ['50%', '60%'], center: ['50%', '50%'],
label: false, label: false,
itemStyle: { itemStyle: {
borderRadius: 5 borderRadius: 5
@ -512,20 +622,29 @@ export default {
option1: { option1: {
title: { title: {
text: '尺寸早班', text: '尺寸早班',
left: 'center',
textStyle:{ textStyle:{
fontSize: 16,
color: '#fff', color: '#fff',
} }
}, },
grid: {
top: '5%'
},
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
}, },
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{ series: [{
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['40%', '70%'],
center: ['50%', '60%'], center: ['50%', '50%'],
label: false, label: false,
itemStyle: { itemStyle: {
borderRadius: 5 borderRadius: 5
@ -539,20 +658,29 @@ export default {
option2: { option2: {
title: { title: {
text: '尺寸晚班', text: '尺寸晚班',
left: 'center',
textStyle:{ textStyle:{
fontSize: 16,
color: '#fff', color: '#fff',
} }
}, },
grid: {
top: '5%'
},
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
}, },
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{ series: [{
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['40%', '70%'],
center: ['50%', '60%'], center: ['50%', '50%'],
label: false, label: false,
itemStyle: { itemStyle: {
borderRadius: 5 borderRadius: 5
@ -566,20 +694,29 @@ export default {
option3: { option3: {
title: { title: {
text: '外观早班', text: '外观早班',
left: 'center',
textStyle:{ textStyle:{
fontSize: 16,
color: '#fff', color: '#fff',
} }
}, },
grid: {
top: '5%'
},
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
}, },
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{ series: [{
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['40%', '70%'],
center: ['50%', '60%'], center: ['50%', '50%'],
label: false, label: false,
itemStyle: { itemStyle: {
borderRadius: 5 borderRadius: 5
@ -593,20 +730,29 @@ export default {
option4: { option4: {
title: { title: {
text: '外观晚班', text: '外观晚班',
left: 'center',
textStyle:{ textStyle:{
fontSize: 16,
color: '#fff', color: '#fff',
} }
}, },
grid: {
top: '5%'
},
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
}, },
legend: {
itemWidth: 12,
itemHeight: 12,
left: 'center',
bottom: '1%',
textStyle: {
color: '#fff',
fontSize: 10,
},
},
series: [{ series: [{
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['40%', '70%'],
center: ['50%', '60%'], center: ['50%', '50%'],
label: false, label: false,
itemStyle: { itemStyle: {
borderRadius: 5 borderRadius: 5
@ -682,6 +828,7 @@ export default {
data:[], data:[],
rowNum : 3, rowNum : 3,
waitTime:3000, waitTime:3000,
columnWidth: [260,260,100],
}, },
configData30:{ configData30:{
header:['物料名称','物料批次','物料数量'], header:['物料名称','物料批次','物料数量'],
@ -691,6 +838,7 @@ export default {
data:[], data:[],
rowNum : 3, rowNum : 3,
waitTime:3000, waitTime:3000,
columnWidth: [260,260,100],
}, },
configData0:{}, configData0:{},
configData1:{}, configData1:{},
@ -710,10 +858,28 @@ export default {
configData15:{}, configData15:{},
scrollNum:0, scrollNum:0,
scrollInterval:null, scrollInterval:null,
dayArr:[],
options0:{},
options1:{},
options2:{},
options3:{},
options4:{},
options5:{},
options6:{},
options7:{},
options8:{},
options9:{},
options10:{},
options11:{},
options12:{},
options13:{},
options14:{},
options15:{},
}; };
}, },
mounted() { mounted() {
let that = this; let that = this;
that.options0 = that.deepCopy(baseOption);
that.initFactory(); that.initFactory();
that.bigScreenName = that.$TOOL.data.get("BASE_INFO").base.bigScreen_name; that.bigScreenName = that.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
that.showTime(); that.showTime();
@ -727,12 +893,21 @@ export default {
that.currentYear = year; that.currentYear = year;
that.currentMonth = month; that.currentMonth = month;
that.currentDay = day; that.currentDay = day;
let dayArr = [];
for(let i=6;i>0;i--){
let date = new Date(nowDate.getTime()-i*24*60*60*1000);
let day = date.getDate();
dayArr.push(day);
}
dayArr.push(day);
that.dayArr = dayArr;
that.getEquipments(); that.getEquipments();
that.getMaterials(); that.getMaterials();
that.getMgroup(); that.getMgroup();
that.getTaskNumber(); that.getTaskNumber();
that.addListener(); that.addListener();
that.setIntervalFun(); that.setIntervalFun();
that.getQulity();
that.myChart = echarts.init(document.getElementById('eqPieChart')); that.myChart = echarts.init(document.getElementById('eqPieChart'));
that.myChart.setOption(that.option_eq); that.myChart.setOption(that.option_eq);
let index2 = 0; let index2 = 0;
@ -759,6 +934,55 @@ export default {
}, 3000); }, 3000);
}, },
methods: { methods: {
getQulity(){
let that = this;
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
let current_date = that.currentYear+'-'+month+'-'+day;
let obj = {
query:{
"fw_type":"prod",
"end_date":current_date,
"start_date":current_date,
"group_by_dept": ", dept.id",
"group_by_shift": ", shift.id",
"select_col_dept": ", dept.name as 部门",
"select_col_shift": ", shift.name as 班次"
},
};
that.$API.bi.dataset.exec.req('ftestDay2', obj).then((res) => {
if(res.data2.ds0){
let lists = res.data2.ds0;
//
if(lists.length>0){
let count_ok = 0,count_notok=0;
lists.forEach((item) => {
count_ok += item.合格数;
count_notok += item.不合格数;
let index = 1;
if(item.班次=='早班'&&item.部门=='尺寸检测'){
index = 1;
}else if(item.班次=='晚班'&&item.部门=='尺寸检测'){
index = 2;
}else if(item.班次=='早班'&&item.部门=='外观检测'){
index = 3;
}else if(item.班次=='晚班'&&item.部门=='外观检测'){
index = 4;
}
let key = 'option'+index;
that[key] = that.deepCopy(baseOption2);
that[key].title.text = item.班次+' '+item.部门;
that[key].series.data[0].value = item.合格数;
that[key].series.data[1].value = item.不合格数;
})
that.options = that.deepCopy(baseOption2);
that.options.series.data[0].value = count_ok;
that.options.series.data[1].value = count_notok;
}
}
});
},
setIntervalFun(){ setIntervalFun(){
let that = this; let that = this;
that.scrollInterval = setInterval(() => { that.scrollInterval = setInterval(() => {
@ -767,10 +991,10 @@ export default {
}else{ }else{
that.scrollNum++; that.scrollNum++;
} }
let nums = that.scrollNum * 320; let nums = that.scrollNum * 384;
let lefts = 0-nums; let lefts = 0-nums;
document.getElementById("scroll").style.left = lefts +'px'; document.getElementById("scroll").style.left = lefts +'px';
},15000) },150000)
}, },
showTime() { showTime() {
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss"); this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
@ -1031,6 +1255,7 @@ export default {
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
that.mgroupsData = res; that.mgroupsData = res;
that.getProcessDatas(data[i].name,i); that.getProcessDatas(data[i].name,i);
that.getProcessCount(data[i].name,i);
} }
}) })
}, },
@ -1054,11 +1279,40 @@ export default {
arr[1] = item.待加工产物数; arr[1] = item.待加工产物数;
arr[2] = item.加工中产物领用数; arr[2] = item.加工中产物领用数;
arr[3] = item.今日合格数; arr[3] = item.今日合格数;
// arr[4] = Math.round((item./item.)*100)+'%';
that[keys].data.push(arr); that[keys].data.push(arr);
}) })
} }
}
});
},
getProcessCount(name,index){
let that = this;
let nowDate = new Date();
let end_date = that.$TOOL.dateFormat2(nowDate);
let start_date = that.$TOOL.dateFormat2(new Date(nowDate.getTime()-6*24*60*60*1000));
console.log(end_date);
console.log(start_date);
let obj = {query:{end_date:end_date,start_date:start_date,mgroup_name:name}};
that.$API.bi.dataset.exec.req('lineDay_m2', obj).then((res) => {
if(res.data2.ds0){
let lists = res.data2.ds0;
let optionKey = 'options'+index;
that[optionKey] = that.deepCopy(baseOption);
let data0=[],data1=[],data2=[];
if(lists.length>0){
lists.forEach((item) => {
let index = that.dayArr.indexOf(item.);
data0[index] = item.生产数;
data1[index] = item.合格数;
data2[index] = item.合格率;
})
that[optionKey].series[0].data = data0;
that[optionKey].series[1].data = data1;
that[optionKey].series[2].data = data2;
}
} }
}); });
}, },
@ -1123,7 +1377,7 @@ export default {
z-index: -1;position: absolute;top:0;left:0;width:1920px;height:70px; z-index: -1;position: absolute;top:0;left:0;width:1920px;height:70px;
} }
.header_line{ .header_line{
top:75px; top:65px;
height: 1px; height: 1px;
position: absolute; position: absolute;
background: rgb(54,217,187); background: rgb(54,217,187);
@ -1143,30 +1397,31 @@ export default {
.left_block2, .left_block2,
.right_block{ .right_block{
top:74px; top:74px;
width:240px; width:320px;
z-index: 10; z-index: 10;
display: flex; display: flex;
position:absolute; position:absolute;
overflow:hidden; overflow:hidden;
flex-direction: column; flex-direction: column;
padding: 0 10px ; padding: 0 5px;
height: 320px; height: 320px;
box-sizing: border-box;
background: rgba(9, 31, 43, 0.5); background: rgba(9, 31, 43, 0.5);
} }
.left_block3{ .left_block3{
top:340px; top:340px;
left: 0; left: 0;
width:480px; width:640px;
display: flex; display: flex;
position:absolute; position:absolute;
overflow:hidden; overflow:hidden;
flex-direction: column; flex-direction: column;
padding: 0 4px; padding: 0 5px;
height: 400px; height: 400px;
background: rgba(9, 31, 43, 0.5); background: rgba(9, 31, 43, 0.5);
} }
.left_block3 .flexItem{ .left_block3 .flexItem{
width:480px; width:630px;
} }
.left_block { .left_block {
left: 0; left: 0;
@ -1174,23 +1429,27 @@ export default {
} }
.right_block { .right_block {
right: 0; right: 0;
width:480px; width:640px;
height: 670px; height: 670px;
} }
.left_block2{ .left_block2{
left: 240px; left: 320px;
height: 270px; height: 270px;
padding: 0 5px;
}
.left_block2 .flexItem{
width:310px;
} }
.flexItem{ .flexItem{
width: 240px; width: 310px;
} }
.videoFlexItem{ .videoFlexItem{
width: 460px; width: 630px;
height: 315px; height: 400px;
} }
.newsFlexItem{ .newsFlexItem{
width: 460px; width: 620px;
height: 355px; height: 270px;
} }
/* //短标题 */ /* //短标题 */
.itemTitle{ .itemTitle{
@ -1219,13 +1478,13 @@ export default {
.itemTitle_b{ .itemTitle_b{
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
width: 310px; width: 370px;
font-size: 14px; font-size: 14px;
padding-left: 2.5em; padding-left: 2.5em;
} }
.block1NumberWrap{ .block1NumberWrap{
width:48%; width:135px;
border: 1px solid rgba(54, 217, 187, 0.3); border: 1px solid rgba(54, 217, 187, 0.3);
padding: 3px; padding: 3px;
text-align: center; text-align: center;
@ -1255,10 +1514,7 @@ export default {
.itemBody { .itemBody {
width: 100%; width: 100%;
border-radius: 20px; border-radius: 20px;
margin-top: 5px; /* margin-top: 5px; */
}
.flexItem3>.itemBody{
margin-top: 0;
} }
.itemBody1{ .itemBody1{
display: flex; display: flex;
@ -1274,6 +1530,8 @@ export default {
} }
.boxmain{ .boxmain{
height: 140px; height: 140px;
width:100%;
margin:auto;
} }
/* 下面的工序表模块 */ /* 下面的工序表模块 */
.bottom_block{ .bottom_block{
@ -1295,13 +1553,42 @@ export default {
} }
.flexItem3 { .flexItem3 {
width: 320px; width: 384px;
height: 340px; height: 340px;
position: relative;
background: rgba(9, 31, 43, 0.5) background: rgba(9, 31, 43, 0.5)
} }
.flexItem3_title{
left: 50%;
width: 150px;
height: 30px;
line-height: 30px;
font-size: 16px;
color: #00ffff;
text-align: center;
border: 1px solid #00ffff;
border-radius: 5px;
box-shadow: inset 0 0 5px 5px rgb(0 255 255 / 32%);
z-index: 99;
position: absolute;
top: 0;
transform: translateX(-50%);
background: rgb(4 50 83);
}
.flexItem3Body{
width: 380px;
height: 315px;
padding-top: 25px;
border: 1px solid #00ffff;
border-radius: 5px;
position: absolute;
top: 15px;
box-shadow: inset 0 0 15px 5px rgb(0 255 255 / 32%);
}
.inmBoxmain{ .inmBoxmain{
flex: 1; flex: 1;
height: 270px; height:140px;
width:98%; width:98%;
margin:auto; margin:auto;
/* border-left: 2px solid #0f5b8e; */ /* border-left: 2px solid #0f5b8e; */
@ -1312,26 +1599,25 @@ export default {
} }
.viewsItem { .viewsItem {
color: #ffffff; color: #ffffff;
font-size: 20px; width: 620px;
width: 440px; height: 100px;
height: 80px; font-size: 15px;
font-size: 15px; display: inline-block;
display: inline-block; margin-bottom: 10px;
margin-bottom: 20px;
} }
.viewsItem_wrap { .viewsItem_wrap {
height: 70px; height: 100px;
/* display: flex; */
flex-direction: column; flex-direction: column;
border-left: 5px solid rgba(53, 156, 193, 0.66); border-left: 5px solid rgba(28, 169, 231, 0.81);
padding-left: 10px; padding-left: 10px;
border-radius: 5px; border-radius: 5px;
} }
.viewsItem_img{ .viewsItem_img{
width: 85px; width: 85px;
/* height: 50px; */ margin-top: 10px;
} }
article{ article{
margin-top: 5px;
text-indent: 2em; text-indent: 2em;
} }