针对叉车的样式调整
This commit is contained in:
parent
5514557c61
commit
b17a9bc287
Binary file not shown.
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 22 KiB |
|
@ -253,7 +253,7 @@
|
|||
<template v-else-if="column.key === 'vehicleNum'">
|
||||
<i class="el-icon-tickets"/>
|
||||
{{d.row.vehicleNum | dv}}<br/>
|
||||
<i class="el-icon-bicycle"/>
|
||||
<i class="el-icon-truck"/>
|
||||
{{d.row.modelName | dv}}
|
||||
</template>
|
||||
<template v-else-if="column.key === 'music'">
|
||||
|
@ -439,14 +439,14 @@ export default {
|
|||
dicts: ['device_status', 'device_lock_status', 'device_iot_status', 'device_online_status', 'device_quality', 'device_music', 'order_status'],
|
||||
components: {
|
||||
FormCol,
|
||||
DeviceEditDialog,
|
||||
BooleanTag,
|
||||
DeviceTransferDialog,
|
||||
DeviceSn,
|
||||
UserLink,
|
||||
DeviceLink,
|
||||
AreaRemoteSelect,
|
||||
AreaLink,
|
||||
DeviceEditDialog,
|
||||
BooleanTag,
|
||||
DeviceTransferDialog,
|
||||
DeviceSn,
|
||||
UserLink,
|
||||
DeviceLink,
|
||||
AreaRemoteSelect,
|
||||
AreaLink,
|
||||
HardwareVersionSelect,
|
||||
OrderLink
|
||||
},
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
<div class="map-container" id="mapContainer"></div>
|
||||
<div class="legend">
|
||||
<div class="legend-item">
|
||||
<el-checkbox
|
||||
v-model="showPhone"
|
||||
<el-checkbox
|
||||
v-model="showPhone"
|
||||
@click.native.stop
|
||||
>
|
||||
</el-checkbox>
|
||||
|
@ -19,13 +19,13 @@
|
|||
</span>
|
||||
</div>
|
||||
<div class="legend-item">
|
||||
<el-checkbox
|
||||
v-model="showDevice"
|
||||
<el-checkbox
|
||||
v-model="showDevice"
|
||||
@click.native.stop
|
||||
>
|
||||
</el-checkbox>
|
||||
<span class="legend-text" @click="jumpToLocation('device')">
|
||||
<i class="el-icon-bicycle" style="color: #67C23A;"></i>设备位置
|
||||
<i class="el-icon-truck" style="color: #67C23A;"></i>设备位置
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -135,7 +135,7 @@ export default {
|
|||
dragEnable: true,
|
||||
center: [120.35218, 26.944335] // 默认中心点
|
||||
});
|
||||
|
||||
|
||||
this.map.addControl(new this.AMap.ToolBar());
|
||||
this.map.addControl(new this.AMap.Scale());
|
||||
|
||||
|
@ -149,7 +149,7 @@ export default {
|
|||
|
||||
// 清除已有标记
|
||||
this.clearMarkers();
|
||||
|
||||
|
||||
let validMarkers = [];
|
||||
|
||||
// 添加设备位置标记
|
||||
|
@ -159,7 +159,7 @@ export default {
|
|||
if (!isNaN(deviceLon) && !isNaN(deviceLat)) {
|
||||
this.deviceMarker = new this.AMap.Marker({
|
||||
position: [deviceLon, deviceLat],
|
||||
content: `<div class="marker-content"><i class="el-icon-bicycle" style="color: #67C23A; font-size: 25px;"></i></div>`,
|
||||
content: `<div class="marker-content"><i class="el-icon-truck" style="color: #67C23A; font-size: 25px;"></i></div>`,
|
||||
offset: new this.AMap.Pixel(-16, -16),
|
||||
title: '设备位置'
|
||||
});
|
||||
|
@ -208,10 +208,10 @@ export default {
|
|||
},
|
||||
jumpToLocation(type) {
|
||||
if (!this.map) return;
|
||||
|
||||
|
||||
let position;
|
||||
let marker;
|
||||
|
||||
|
||||
if (type === 'phone' && this.phoneMarker) {
|
||||
position = this.phoneMarker.getPosition();
|
||||
marker = this.phoneMarker;
|
||||
|
@ -223,7 +223,7 @@ export default {
|
|||
if (position) {
|
||||
// 设置更高的缩放级别以实现聚焦效果
|
||||
this.map.setZoomAndCenter(17, position, false, 800);
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
clearMarkers() {
|
||||
|
@ -275,7 +275,7 @@ export default {
|
|||
|
||||
::v-deep .el-checkbox {
|
||||
margin-right: 0;
|
||||
|
||||
|
||||
.el-checkbox__label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
@ -297,9 +297,9 @@ export default {
|
|||
border-radius: 50%;
|
||||
padding: 8px;
|
||||
font-size: 16px;
|
||||
|
||||
|
||||
i {
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
@ -85,13 +85,13 @@
|
|||
<collapse-panel :value="true" title="续航信息">
|
||||
<el-descriptions :column="4">
|
||||
<el-descriptions-item label="模块电量">{{ detail.remainingPower | fix2 | dv }} %</el-descriptions-item>
|
||||
<el-descriptions-item label="当前电压">{{ detail.voltage | fix2 | dv }} V</el-descriptions-item>
|
||||
<el-descriptions-item label="模块电压">{{ detail.voltage | fix2 | dv }} V</el-descriptions-item>
|
||||
<el-descriptions-item label="剩余续航">{{ detail.remainEndurance | fix2 | dv }} KM</el-descriptions-item>
|
||||
<el-descriptions-item label="满电电压">{{ detail.modelFullVoltage | fix2 | dv }} V</el-descriptions-item>
|
||||
<el-descriptions-item label="亏电电压">{{ detail.modelLowVoltage | fix2 | dv }} V</el-descriptions-item>
|
||||
<el-descriptions-item label="满电续航">{{ detail.modelFullEndurance | dv }} KM</el-descriptions-item>
|
||||
<el-descriptions-item label="车辆电池">{{ detail.carBat | fix2 | dv }} %</el-descriptions-item>
|
||||
<el-descriptions-item label="车辆续航">{{ detail.carMile | fix2 | dv }} km</el-descriptions-item>
|
||||
<el-descriptions-item label="车辆续航">{{ detail.carMile | fix2 | dv }} h</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</collapse-panel>
|
||||
</el-card>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
class="stat-card"
|
||||
:value="stat.deviceCount"
|
||||
label="车辆总数"
|
||||
icon="el-icon-bicycle"
|
||||
icon="el-icon-truck"
|
||||
start-color="#61DDAA"
|
||||
end-color="#4CAF50"
|
||||
sub-label="车型总数"
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
<el-card class="box-card" shadow="never">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8" v-for="dict in dict.type.device_status" :key="dict.value">
|
||||
<el-statistic
|
||||
class="statistic"
|
||||
group-separator=","
|
||||
:value="stat.deviceStatusMap[dict.value] || 0"
|
||||
<el-statistic
|
||||
class="statistic"
|
||||
group-separator=","
|
||||
:value="stat.deviceStatusMap[dict.value] || 0"
|
||||
:title="getDeviceStatusLabel(dict.value)"
|
||||
suffix="辆"
|
||||
>
|
||||
|
@ -16,12 +16,12 @@
|
|||
</template>
|
||||
</el-statistic>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="8" v-for="status in ['1', '0']" :key="`online-${status}`">
|
||||
<el-statistic
|
||||
class="statistic"
|
||||
group-separator=","
|
||||
:value="stat.deviceOnlineStatusMap[status] || 0"
|
||||
<el-statistic
|
||||
class="statistic"
|
||||
group-separator=","
|
||||
:value="stat.deviceOnlineStatusMap[status] || 0"
|
||||
:title="status == 1 ? '在线' : '离线'"
|
||||
suffix="辆"
|
||||
>
|
||||
|
@ -57,7 +57,7 @@ export default {
|
|||
color: '#6DC8EC' // 淡青色,表示在仓库
|
||||
},
|
||||
[DeviceStatus.AVAILABLE]: {
|
||||
icon: 'el-icon-bicycle',
|
||||
icon: 'el-icon-truck',
|
||||
color: '#61DDAA' // 柔和绿色,表示可用
|
||||
},
|
||||
[DeviceStatus.RESERVED]: {
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
clearable
|
||||
:picker-options="DatePickerOptions.DEFAULT"
|
||||
/>
|
||||
|
||||
|
||||
<el-row style="margin: 8px 0;">
|
||||
<!-- 第一行:突出显示收入相关数据 -->
|
||||
<el-col :sm="24" :md="11" >
|
||||
|
@ -75,7 +75,7 @@
|
|||
</div>
|
||||
</el-col>
|
||||
<el-col :span="8" class="mini-stat-card">
|
||||
<div class="icon-bg purple"><i class="el-icon-bicycle"></i></div>
|
||||
<div class="icon-bg purple"><i class="el-icon-truck"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="mini-label">进行中</div>
|
||||
<div class="mini-value">{{ orderProcessingCount | dv }}</div>
|
||||
|
@ -83,11 +83,11 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :sm="24" :md="13" class="detail-stat-row">
|
||||
<el-row>
|
||||
<el-col :span="miniSpan" class="mini-stat-card">
|
||||
<div class="icon-bg blue"><i class="el-icon-bicycle"></i></div>
|
||||
<div class="icon-bg blue"><i class="el-icon-truck"></i></div>
|
||||
<div class="stat-info">
|
||||
<div class="mini-label">
|
||||
骑行费
|
||||
|
@ -163,7 +163,7 @@
|
|||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -31,8 +31,8 @@ export default {
|
|||
color: '#5B8FF9' // 柔和蓝色,表示待支付
|
||||
},
|
||||
[OrderStatus.PROCESSING]: {
|
||||
icon: 'el-icon-bicycle',
|
||||
color: '#61DDAA' // 柔和绿色,表示进行中
|
||||
icon: 'el-icon-truck',
|
||||
color: '#61DDAA' // 柔和绿色,表示进行中
|
||||
},
|
||||
[OrderStatus.FINISHED]: {
|
||||
icon: 'el-icon-circle-check',
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<el-col>
|
||||
<el-statistic title="骑行费" :value="detail.ridingFee" :precision="2" suffix="元">
|
||||
<template slot="prefix">
|
||||
<i class="el-icon-bicycle" style="color: #409EFF"></i>
|
||||
<i class="el-icon-truck" style="color: #409EFF"></i>
|
||||
</template>
|
||||
</el-statistic>
|
||||
</el-col>
|
||||
|
@ -104,9 +104,9 @@
|
|||
</el-popover>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-statistic
|
||||
title="总退款"
|
||||
:value="detail.totalRefundAmount"
|
||||
<el-statistic
|
||||
title="总退款"
|
||||
:value="detail.totalRefundAmount"
|
||||
:precision="2"
|
||||
suffix="元"
|
||||
value-style="color: #F56C6C">
|
||||
|
@ -116,9 +116,9 @@
|
|||
</el-statistic>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-statistic
|
||||
title="自动退款"
|
||||
:value="detail.payAutoRefund"
|
||||
<el-statistic
|
||||
title="自动退款"
|
||||
:value="detail.payAutoRefund"
|
||||
:precision="2"
|
||||
suffix="元"
|
||||
value-style="color: #F56C6C">
|
||||
|
@ -135,9 +135,9 @@
|
|||
<div>管理费:{{detail.manageRefund | fix2 | dv}} 元</div>
|
||||
<div>车损费:{{detail.deductionRefund | fix2 | dv}} 元</div>
|
||||
</div>
|
||||
<el-statistic
|
||||
<el-statistic
|
||||
slot="reference"
|
||||
:value="detail.adminRefundAmount"
|
||||
:value="detail.adminRefundAmount"
|
||||
:precision="2"
|
||||
suffix="元"
|
||||
value-style="color: #F56C6C">
|
||||
|
@ -222,8 +222,8 @@
|
|||
<el-descriptions-item label="取消原因" v-if="detail.cancelRemark">{{ detail.cancelRemark | dv }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</collapse-panel>
|
||||
|
||||
|
||||
|
||||
|
||||
<collapse-panel :value="true" title="套餐信息">
|
||||
<el-descriptions :column="4" >
|
||||
<el-descriptions-item label="套餐名称" :span="2">
|
||||
|
@ -276,18 +276,18 @@
|
|||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</collapse-panel>
|
||||
|
||||
|
||||
<collapse-panel :value="true" title="用户信息">
|
||||
<el-descriptions :column="1" >
|
||||
<el-descriptions-item label="用户">
|
||||
<user-link :id="detail.userId" :text="detail.userName"/>
|
||||
<user-link :id="detail.userId" :text="detail.userName"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="手机">
|
||||
<user-link :id="detail.userId" :text="detail.userPhone"/>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</collapse-panel>
|
||||
|
||||
|
||||
<collapse-panel :value="true" title="支付信息">
|
||||
<el-descriptions :column="1" >
|
||||
<el-descriptions-item label="支付方式">
|
||||
|
@ -308,10 +308,10 @@
|
|||
<el-card class="box-card" v-if="detail.id" style="margin-top: 10px;">
|
||||
<el-tabs >
|
||||
<el-tab-pane lazy label="车辆轨迹" v-if="checkPermi(['bst:locationLog:list'])">
|
||||
<device-location
|
||||
:query="{orderId: detail.id, timeRange: orderTimeRange}"
|
||||
:operQuery="{bizId: detail.id, bizType: LogBizType.ORDER, operTimeRange: []}"
|
||||
:area-id="detail.areaId"
|
||||
<device-location
|
||||
:query="{orderId: detail.id, timeRange: orderTimeRange}"
|
||||
:operQuery="{bizId: detail.id, bizType: LogBizType.ORDER, operTimeRange: []}"
|
||||
:area-id="detail.areaId"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane lazy label="收益信息" v-if="checkPermi(['bst:bonus:list'])">
|
||||
|
@ -375,13 +375,13 @@ import Operlog from '@/views/monitor/operlog/index.vue'
|
|||
export default {
|
||||
name: 'OrderView',
|
||||
dicts: [
|
||||
'order_status',
|
||||
'device_lock_status',
|
||||
'suit_type',
|
||||
'suit_rental_unit',
|
||||
'suit_riding_rule',
|
||||
'order_return_mode',
|
||||
'order_return_type',
|
||||
'order_status',
|
||||
'device_lock_status',
|
||||
'suit_type',
|
||||
'suit_rental_unit',
|
||||
'suit_riding_rule',
|
||||
'order_return_mode',
|
||||
'order_return_type',
|
||||
'order_pay_type'
|
||||
],
|
||||
components: {
|
||||
|
@ -400,7 +400,7 @@ export default {
|
|||
AreaLink,
|
||||
OrderDeductDialog,
|
||||
FeeLog,
|
||||
OrderChangePriceDialog
|
||||
OrderChangePriceDialog
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -499,7 +499,7 @@ export default {
|
|||
this.getDetail();
|
||||
}).catch((err) => {
|
||||
this.loading = false;
|
||||
})
|
||||
})
|
||||
},
|
||||
unitLabel(value) {
|
||||
return this.dict.type.suit_rental_unit.find(item => item.value === value)?.label || value;
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
class="stat-item"
|
||||
:value="stat.device.count"
|
||||
label="车辆数"
|
||||
icon="el-icon-bicycle"
|
||||
icon="el-icon-truck"
|
||||
start-color="#45B7D1"
|
||||
end-color="#2F80ED"
|
||||
:height="height"
|
||||
|
|
Loading…
Reference in New Issue
Block a user