yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步

This commit is contained in:
wangweidong 2026-01-16 13:10:17 +08:00
parent 25b740cb67
commit bc3ebb4c1c
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/NursingNew/component/equipment.vue
View File

@ -249,8 +249,8 @@
<text class="right-container-tem-text">{{ wendushow.humidity? wendushow.humidity: '-' }}%</text> <text class="right-container-tem-text">{{ wendushow.humidity? wendushow.humidity: '-' }}%</text>
</view> </view>
<image class="right-icons-img" :src="`/static/index/undericons/man.png`" /> <!-- <image class="right-icons-img" :src="`/static/index/undericons/man.png`" />
<view>{{name}}</view> <view>{{name}}</view> -->
</view> </view>
</view> </view>
<view class="scroll-vi"> <view class="scroll-vi">
@ -1430,7 +1430,7 @@
if ( res.result.cameraInfoEntityList != null) { if ( res.result.cameraInfoEntityList != null) {
res.result.cameraInfoEntityList.forEach((element : any, index : number) => { res.result.cameraInfoEntityList.forEach((element : any, index : number) => {
element.typeNumber = 0 element.typeNumber = 0
element.lookName = "摄像头" + (index+1) ; element.lookName = "摄像头" ;
element.donghuapian = typeArray.value[0].url element.donghuapian = typeArray.value[0].url
allArray.value.push(element) allArray.value.push(element)
}) })
@ -1438,7 +1438,7 @@
if ( res.result.electricityMeterEntityList != null) { if ( res.result.electricityMeterEntityList != null) {
res.result.electricityMeterEntityList.forEach((element : any, index : number) => { res.result.electricityMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 1 element.typeNumber = 1
element.lookName = "电表" + (index+1) element.lookName = "智能电表"
element.donghuapian = typeArray.value[1].url element.donghuapian = typeArray.value[1].url
allArray.value.push(element) allArray.value.push(element)
}) })
@ -1446,7 +1446,7 @@
if ( res.result.waterMeterEntityList != null) { if ( res.result.waterMeterEntityList != null) {
res.result.waterMeterEntityList.forEach((element : any, index : number) => { res.result.waterMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 2 element.typeNumber = 2
element.lookName = "水表" + (index+1) element.lookName = "智能水表"
element.donghuapian = typeArray.value[2].url element.donghuapian = typeArray.value[2].url
allArray.value.push(element) allArray.value.push(element)
}) })
@ -1454,7 +1454,7 @@
if ( res.result.humidDeviceEntityList != null) { if ( res.result.humidDeviceEntityList != null) {
res.result.humidDeviceEntityList.forEach((element : any, index : number) => { res.result.humidDeviceEntityList.forEach((element : any, index : number) => {
element.typeNumber = 3 element.typeNumber = 3
element.lookName = "温度计" + (index+1) element.lookName = "温湿度计"
element.donghuapian = typeArray.value[3].url element.donghuapian = typeArray.value[3].url
allArray.value.push(element) allArray.value.push(element)
wendushow.value.temperature = element.temperature wendushow.value.temperature = element.temperature

3
pages/NursingNew/component/index.vue
View File

@ -451,11 +451,12 @@
<text v-if="indexmessage.optType == 1" style="white-space: nowrap;">单人执行</text> <text v-if="indexmessage.optType == 1" style="white-space: nowrap;">单人执行</text>
<text v-if="indexmessage.optType == 2" style="white-space: nowrap;">协助执行</text> <text v-if="indexmessage.optType == 2" style="white-space: nowrap;">协助执行</text>
<text v-if="indexmessage.optType == 3" style="white-space: nowrap;">转单执行</text>
<image style="margin-left: 1vw;" class="people-img" <image style="margin-left: 1vw;" class="people-img"
src="/static/index/newindex/leftmenu/iconright.png" /> src="/static/index/newindex/leftmenu/iconright.png" />
<text v-if="indexmessage.optType == 1">{{indexmessage.employeeName}}</text> <text v-if="indexmessage.optType == 1 || indexmessage.optType == 3">{{indexmessage.employeeName}}</text>
<text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text> <text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text>
</view> </view>

2
pages/Warehouse/finish.vue
View File

@ -2301,7 +2301,7 @@
.left-menu-father { .left-menu-father {
// margin-top: 1.3vh; // margin-top: 1.3vh;
width: 100%; width: 100%;
height: 85vh; height: 88.6vh;
.left-menu-scroll { .left-menu-scroll {
height: 100%; height: 100%;

2
pages/Warehouse/index/index.vue
View File

@ -227,6 +227,6 @@
background: RGBA(239, 240, 244, 1); background: RGBA(239, 240, 244, 1);
display: flex; display: flex;
padding-left: 1vw; padding-left: 1vw;
padding-top: 2.5vw; padding-top: 1.5vw;
} }
</style> </style>

4
pages/procurement/addtory.vue
View File

@ -228,7 +228,7 @@
} }
.list{ .list{
width: 100vw; width: 100vw;
height: 50vw; height: 51.5vw;
margin: 0.8vw auto 0; margin: 0.8vw auto 0;
padding:0 0 0 2vw; padding:0 0 0 2vw;
overflow: hidden; overflow: hidden;
@ -383,6 +383,6 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: rgb(239, 240, 244); background-color: rgb(239, 240, 244);
padding-top: 4.5vh; padding-top: 2.5vh;
} }
</style> </style>

1
pages/procurement/common/toryitem.vue
View File

@ -303,6 +303,7 @@
width: 100%; width: 100%;
height: 50vw; height: 50vw;
display: flex; display: flex;
margin-top: 0.75vw;
.itembord1 { .itembord1 {
border-radius: 1.6vw !important; border-radius: 1.6vw !important;
transition: 1s; transition: 1s;

2
pages/procurement/components/carditem.vue
View File

@ -114,7 +114,6 @@
solleft(v, i) solleft(v, i)
} }
const handleTouchEnd = (event : any, v : any, i : number) => { const handleTouchEnd = (event : any, v : any, i : number) => {
console.log('结束')
let y = event.changedTouches[0].pageY; let y = event.changedTouches[0].pageY;
let x = event.changedTouches[0].pageX; let x = event.changedTouches[0].pageX;
let absx = Math.abs(x - pageX.value) let absx = Math.abs(x - pageX.value)
@ -124,7 +123,6 @@
setTimeout(()=>{ setTimeout(()=>{
v.scrollleft = 0 v.scrollleft = 0
},20) },20)
console.log("1")
return return
} }
if (absx < 10 && absy < 10) { if (absx < 10 && absy < 10) {

3
pages/procurement/inventory.vue
View File

@ -828,7 +828,7 @@
width: 31.95%; width: 31.95%;
margin-right: 1%; margin-right: 1%;
margin-bottom: 1%; margin-bottom: 1%;
height: 355rpx; height: 370rpx;
background-color: #fff; background-color: #fff;
border-radius: 30rpx; border-radius: 30rpx;
// padding: 0 1%; // padding: 0 1%;
@ -875,6 +875,7 @@
// height: 48%; // height: 48%;
display: flex; display: flex;
position: relative; position: relative;
margin-top: 0.7vw;
.middle-heng-father { .middle-heng-father {
width: 100%; width: 100%;

8
pages/procurement/outbound.vue
View File

@ -26,7 +26,7 @@
v-show="plsbuy[lefttarget]?.status==`1`"> v-show="plsbuy[lefttarget]?.status==`1`">
<image :src="`/static/index/warehouse/procurement/picking/piliang${manyselect?`target`:``}.png`" /> <image :src="`/static/index/warehouse/procurement/picking/piliang${manyselect?`target`:``}.png`" />
<view> <view>
批量选择 批量统计
</view> </view>
</view> </view>
<view class="right-button" @click="huituiclick()" v-show="plsbuy[lefttarget]?.status==`1`"> <view class="right-button" @click="huituiclick()" v-show="plsbuy[lefttarget]?.status==`1`">
@ -239,7 +239,7 @@
<!-- <view class="button-gray" @click="quxiao"> <!-- <view class="button-gray" @click="quxiao">
取消 取消
</view> --> </view> -->
<view class="button-blue" @click="chukushow=true"> <view class="button-blue" @click="chukushow=true" v-if="!manyselect">
出库 出库
</view> </view>
</view> </view>
@ -810,7 +810,7 @@
.other-contain { .other-contain {
width: 100%; width: 100%;
height: 87vh; height: 88.6vh;
display: flex; display: flex;
// background-color: rgb(239, 240, 244); // background-color: rgb(239, 240, 244);
// transition: opacity 1s ease; // transition: opacity 1s ease;
@ -821,7 +821,7 @@
.left-menu-scroll { .left-menu-scroll {
margin-top: 3%; margin-top: 3%;
height: 89%; height: 90%;
width: 100%; width: 100%;
// position: relative; // position: relative;
// overflow: auto; // overflow: auto;