diff --git a/src/assets/beng.jpg b/src/assets/beng.jpg new file mode 100644 index 0000000..82bffd8 Binary files /dev/null and b/src/assets/beng.jpg differ diff --git a/src/assets/bengche.jpg b/src/assets/bengche.jpg new file mode 100644 index 0000000..5bceb55 Binary files /dev/null and b/src/assets/bengche.jpg differ diff --git a/src/assets/dailei.jpg b/src/assets/dailei.jpg new file mode 100644 index 0000000..8d1430c Binary files /dev/null and b/src/assets/dailei.jpg differ diff --git a/src/assets/shashi.jpg b/src/assets/shashi.jpg new file mode 100644 index 0000000..50aebb6 Binary files /dev/null and b/src/assets/shashi.jpg differ diff --git a/src/assets/tugongbu.jpg b/src/assets/tugongbu.jpg new file mode 100644 index 0000000..a7f3fc5 Binary files /dev/null and b/src/assets/tugongbu.jpg differ diff --git a/src/assets/zhaoming.jpg b/src/assets/zhaoming.jpg new file mode 100644 index 0000000..1355846 Binary files /dev/null and b/src/assets/zhaoming.jpg differ diff --git a/src/assets/zhuanglei.jpg b/src/assets/zhuanglei.jpg new file mode 100644 index 0000000..be049c5 Binary files /dev/null and b/src/assets/zhuanglei.jpg differ diff --git a/src/views/component/inventorysSelect.vue b/src/views/component/inventorysSelect.vue index 14a1e8a..67c763c 100644 --- a/src/views/component/inventorysSelect.vue +++ b/src/views/component/inventorysSelect.vue @@ -24,6 +24,7 @@ item.wuzileixing === '一物一码' && parseFloat(item.zaikushuliang) !== 0 && parseFloat(item.wait_num)> 0 ); // 新增zaikushuliang !== 0条件 + .filter(item => item.wuzileixing === '一物一码' && parseFloat(item.zaikushuliang) !== 0 && parseFloat(item.wait_num) === 0 ); // 新增zaikushuliang !== 0条件 // 保存不匹配的记录(直接返回) const unmatchedData = data diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue index 769ecbe..fa4fa6f 100644 --- a/src/views/jsc/index.vue +++ b/src/views/jsc/index.vue @@ -12,13 +12,14 @@
- - - - +
重要防汛物资
+
+
+ {{item.name}}: - {{item.total}}{{item.unit?item.unit:''}} -
--> + {{item.value}}{{item.unit?item.unit:''}} +
- +
@@ -159,7 +160,16 @@ export default { }, { id: 'weihu', value: '维护' - }] + }], + imgList:{ + '袋类':require("@/assets/dailei.jpg"), + '排水类':require('@/assets/beng.jpg'), + '土工布类':require('@/assets/tugongbu.jpg'), + '动力及照明类':require('@/assets/zhaoming.jpg'), + '移动泵车':require('@/assets/bengche.jpg'), + '桩类':require('@/assets/zhuanglei.jpg'), + '砂石类':require('@/assets/shashi.jpg'), + } } }, computed: { @@ -220,6 +230,9 @@ export default { // unit:item.unit // }) // }) + res.upList.map(item=>{ + item.img = this.imgList[item.name] + }) this.upList = this.mergeAndRename(res.upList) console.log("this.upList",this.upList) }, @@ -228,30 +241,31 @@ export default { let pumpTotal = 0; // 排水类总和 let mobilePumpTotal = 0; // 移动泵车总和 let pumpUnit = ""; // 排水类的单位 - + let pumpImg = this.imgList['排水类'] // 第一步:遍历数组,处理常规项并统计特殊项 arr.forEach(item => { - const { name, total, unit } = item; + const { name, total, unit, img } = item; const value = total; if (name === "排水类") { pumpTotal += value; // 记录排水类的unit(假设所有排水类unit相同) if (!pumpUnit) pumpUnit = unit; + } else if (name === "移动泵车") { mobilePumpTotal += value; // 正常处理移动泵车,加入结果集 if (resultMap.has(name)) { resultMap.get(name).value += value; } else { - resultMap.set(name, { name, value, unit }); + resultMap.set(name, { name, value, unit,img }); } } else { // 常规项处理 if (resultMap.has(name)) { resultMap.get(name).value += value; } else { - resultMap.set(name, { name, value, unit }); + resultMap.set(name, { name, value, unit,img }); } } }); @@ -259,7 +273,7 @@ export default { // 第二步:计算泵类值并添加到结果集 if (pumpTotal > 0) { const finalPumpValue = pumpTotal - mobilePumpTotal; - resultMap.set("泵", { name: "泵", value: finalPumpValue, unit: pumpUnit }); + resultMap.set("泵", { name: "泵", value: finalPumpValue, unit: pumpUnit,img:pumpImg }); } return Array.from(resultMap.values()); @@ -430,7 +444,7 @@ export default { // flex-wrap: wrap; &-left { - + height: 400px; &-title { color: #6dcde6; text-align: center; @@ -440,12 +454,21 @@ export default { } &-content{ width: 450px; - height: 400px; + display:flex; + flex-wrap: wrap; &>div{ - text-align: center; + flex-basis: 50%; + text-align: left; margin:10px 0; color:#fff; font-size: 16px; + display: flex; + align-items: center; + &>img{ + width:30px; + height:30px; + margin-right:10px; + } } } .custom-btn { diff --git a/src/views/outbounds/component/printoutbounds.vue b/src/views/outbounds/component/printoutbounds.vue index 82255db..9609624 100644 --- a/src/views/outbounds/component/printoutbounds.vue +++ b/src/views/outbounds/component/printoutbounds.vue @@ -1,7 +1,8 @@