Commit 9078c3d1 authored by caicaicai's avatar caicaicai

修改

parent ba5761c4
......@@ -38,7 +38,14 @@
<div class="dataAnalysisScrView_rightView">
<!-- 装卸点平均时长 -->
<div>
<div class="dataAnalysisScrView_rightView_title">装卸点平均时长 </div>
<div class="dataAnalysisScrView_leftView_title truck_titleStyle">
<div>装卸点平均时长</div>
<div class="loadAndUnloadTitleDateStyle">
<div :class="loadAndUnloadListData.selectTimeText == 'day' ? 'loadAndUnloadDateStyle_son1' : 'loadAndUnloadDateStyle_son2' " @click="loadAndUnloadChangeTime('day')"></div>
<div :class="loadAndUnloadListData.selectTimeText == 'month' ? 'loadAndUnloadDateStyle_son1' : 'loadAndUnloadDateStyle_son2' " @click="loadAndUnloadChangeTime('month')"></div>
<div :class="loadAndUnloadListData.selectTimeText == 'year' ? 'loadAndUnloadDateStyle_son1' : 'loadAndUnloadDateStyle_son2' " @click="loadAndUnloadChangeTime('year')"></div>
</div>
</div>
<div class="dataAnalysisScrView_rightView_content">
</div>
......@@ -94,16 +101,24 @@ export default {
outputRankData:[],
//各采区当月完成率
echarts2Data:{
caiquName:['采区一', '采区二', '采区三', '采区四'],
wanchengNum:[200,250,485,632],
jihuaNum:[300,500,600,700],
wanchengRate:[20,50,60,80],
caiquName:[],
wanchengNum:[],
jihuaNum:[],
wanchengRate:[],
},
//月生产完成效率
echarts3Data:{
caiquName:['采区一', '采区二', '采区三', '采区四'],
wanchengNum:[200,250,485,632],
jihuaNum:[300,500,600,700],
wanchengNum:[20,25,48,63],
jihuaNum:[30,50,60,70],
},
//装卸点平均时长
loadAndUnloadListData:{
carclass:'卡车',
selectTimeText:'day',
selectFieldText:'juli',
listData:[],
selectTimeDate:'',
},
......@@ -127,7 +142,25 @@ export default {
}
})
//各采区当月完成率
this.echarts2Fn();
HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999,createTime:this.currentTime.month,}).then((res) => {
if(res.code == 200){
let caiquName = [];
let wanchengNum = [];
let jihuaNum = [];
let wanchengRate = [];
res.data.content.forEach((item,index)=>{
caiquName.push(item.name);
wanchengNum.push(item.output);
jihuaNum.push(item.dayPlan);
wanchengRate.push(parseFloat(item.rate) * 100);
})
this.echarts2Data.caiquName = caiquName;
this.echarts2Data.wanchengNum = wanchengNum;
this.echarts2Data.jihuaNum = jihuaNum;
this.echarts2Data.wanchengRate = wanchengRate;
this.echarts2Fn();
}
})
//月生产完成效率
this.echarts3Fn();
......@@ -344,6 +377,8 @@ export default {
}
},
yAxis: {
min: 0,
max: 100,
type: 'value',
name: '完成率(%)',
nameTextStyle: { fontSize: 16 },
......@@ -385,6 +420,19 @@ export default {
};
option && myChart.setOption(option);
},
//装卸点平均时长
loadAndUnloadChangeTime(text){
this.loadAndUnloadListData.selectTimeText = text;
if(text == 'day'){
this.loadAndUnloadListData.selectTimeDate = this.currentTime.day;
}
if(text == 'month'){
this.loadAndUnloadListData.selectTimeDate = this.currentTime.month;
}
if(text == 'year'){
this.loadAndUnloadListData.selectTimeDate = this.currentTime.year;
}
},
......@@ -519,6 +567,33 @@ dd>div{
justify-content: space-between;
padding-right: 4vw;
}
.loadAndUnloadTitleDateStyle{
display: flex;
color: #06EFFE;
font-size: 16px;
text-shadow: 0px 0px 0px;
height: 3.5vh;
align-items: center;
}
.loadAndUnloadDateStyle_son1{
height: 2.5vh;
line-height: 2.5vh;
margin-right: 5px;
padding:0px 5px;
background-color: #2DB3BB;
box-sizing: border-box;
border-radius: 5px;
cursor: pointer;
}
.loadAndUnloadDateStyle_son2{
height: 2.5vh;
line-height: 2.5vh;
margin-right: 5px;
padding:0px 5px;
box-sizing: border-box;
border-radius: 5px;
cursor: pointer;
}
#echarts1View{
position: absolute;
......@@ -561,6 +636,6 @@ dd>div{
position: absolute;
left: 0vh;
width: 100%;
height: 23vh;
height: 19vh;
}
</style>
\ No newline at end of file
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="name" label="司机" align="center"></el-table-column>
<el-table-column prop="dar" label="发生故障位置" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="name" label="司机" align="center"></el-table-column>
<el-table-column prop="dar" label="发生故障位置" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="name" label="司机" align="center"></el-table-column>
<el-table-column prop="dar" label="发生故障位置" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -68,10 +68,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="司机" align="center"></el-table-column>
<el-table-column prop="adr" label="等待位置" align="center"></el-table-column>
<el-table-column prop="time" label="等待时长" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="司机" align="center"></el-table-column>
<el-table-column prop="adr" label="等待位置" align="center"></el-table-column>
<el-table-column prop="time" label="等待时长" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -26,7 +26,7 @@
<el-table-column prop="carname" label="司机" align="center"></el-table-column>
<el-table-column prop="adr" label="等待位置" align="center"></el-table-column>
<el-table-column prop="time" label="等待时长" align="center"></el-table-column>
<el-table-column prop="addTime" label="日期" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
......@@ -67,10 +67,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.addTime" type="month" placeholder="选择月份"></el-date-picker>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.addTime" type="year" placeholder="选择年"></el-date-picker>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
......@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1;
param.size = this.size;
param.sort = sort;
if(this.query.addTime){
param.addTime = this.changeTimeFn(this.query.addTime);
if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime);
}else{
param.addTime = this.currentTime;
param.createTime = this.currentTime;
}
this.$nextTick(()=>{
......
......@@ -22,8 +22,8 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
devServer: {
//host: 'localhost', // 也可以直接写IP地址这样方便真机测试
host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
host: 'localhost', // 也可以直接写IP地址这样方便真机测试
//host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
port: port,
open: true,
overlay: {
......
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