bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-13 14:09:02 +08:00
parent bd89662085 ec9ce6cb7f
commit e915c7a40b
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
View File

@ -439,14 +439,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
mt2.type_name AS typeName,
mt2.type_id AS typeId,
mt.type_name AS typeModelName,
mt.unit_name AS unitName,
IFNULL( mt.num, 0 ) AS stockNum,
IFNULL( subquery1.usNum, 0 ) AS useNum,
IFNULL( subquery2.repairNum, 0 ) AS inRepairNum,
IFNULL( subquery3.repairInputNum, 0 ) AS inputNum,
IFNULL( subquery4.inputNum, 0 ) AS purchaseNum,
IFNULL( mt.num, 0 ) + IFNULL( subquery1.usNum, 0 ) + IFNULL( subquery2.repairNum, 0 ) + IFNULL( subquery3.repairInputNum, 0 ) AS totalOwnershipNum,
SUM(
IFNULL( mt.num, 0 )) AS stockNum,
SUM(
IFNULL( subquery1.usNum, 0 )) AS useNum,
SUM(
IFNULL( subquery2.repairNum, 0 )) AS inRepairNum,
SUM(
IFNULL( subquery3.repairInputNum, 0 )) AS inputNum,
SUM(
IFNULL( subquery4.inputNum, 0 )) AS purchaseNum,
SUM(
IFNULL( mt.num, 0 ) + IFNULL( subquery1.usNum, 0 ) + IFNULL( subquery2.repairNum, 0 ) + IFNULL( subquery3.repairInputNum, 0 )) AS totalOwnershipNum,
sd.dept_name AS companyName
FROM
ma_type mt
@ -549,6 +553,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId!=null and typeId != ''">
AND mt2.type_id = #{typeId}
</if>
GROUP BY
mt2.type_id
</select>
<select id="getAcceptanceDetailStorage" resultType="com.bonus.sgzb.largeScreen.domain.StorageDetailVo">
SELECT

8
sgzb-screen/src/components/home/centerFold.vue
View File

@ -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 },

20
sgzb-screen/src/components/home/inventoryDialog.vue
View File

@ -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',

4
sgzb-screen/src/components/home/leftOne.vue
View File

@ -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>

4
sgzb-screen/src/components/home/leftTwo.vue
View File

@ -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>