From bc3ebb4c1ceb21ae557c18af3e278e0a5570a6cd Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 16 Jan 2026 13:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/NursingNew/component/equipment.vue | 12 ++++++------
pages/NursingNew/component/index.vue | 3 ++-
pages/Warehouse/finish.vue | 2 +-
pages/Warehouse/index/index.vue | 2 +-
pages/procurement/addtory.vue | 4 ++--
pages/procurement/common/toryitem.vue | 1 +
pages/procurement/components/carditem.vue | 2 --
pages/procurement/inventory.vue | 3 ++-
pages/procurement/outbound.vue | 8 ++++----
9 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/pages/NursingNew/component/equipment.vue b/pages/NursingNew/component/equipment.vue
index 3e205f7..3542ac7 100644
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@@ -249,8 +249,8 @@
{{ wendushow.humidity? wendushow.humidity: '-' }}%
-
- {{name}}
+
@@ -1430,7 +1430,7 @@
if ( res.result.cameraInfoEntityList != null) {
res.result.cameraInfoEntityList.forEach((element : any, index : number) => {
element.typeNumber = 0
- element.lookName = "摄像头" + (index+1) ;
+ element.lookName = "摄像头" ;
element.donghuapian = typeArray.value[0].url
allArray.value.push(element)
})
@@ -1438,7 +1438,7 @@
if ( res.result.electricityMeterEntityList != null) {
res.result.electricityMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 1
- element.lookName = "电表" + (index+1)
+ element.lookName = "智能电表"
element.donghuapian = typeArray.value[1].url
allArray.value.push(element)
})
@@ -1446,7 +1446,7 @@
if ( res.result.waterMeterEntityList != null) {
res.result.waterMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 2
- element.lookName = "水表" + (index+1)
+ element.lookName = "智能水表"
element.donghuapian = typeArray.value[2].url
allArray.value.push(element)
})
@@ -1454,7 +1454,7 @@
if ( res.result.humidDeviceEntityList != null) {
res.result.humidDeviceEntityList.forEach((element : any, index : number) => {
element.typeNumber = 3
- element.lookName = "温度计" + (index+1)
+ element.lookName = "温湿度计"
element.donghuapian = typeArray.value[3].url
allArray.value.push(element)
wendushow.value.temperature = element.temperature
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 6bc8de7..d2753c0 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -451,11 +451,12 @@
单人执行
协助执行
+ 转单执行
- {{indexmessage.employeeName}}
+ {{indexmessage.employeeName}}
{{indexmessage.optNames}}
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 80dc54a..45d0b16 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -2301,7 +2301,7 @@
.left-menu-father {
// margin-top: 1.3vh;
width: 100%;
- height: 85vh;
+ height: 88.6vh;
.left-menu-scroll {
height: 100%;
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 57211c8..6578639 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -227,6 +227,6 @@
background: RGBA(239, 240, 244, 1);
display: flex;
padding-left: 1vw;
- padding-top: 2.5vw;
+ padding-top: 1.5vw;
}
\ No newline at end of file
diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue
index 4cf6352..cc5b55e 100644
--- a/pages/procurement/addtory.vue
+++ b/pages/procurement/addtory.vue
@@ -228,7 +228,7 @@
}
.list{
width: 100vw;
- height: 50vw;
+ height: 51.5vw;
margin: 0.8vw auto 0;
padding:0 0 0 2vw;
overflow: hidden;
@@ -383,6 +383,6 @@
width: 100vw;
height: 100vh;
background-color: rgb(239, 240, 244);
- padding-top: 4.5vh;
+ padding-top: 2.5vh;
}
\ No newline at end of file
diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue
index 419786c..ddff7de 100644
--- a/pages/procurement/common/toryitem.vue
+++ b/pages/procurement/common/toryitem.vue
@@ -303,6 +303,7 @@
width: 100%;
height: 50vw;
display: flex;
+ margin-top: 0.75vw;
.itembord1 {
border-radius: 1.6vw !important;
transition: 1s;
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index d4283b3..ab2d933 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -114,7 +114,6 @@
solleft(v, i)
}
const handleTouchEnd = (event : any, v : any, i : number) => {
- console.log('结束')
let y = event.changedTouches[0].pageY;
let x = event.changedTouches[0].pageX;
let absx = Math.abs(x - pageX.value)
@@ -124,7 +123,6 @@
setTimeout(()=>{
v.scrollleft = 0
},20)
- console.log("1")
return
}
if (absx < 10 && absy < 10) {
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index 78942cd..389c3b0 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -828,7 +828,7 @@
width: 31.95%;
margin-right: 1%;
margin-bottom: 1%;
- height: 355rpx;
+ height: 370rpx;
background-color: #fff;
border-radius: 30rpx;
// padding: 0 1%;
@@ -875,6 +875,7 @@
// height: 48%;
display: flex;
position: relative;
+ margin-top: 0.7vw;
.middle-heng-father {
width: 100%;
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 5a623fa..5fef886 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -26,7 +26,7 @@
v-show="plsbuy[lefttarget]?.status==`1`">
- 批量选择
+ 批量统计
@@ -239,7 +239,7 @@
-
+
出库
@@ -810,7 +810,7 @@
.other-contain {
width: 100%;
- height: 87vh;
+ height: 88.6vh;
display: flex;
// background-color: rgb(239, 240, 244);
// transition: opacity 1s ease;
@@ -821,7 +821,7 @@
.left-menu-scroll {
margin-top: 3%;
- height: 89%;
+ height: 90%;
width: 100%;
// position: relative;
// overflow: auto;