Merge remote-tracking branch 'origin/dev-nx' into dev-nx
This commit is contained in:
commit
ec9ce6cb7f
|
|
@ -47,8 +47,8 @@ export default {
|
|||
isUp: true,
|
||||
isCollapse: false,
|
||||
newArrOne: [
|
||||
{ name: '施工机具总保有量', value: 9999 },
|
||||
{ url: GROUP, name: '工器具总保有量', value: 9999 },
|
||||
{ name: '机具设备总保有量', value: 9999 },
|
||||
{ url: GROUP, name: '调试设备总保有量', value: 9999 },
|
||||
],
|
||||
newArr: [
|
||||
{ url: GROUP, name: '在库机具', value: 999 },
|
||||
|
|
@ -79,8 +79,8 @@ export default {
|
|||
this.newArr = []
|
||||
getTotalOwnershipApi().then(res => {
|
||||
this.newArrOne.push(
|
||||
{ name: '施工机具总保有量', value: res.data[0].totalOwnershipNum },
|
||||
{ url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum },
|
||||
{ name: '机具设备总保有量', value: res.data[0].totalOwnershipNum },
|
||||
{ url: GROUP, name: '调试设备总保有量', value: res.data[1].totalOwnershipNum },
|
||||
)
|
||||
this.newArr.push(
|
||||
{ url: GROUP, name: '在库机具', value: res.data[0].stockNum },
|
||||
|
|
|
|||
|
|
@ -84,16 +84,16 @@ export default {
|
|||
prop: 'typeName',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
label: '规格型号',
|
||||
prop: 'typeModelName',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
label: '单位',
|
||||
prop: 'unitName',
|
||||
align: 'center'
|
||||
},
|
||||
// {
|
||||
// label: '规格型号',
|
||||
// prop: 'typeModelName',
|
||||
// align: 'center'
|
||||
// },
|
||||
// {
|
||||
// label: '单位',
|
||||
// prop: 'unitName',
|
||||
// align: 'center'
|
||||
// },
|
||||
{
|
||||
label: '在库数量',
|
||||
prop: 'stockNum',
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<h5 class="access-rate-box-title">领料数据</h5>
|
||||
</div>
|
||||
<div @click="handleClick(1)">
|
||||
<CountFlopOne :val="num" sonTitle="施工机具今日出库" ref="countFlop"></CountFlopOne>
|
||||
<CountFlopOne :val="num" sonTitle="机具设备今日出库" ref="countFlop"></CountFlopOne>
|
||||
</div>
|
||||
<div class="access-rate-box-top" @click="handleClick(2)">
|
||||
<CountFlopOne :val="num2" sonTitle="工器具今日出库" ref="countFlopTools"></CountFlopOne>
|
||||
<CountFlopOne :val="num2" sonTitle="调试设备今日出库" ref="countFlopTools"></CountFlopOne>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<h5 class="access-rate-box-title">退料数据</h5>
|
||||
</div>
|
||||
<div @click="handleClick(1)">
|
||||
<CountFlopTwo :val="num" sonTitle="施工机具今日入库" ref="countFlop"></CountFlopTwo>
|
||||
<CountFlopTwo :val="num" sonTitle="机具设备今日退库" ref="countFlop"></CountFlopTwo>
|
||||
</div>
|
||||
<div class="access-rate-box-top" @click="handleClick(2)">
|
||||
<CountFlopTwo :val="num2" sonTitle="工器具今日退料" ref="countFlopTools"></CountFlopTwo>
|
||||
<CountFlopTwo :val="num2" sonTitle="调试设备今日退库" ref="countFlopTools"></CountFlopTwo>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue