|
|
@@ -134,11 +134,11 @@
|
|
|
</div>
|
|
|
<div class="midMap">
|
|
|
<div class="toptitle">矿区地图</div>
|
|
|
- <div style="height: 100%;">
|
|
|
+ <div style="height: 100%;border-radius:20px;overflow: hidden;">
|
|
|
<amap :zoom="6" :marker="Weighbridge" :center="center" @map-loaded="onMapLoaded"></amap>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="middibu"></div>
|
|
|
+ <!-- <div class="middibu"></div> -->
|
|
|
</div>
|
|
|
<div class="right">
|
|
|
<div class="right_content">
|
|
|
@@ -189,11 +189,13 @@
|
|
|
<p>{{ current3 == 1 ? overview.today.total : overview.month.total }}</p>
|
|
|
</div>
|
|
|
<div class="a3">
|
|
|
- <p>订单详情</p>
|
|
|
- <p>{{ current3 == 1 ? overview.today.completion_rate :
|
|
|
+ <img src="@/assets/newimg/490f9990ec23ee5671551eca4d18f3aa.png" alt="">
|
|
|
+ <!-- <p>订单</p>
|
|
|
+ <p>详情</p> -->
|
|
|
+ <!-- <p>{{ current3 == 1 ? overview.today.completion_rate :
|
|
|
overview.month.completion_rate }}<span>%</span>
|
|
|
</p>
|
|
|
- <p>完成率</p>
|
|
|
+ <p>完成率</p> -->
|
|
|
</div>
|
|
|
<div class="aa a2">
|
|
|
<p>{{ current3 == 1 ? "今日" : "本月" }}车次/次</p>
|
|
|
@@ -256,16 +258,16 @@
|
|
|
<p class="tt">地磅编号:{{ item.wb_code }}</p>
|
|
|
<div>
|
|
|
<p><span>车牌号:</span>{{ item.license_plate }}</p>
|
|
|
- <p><span>运单号:</span>{{ item.task_no }}</p>
|
|
|
+ <p><span>地磅名称:</span>{{ item.wb_name }}</p>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <p><span>进场皮重:</span>{{ item.tare_weight }}</p>
|
|
|
- <p><span>入场时间:</span>{{ item.first_weight_time }}</p>
|
|
|
+ <p><span>过磅重量:</span>{{ item.tare_weight }}吨</p>
|
|
|
+ <p><span>过磅时间:</span>{{ item.recv_time }}</p>
|
|
|
</div>
|
|
|
- <div>
|
|
|
+ <!-- <div>
|
|
|
<p><span>货品净重:</span>{{ item.actual_weight }}</p>
|
|
|
<p><span>出场时间:</span>{{ item.confirm_out_time }}</p>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</vue-seamless-scroll>
|
|
|
</div>
|
|
|
@@ -806,7 +808,7 @@ export default {
|
|
|
height: 209px;
|
|
|
background: url(../../assets/newimg/left.png) no-repeat;
|
|
|
background-size: 100% 100%;
|
|
|
- margin-bottom: 10px;
|
|
|
+ margin-bottom: 4px;
|
|
|
box-sizing: border-box;
|
|
|
position: relative;
|
|
|
}
|
|
|
@@ -930,10 +932,9 @@ export default {
|
|
|
|
|
|
.midMap {
|
|
|
width: 832px;
|
|
|
- height: 656px;
|
|
|
+ height: 856px;
|
|
|
background: url(../../assets/newimg/midbottom.png) no-repeat;
|
|
|
background-size: 100% 100%;
|
|
|
- margin-bottom: 15px;
|
|
|
position: relative;
|
|
|
overflow: hidden;
|
|
|
padding: 20px;
|
|
|
@@ -1098,7 +1099,6 @@ export default {
|
|
|
.list {
|
|
|
.item {
|
|
|
width: 400px;
|
|
|
- height: 96px;
|
|
|
background: rgba(255, 255, 255, 0.1);
|
|
|
padding: 10px;
|
|
|
box-sizing: border-box;
|
|
|
@@ -1140,10 +1140,10 @@ export default {
|
|
|
background: url(../../assets/newimg/detail.png) no-repeat;
|
|
|
background-size: 100% 100%;
|
|
|
width: 100%;
|
|
|
- height: 175px;
|
|
|
+ height: 150px;
|
|
|
box-sizing: border-box;
|
|
|
position: relative;
|
|
|
-
|
|
|
+ background-position-y:8px ;
|
|
|
.btnGroup {
|
|
|
position: absolute;
|
|
|
right: 25px;
|
|
|
@@ -1186,11 +1186,17 @@ export default {
|
|
|
.a3 {
|
|
|
text-align: center;
|
|
|
position: absolute;
|
|
|
- top: 36px;
|
|
|
+ top: 19px;
|
|
|
left: 50%;
|
|
|
- width: 100px;
|
|
|
- margin-left: -53px;
|
|
|
-
|
|
|
+ width: 116px;
|
|
|
+ height: 116px;
|
|
|
+ margin-left: -61px;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ img{
|
|
|
+ width: 50px;
|
|
|
+ }
|
|
|
p {
|
|
|
font-family: FXLED;
|
|
|
font-size: 40px;
|