Merge pull request 'projects/mescc/zhp' (#90) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #90
This commit is contained in:
commit
46743fa4ef
@ -5,7 +5,7 @@
|
|||||||
</ButtonNav>
|
</ButtonNav>
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||||
<el-form-item label="时间维度" prop="date">
|
<el-form-item label="时间维度" prop="date">
|
||||||
<el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="handleChange">
|
<el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="handleChange">
|
||||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||||
@ -84,8 +84,8 @@
|
|||||||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
|
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
|
||||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
:table-data="tableData" :max-height="tableH" />
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="containerBottom">
|
<!-- <div class="containerBottom">
|
||||||
|
|
||||||
@ -767,12 +767,28 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
.search {
|
.search {
|
||||||
// height: calc((100px));
|
// height: calc((100px));
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 16px 16px 0 16px;
|
padding: 16px 16px 0 16px;
|
||||||
margin: 8px 0px;
|
margin: 8px 0px;
|
||||||
|
.smallTitle {
|
||||||
|
font-size: 16px;
|
||||||
|
color: #000;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.smallTitle::before {
|
||||||
|
display: inline-block;
|
||||||
|
width: 4px;
|
||||||
|
height: 16px;
|
||||||
|
background: #0b58ff;
|
||||||
|
content: "";
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: -9px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
@ -784,13 +800,12 @@ export default {
|
|||||||
|
|
||||||
.blueTip::before {
|
.blueTip::before {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
content: '';
|
|
||||||
width: 4px;
|
width: 4px;
|
||||||
height: 18px;
|
height: 16px;
|
||||||
background: #0B58FF;
|
background: #0b58ff;
|
||||||
border-radius: 1px;
|
content: "";
|
||||||
margin-right: 8PX;
|
margin-right: 8px;
|
||||||
margin-top: 8px;
|
vertical-align: -3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
||||||
</ButtonNav>
|
</ButtonNav>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||||
<el-form-item label="时间维度" prop="type">
|
<el-form-item label="时间维度" prop="type">
|
||||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||||
@ -62,7 +62,7 @@
|
|||||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||||
:legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
:legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" style="margin-top: 30px">
|
<el-col :span="6" style="margin-top: 21px">
|
||||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
|
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -959,35 +959,12 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
.search {
|
.search {
|
||||||
// height: calc((100px));
|
// height: calc((100px));
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 16px 16px 0 16px;
|
padding: 16px 16px 0 16px;
|
||||||
margin: 8px 0px;
|
margin: 8px 0px;
|
||||||
}
|
|
||||||
|
|
||||||
.containerTop {
|
|
||||||
height: calc((100vh - 170px));
|
|
||||||
background-color: #fff;
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 4px 16px 16px 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.blueTip::before {
|
|
||||||
display: inline-block;
|
|
||||||
content: '';
|
|
||||||
width: 4px;
|
|
||||||
height: 18px;
|
|
||||||
background: #0B58FF;
|
|
||||||
border-radius: 1px;
|
|
||||||
margin-right: 8PX;
|
|
||||||
margin-top: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.containerTop {
|
|
||||||
margin-top: 8px;
|
|
||||||
|
|
||||||
.smallTitle {
|
.smallTitle {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
@ -1002,7 +979,24 @@ export default {
|
|||||||
background: #0b58ff;
|
background: #0b58ff;
|
||||||
content: "";
|
content: "";
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
vertical-align: -3px;
|
vertical-align: -9px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.containerTop {
|
||||||
|
height: calc((100vh - 170px));
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 4px 16px 16px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.blueTip::before {
|
||||||
|
display: inline-block;
|
||||||
|
width: 4px;
|
||||||
|
height: 16px;
|
||||||
|
background: #0b58ff;
|
||||||
|
content: "";
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: -3px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
|
||||||
</ButtonNav>
|
</ButtonNav>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||||
<el-form-item label="时间维度" prop="type">
|
<el-form-item label="时间维度" prop="type">
|
||||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||||
@ -62,7 +62,7 @@
|
|||||||
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
|
||||||
:legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
:legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" style="margin-top: 30px">
|
<el-col :span="6" style="margin-top:21px">
|
||||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
|
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
|
||||||
:chartNum="chartNum" />
|
:chartNum="chartNum" />
|
||||||
@ -125,18 +125,18 @@ export default {
|
|||||||
name: "ChipYieldBM",
|
name: "ChipYieldBM",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
otherProps:[],
|
otherProps: [],
|
||||||
start: undefined,
|
start: undefined,
|
||||||
currentMenu:'邯郸',
|
currentMenu: '邯郸',
|
||||||
end: undefined,
|
end: undefined,
|
||||||
title: '',
|
title: '',
|
||||||
gridLeft:true,
|
gridLeft: true,
|
||||||
showTable:false,
|
showTable: false,
|
||||||
listQuery: {
|
listQuery: {
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
start: undefined,
|
start: undefined,
|
||||||
end: undefined,
|
end: undefined,
|
||||||
pageSize:999,
|
pageSize: 999,
|
||||||
// size: 10,
|
// size: 10,
|
||||||
// current: 1,
|
// current: 1,
|
||||||
factory: null,
|
factory: null,
|
||||||
@ -252,10 +252,10 @@ export default {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
chartMsgTarget: {
|
chartMsgTarget: {
|
||||||
color: [ "#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
|
color: ["#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
|
||||||
xData: [],
|
xData: [],
|
||||||
yName: "单位/片",
|
yName: "单位/片",
|
||||||
yAxis:{
|
yAxis: {
|
||||||
type: "value",
|
type: "value",
|
||||||
name: "单位/片",
|
name: "单位/片",
|
||||||
show: true,
|
show: true,
|
||||||
@ -279,7 +279,7 @@ export default {
|
|||||||
color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
|
color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
|
||||||
xData: [],
|
xData: [],
|
||||||
yName: "单位/片",
|
yName: "单位/片",
|
||||||
yAxis:{
|
yAxis: {
|
||||||
type: "value",
|
type: "value",
|
||||||
name: "单位/片",
|
name: "单位/片",
|
||||||
nameTextStyle: {
|
nameTextStyle: {
|
||||||
@ -720,7 +720,7 @@ export default {
|
|||||||
// res.data.list.forEach((ele) => {
|
// res.data.list.forEach((ele) => {
|
||||||
res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
|
res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
|
||||||
// let i = index + 1
|
// let i = index + 1
|
||||||
this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length-3))
|
this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length - 3))
|
||||||
ele.productionSituationDataVOList.forEach((item) => {
|
ele.productionSituationDataVOList.forEach((item) => {
|
||||||
this.chartMsg.series[0].data.push({
|
this.chartMsg.series[0].data.push({
|
||||||
name: ele.titleValue,
|
name: ele.titleValue,
|
||||||
@ -797,7 +797,7 @@ export default {
|
|||||||
name: "FTO投入完成值",
|
name: "FTO投入完成值",
|
||||||
data: [
|
data: [
|
||||||
// s
|
// s
|
||||||
{ name: 'FTO投入完成值', value: obj.ftoInput,titleValue: obj.ftoInput },
|
{ name: 'FTO投入完成值', value: obj.ftoInput, titleValue: obj.ftoInput },
|
||||||
// { name: 'FTO投入完成值', value: 33 },
|
// { name: 'FTO投入完成值', value: 33 },
|
||||||
// { name: "%", value: 85 },
|
// { name: "%", value: 85 },
|
||||||
// { name: "%", value: 85 },
|
// { name: "%", value: 85 },
|
||||||
@ -1345,6 +1345,21 @@ export default {
|
|||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 16px 16px 0 16px;
|
padding: 16px 16px 0 16px;
|
||||||
margin: 8px 0px;
|
margin: 8px 0px;
|
||||||
|
.smallTitle {
|
||||||
|
font-size: 16px;
|
||||||
|
color: #000;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.smallTitle::before {
|
||||||
|
display: inline-block;
|
||||||
|
width: 4px;
|
||||||
|
height: 16px;
|
||||||
|
background: #0b58ff;
|
||||||
|
content: "";
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: -9px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
@ -1361,27 +1376,13 @@ export default {
|
|||||||
height: 18px;
|
height: 18px;
|
||||||
background: #0B58FF;
|
background: #0B58FF;
|
||||||
border-radius: 1px;
|
border-radius: 1px;
|
||||||
margin-right: 8PX;
|
margin-right: 8px;
|
||||||
margin-top: 8px;
|
vertical-align:-3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
|
|
||||||
.smallTitle {
|
|
||||||
font-size: 16px;
|
|
||||||
color: #000;
|
|
||||||
margin-bottom: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.smallTitle::before {
|
|
||||||
display: inline-block;
|
|
||||||
width: 4px;
|
|
||||||
height: 16px;
|
|
||||||
background: #0b58ff;
|
|
||||||
content: "";
|
|
||||||
margin-right: 8px;
|
|
||||||
vertical-align: -3px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
</ButtonNav>
|
</ButtonNav>
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
<el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
|
||||||
<el-form-item label="时间维度" prop="type">
|
<el-form-item label="时间维度" prop="type">
|
||||||
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
|
||||||
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
|
||||||
@ -84,8 +84,8 @@
|
|||||||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
</el-row>
|
</el-row>
|
||||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
|
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
|
||||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
:table-data="tableData" :max-height="tableH" />
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="containerBottom">
|
<!-- <div class="containerBottom">
|
||||||
|
|
||||||
@ -843,12 +843,28 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
.search {
|
.search {
|
||||||
// height: calc((100px));
|
// height: calc((100px));
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 16px 16px 0 16px;
|
padding: 16px 16px 0 16px;
|
||||||
margin:8px 0 8px 0px;
|
margin:8px 0 8px 0px;
|
||||||
|
.smallTitle {
|
||||||
|
font-size: 16px;
|
||||||
|
color: #000;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.smallTitle::before {
|
||||||
|
display: inline-block;
|
||||||
|
width: 4px;
|
||||||
|
height: 16px;
|
||||||
|
background: #0b58ff;
|
||||||
|
content: "";
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: -9px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
@ -860,13 +876,12 @@ export default {
|
|||||||
|
|
||||||
.blueTip::before {
|
.blueTip::before {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
content: '';
|
|
||||||
width: 4px;
|
width: 4px;
|
||||||
height: 18px;
|
height: 16px;
|
||||||
background: #0B58FF;
|
background: #0b58ff;
|
||||||
border-radius: 1px;
|
content: "";
|
||||||
margin-right: 8PX;
|
margin-right: 8px;
|
||||||
margin-top: 8px;
|
vertical-align: -3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerTop {
|
.containerTop {
|
||||||
|
Loading…
Reference in New Issue
Block a user