Commit c2486c94 authored by xxx's avatar xxx

修改

parent c476bb5c
...@@ -118,35 +118,37 @@ ...@@ -118,35 +118,37 @@
<div class="dataScrView_leftView_content"> <div class="dataScrView_leftView_content">
<div class="dataScrView_leftView_content_views2"> <div class="dataScrView_leftView_content_views2">
<div :class="forkLiftRankListData.selectFieldText == 'time' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('time')">工作时长</div> <div :class="forkLiftRankListData.selectFieldText == 'time' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('time')">工作时长</div>
<div :class="forkLiftRankListData.selectFieldText == 'time1' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('average')">平均时长</div> <div :class="forkLiftRankListData.selectFieldText == 'average' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('average')">平均时长</div>
<div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('zcweight')">装车量</div> <div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('yunzai')">装车量</div>
<div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('zcnum')">装车数</div> <div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('jiedan')">装车数</div>
</div> </div>
<div class="dataScrView_leftView_content_views3"> <div class="dataScrView_leftView_content_views3" v-if="forkLiftRankListData.selectFieldText == 'time'">
<div v-if="forkLiftRankListData.selectFieldText == 'time'"> <div v-for="(item,index) in forkLiftRankListData.listData" :key="index" :class="'forkliftRank' + (index + 1)">
<div v-for="(item,index) in forkLiftRankListData.listData" :key="index"> <div style="color:#BCF0FE;">{{item.driver}}</div>
<div style="color:#1DF9FC;">{{index + 1}}</div> <div style="color:#1AC9FF;">{{item.time}}h</div>
<div style="color:#BCF0FE;">{{item.name}}</div>
<div style="color:#1AC9FF;">{{item.time}}H</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div> <div style="color:#BCF0FE;">{{item.createTime}}</div>
</div> </div>
</div> </div>
<div v-if="forkLiftRankListData.selectFieldText == 'yunzai'"> <div class="dataScrView_leftView_content_views3" v-if="forkLiftRankListData.selectFieldText == 'average'">
<div v-for="(item,index) in forkLiftRankListData.listData" :key="index"> <div v-for="(item,index) in forkLiftRankListData.listData" :key="index" :class="'forkliftRank' + (index + 1)">
<div style="color:#1DF9FC;">{{index + 1}}</div> <div style="color:#BCF0FE;">{{item.driver}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div> <div style="color:#1AC9FF;">{{item.average}}h</div>
<div style="color:#1AC9FF;">{{item.yunzai}}</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div> <div style="color:#BCF0FE;">{{item.createTime}}</div>
</div> </div>
</div> </div>
<div v-if="forkLiftRankListData.selectFieldText == 'jiedan'"> <div class="dataScrView_leftView_content_views3" v-if="forkLiftRankListData.selectFieldText == 'yunzai'">
<div v-for="(item,index) in forkLiftRankListData.listData" :key="index"> <div v-for="(item,index) in forkLiftRankListData.listData" :key="index" :class="'forkliftRank' + (index + 1)">
<div style="color:#1DF9FC;">{{index + 1}}</div> <div style="color:#BCF0FE;">{{item.driver}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div> <div style="color:#1AC9FF;">{{item.yunzai}}</div>
<div style="color:#1AC9FF;">{{item.jiedan}}</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div> <div style="color:#BCF0FE;">{{item.createTime}}</div>
</div> </div>
</div> </div>
<div class="dataScrView_leftView_content_views3" v-if="forkLiftRankListData.selectFieldText == 'jiedan'">
<div v-for="(item,index) in forkLiftRankListData.listData" :key="index" :class="'forkliftRank' + (index + 1)">
<div style="color:#BCF0FE;">{{item.driver}}</div>
<div style="color:#1AC9FF;">{{item.jiedan}}</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -442,7 +444,6 @@ export default { ...@@ -442,7 +444,6 @@ export default {
carclass:'卡车', carclass:'卡车',
selectTimeText:'day', selectTimeText:'day',
selectFieldText:'juli', selectFieldText:'juli',
selectTimeDate:'',
driverName:[], driverName:[],
driverSeriesData:[], driverSeriesData:[],
}, },
...@@ -452,7 +453,13 @@ export default { ...@@ -452,7 +453,13 @@ export default {
selectTimeText:'day', selectTimeText:'day',
selectFieldText:'time', selectFieldText:'time',
listData:[], listData:[],
selectTimeDate:'', listData1:[
{driver:'王五',time:20,createTime:'2022-08-18 16:11:36'},
{driver:'王五',time:20,createTime:'2022-08-18 16:11:36'},
{driver:'王五',time:20,createTime:'2022-08-18 16:11:36'},
{driver:'王五',time:20,createTime:'2022-08-18 16:11:36'},
{driver:'王五',time:20,createTime:'2022-08-18 16:11:36'},
],
}, },
//中间模块选择 //中间模块选择
centerViewData:{ centerViewData:{
...@@ -666,17 +673,17 @@ export default { ...@@ -666,17 +673,17 @@ export default {
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc'; forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.truckRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.kaChanRankListDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
}) })
}else if(this.truckRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
}) })
}else if(this.truckRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
}) })
} }
}) })
...@@ -905,14 +912,24 @@ export default { ...@@ -905,14 +912,24 @@ export default {
//铲车切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
let forkLiftQuery1 = {};
forkLiftQuery1.size = 5;
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
if(text == 'day'){ if(text == 'day'){
HttpReq.truckDispatching.kaChanRankListDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
} }
if(text == 'week'){ if(text == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
} }
if(text == 'month'){ if(text == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
} }
}, },
//铲车切换字段排序 //铲车切换字段排序
...@@ -923,7 +940,19 @@ export default { ...@@ -923,7 +940,19 @@ export default {
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc'; forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.kaChanRankListDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
}else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
}else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res;
})
}
}) })
}, },
//中间模块选择 //中间模块选择
...@@ -1399,14 +1428,65 @@ dd>div{ ...@@ -1399,14 +1428,65 @@ dd>div{
.dataScrView_leftView_content_views3::-webkit-scrollbar { .dataScrView_leftView_content_views3::-webkit-scrollbar {
display: none; display: none;
} }
.dataScrView_leftView_content_views3>div>div{ .forkliftRank1{
font: 18px; margin-top: 0.5vh;
font-weight: 600;
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
width: 100%;
height: 2.5vh;
line-height: 2.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/list1.png');
background-size:100% 100%;
padding-left: 4vw;
box-sizing: border-box;
}
.forkliftRank2{
margin-top: 0.5vh;
display: flex;
justify-content: space-evenly;
width: 100%;
height: 2.5vh;
line-height: 2.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/list2.png');
background-size:100% 100%;
padding-left: 4vw;
box-sizing: border-box;
}
.forkliftRank3{
margin-top: 0.5vh;
display: flex;
justify-content: space-evenly;
width: 100%;
height: 2.5vh;
line-height: 2.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/list3.png');
background-size:100% 100%;
padding-left: 4vw;
box-sizing: border-box;
} }
.dataScrView_leftView_content_views3>div>div>div{ .forkliftRank4{
margin-top: 7px; margin-top: 0.5vh;
display: flex;
justify-content: space-evenly;
width: 100%;
height: 2.5vh;
line-height: 2.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/list4.png');
background-size:100% 100%;
padding-left: 4vw;
box-sizing: border-box;
}
.forkliftRank5{
margin-top: 0.5vh;
display: flex;
justify-content: space-evenly;
width: 100%;
height: 2.5vh;
line-height: 2.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/list5.png');
background-size:100% 100%;
padding-left: 4vw;
box-sizing: border-box;
} }
.dataScrView_centerView>div{ .dataScrView_centerView>div{
position: absolute; position: absolute;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<kaungEZUIKitJs v-if="kaungEZUIKitJsShow"/> <kaungEZUIKitJs v-if="kaungEZUIKitJsShow"/>
</div> </div>
<!-- 嵌入三维地图页面 --> <!-- 嵌入三维地图页面 -->
<iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe> <!-- <iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
<!-- 单个车辆视频监控 --> <!-- 单个车辆视频监控 -->
<div class="monitorCover1" v-show="monitorCover1Show"> <div class="monitorCover1" v-show="monitorCover1Show">
<div class="monitorCover1_closePic" @click="closeMonitorCoverFn"></div> <div class="monitorCover1_closePic" @click="closeMonitorCoverFn"></div>
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.setNowTimes(); this.setNowTimes();
}, 1000) }, 1000)
window.addEventListener('message', this.handleMessage); // window.addEventListener('message', this.handleMessage);
}, },
methods: { methods: {
loadData() { loadData() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment