This commit is contained in:
Sliverber 2024-07-09 18:02:18 +08:00
parent 2827ba4dcf
commit d51377ba03
3 changed files with 442 additions and 353 deletions

File diff suppressed because it is too large Load Diff

View File

@ -98,6 +98,14 @@
{{deviceNum.offlineNum}}
</view>
</view>
<view class="cont" @click="changeidx(0)">
<view class="text" :class="statusidx==0?'act1':''">
仓库中
</view>
<view class="text" :class="statusidx==0?'act1':''">
{{deviceNum.offlineNum}}
</view>
</view>
<!-- <view class="cont">
<view class="text">
调度设备
@ -165,19 +173,20 @@
// this.getareaid()
if (uni.getStorageSync('adminAreaid')) {
this.areaId = uni.getStorageSync('adminAreaid')
this.getArea()
this.allVehicleNum()
}
this.getmarks()
this.allVehicleNum()
// this.getmarks();
},
onLoad() {
if (uni.getStorageSync('adminAreaid')) {
this.areaId = uni.getStorageSync('adminAreaid')
this.getArea()
}
let that = this
uni.getLocation({
type: 'wgs84',
@ -396,7 +405,7 @@
// this.areaInfo = res.data
const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
this.polyline.push(polylines)
this.getmarks()
setTimeout(()=>{
this.getParking()
},500)

View File

@ -90,11 +90,11 @@
<view class="half_info_li">
租赁用户{{item.phonenumber}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
<view class="half_info_li" v-if="item.realName">
用户姓名{{item.realName}}
</view>
<view class="half_info_li" v-else>
车牌号--
用户姓名--
</view>
</view>
<view class="info_li">
@ -110,14 +110,24 @@
<view class="half_info_li">
订单费用{{item.totalFee}}
</view>
<view class="half_info_li" v-if="item.status==4">
<view class="half_info_li">
有无退款<span v-if="item.etRefund==null"></span>
<span v-else style="color: red;"></span>
</view>
</view>
<view class="info_li">
<view class="half_info_li">
开始时间{{formatDate(item.createTime)}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
</view>
<view class="half_info_li" v-else>
车牌号--
</view>
</view>
<view class="info_li" v-if="item.unlock_time">
开关时间{{item.unlock_time}} {{ item.return_time ? item.return_time : '--' }}
</view>
@ -175,11 +185,11 @@
<view class="half_info_li">
租赁用户{{item.phonenumber}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
<view class="half_info_li" v-if="item.realName">
用户姓名{{item.realName}}
</view>
<view class="half_info_li" v-else>
车牌号--
用户姓名--
</view>
</view>
<view class="info_li">
@ -192,7 +202,26 @@
</view>
<view class="info_li">
订单费用{{item.totalFee}}
<view class="half_info_li">
订单费用{{item.totalFee}}
</view>
<view class="half_info_li" >
有无退款<span v-if="item.etRefund==null"></span>
<span v-else style="color: red;"></span>
</view>
</view>
<view class="info_li">
<view class="half_info_li">
开始时间{{formatDate(item.createTime)}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
</view>
<view class="half_info_li" v-else>
车牌号--
</view>
</view>
<view class="info_li" v-if="item.unlock_time">
开关时间{{item.unlock_time}} {{ item.return_time ? item.return_time : '--' }}
@ -249,11 +278,11 @@
<view class="half_info_li">
租赁用户{{item.phonenumber}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
<view class="half_info_li" v-if="item.realName">
用户姓名{{item.realName}}
</view>
<view class="half_info_li" v-else>
车牌号--
用户姓名--
</view>
</view>
<view class="info_li">
@ -265,7 +294,26 @@
</view>
</view>
<view class="info_li">
订单费用{{item.totalFee}}
<view class="half_info_li">
订单费用{{item.totalFee}}
</view>
<view class="half_info_li" >
有无退款<span v-if="item.etRefund==null"></span>
<span v-else style="color: red;"></span>
</view>
</view>
<view class="info_li">
<view class="half_info_li">
开始时间{{formatDate(item.createTime)}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
</view>
<view class="half_info_li" v-else>
车牌号--
</view>
</view>
<view class="info_li" v-if="item.unlock_time">
开关时间{{item.unlock_time}} {{ item.return_time ? item.return_time : '--' }}
@ -323,11 +371,11 @@
<view class="half_info_li">
租赁用户{{item.phonenumber}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
<view class="half_info_li" v-if="item.realName">
用户姓名{{item.realName}}
</view>
<view class="half_info_li" v-else>
车牌号--
用户姓名--
</view>
</view>
<view class="info_li">
@ -342,12 +390,23 @@
<view class="half_info_li">
订单费用{{item.totalFee}}
</view>
<view class="half_info_li" v-if="item.status==4">
<view class="half_info_li" >
有无退款<span v-if="item.etRefund==null"></span>
<span v-else style="color: red;"></span>
</view>
</view>
<view class="info_li">
<view class="half_info_li">
开始时间{{formatDate(item.createTime)}}
</view>
<view class="half_info_li" v-if="item.vehicleNum">
车牌号{{item.vehicleNum}}
</view>
<view class="half_info_li" v-else>
车牌号--
</view>
</view>
<view class="info_li" v-if="item.unlock_time">
开关时间{{item.unlock_time}} {{ item.return_time ? item.return_time : '--' }}
@ -611,6 +670,22 @@
},
methods: {
formatDate(value) {
if (!value) return '';
let date = new Date(value);
let month = date.getMonth() + 1; // 01
let day = date.getDate();
let hours = date.getHours();
let minutes = date.getMinutes();
//
month = month < 10 ? '0' + month : month;
day = day < 10 ? '0' + day : day;
hours = hours < 10 ? '0' + hours : hours;
minutes = minutes < 10 ? '0' + minutes : minutes;
return `${month}-${day} ${hours}:${minutes}`;
},
searchconfirm(e) {
// console.log(e,'eeeeeeeeee');
this.typeidx = e[0].value
@ -1163,9 +1238,11 @@
font-weight: 400;
font-size: 28rpx;
color: #808080;
.half_info_li:first-child{
width: 60%;
}
.half_info_li {
width: 50%;
width: 40%;
font-weight: 400;
font-size: 28rpx;
color: #808080;