Skip to content

卡
卡车调度系统
Commit ecb236ae authored by SQL_Mou's avatar SQL_Mou
Browse files
Options

修改文档问题

parent 458c8bce
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 24 deletions
src/assets/js/common.js
View file @ ecb236ae
...@@ -2241,6 +2241,14 @@ var HttpReq = function(){ ...@@ -2241,6 +2241,14 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
//获取地图车辆轨迹——获取轨迹播放时间列表
apiMineAlarmHistoryLbQuery: function(param){
return request({
url: '/api/mineAlarmHistory/Lb',
method: 'get',
params:param,
})
},
//获取地图车辆轨迹——获取所有实时坐标 //获取地图车辆轨迹——获取所有实时坐标
getAllNewTimeCarTrajectoryQuery: function(param){ getAllNewTimeCarTrajectoryQuery: function(param){
return request({ return request({
...@@ -2496,6 +2504,14 @@ var HttpReq = function(){ ...@@ -2496,6 +2504,14 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
//大屏组件2工作人数统计信息接口
apiManmadesTjQuery: function(param){
return request({
url: '/api/Manmades/Tj',
method: 'get',
params:param,
})
},
//大屏组件4铲车排行榜接口 //大屏组件4铲车排行榜接口
apiManmadeschanjiedanDayQuery: function(param){ apiManmadeschanjiedanDayQuery: function(param){
return request({ return request({
...@@ -2511,6 +2527,27 @@ var HttpReq = function(){ ...@@ -2511,6 +2527,27 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
apiManmadesChanSjjiedanDayQuery: function(param){
return request({
url: '/api/Manmades/chanSjjiedanDay',
method: 'get',
params:param,
})
},
apiManmadesChanSjjiedanZhouQuery: function(param){
return request({
url: '/api/Manmades/chanSjjiedanZhou',
method: 'get',
params:param,
})
},
apiManmadesChanSjjiedanMouQuery: function(param){
return request({
url: '/api/Manmades/chanSjjiedanMou',
method: 'get',
params:param,
})
},
apiManmadesChanjiedanMouQuery: function(param){ apiManmadesChanjiedanMouQuery: function(param){
return request({ return request({
url: '/api/Manmades/ChanjiedanMou', url: '/api/Manmades/ChanjiedanMou',
......
src/views/DeviceManage/callPolice/index.vue
View file @ ecb236ae
...@@ -5,9 +5,17 @@ ...@@ -5,9 +5,17 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<label class="el-form-item-label" style="font-weight: 500;">设备编号</label> <el-input v-model="query.number" clearable size="small" placeholder="车辆名称" style="width:180px;"/>
<el-input v-model="query.name" clearable size="small" placeholder="请输入设备编号" style="width:180px;"/> <el-input v-model="query.driver" clearable size="small" placeholder="司机" style="width:180px;"/>
<el-input v-model="query.carclass" clearable size="small" placeholder="车辆类型" style="width:180px;"/>
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:MM:SS"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <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> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div> </div>
...@@ -26,6 +34,8 @@ ...@@ -26,6 +34,8 @@
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName" height="64vh"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName" height="64vh">
<el-table-column prop="name" label="设备编号" align="center"></el-table-column> <el-table-column prop="name" label="设备编号" align="center"></el-table-column>
<el-table-column prop="alarmTime" label="报警时间" align="center"></el-table-column> <el-table-column prop="alarmTime" label="报警时间" align="center"></el-table-column>
<el-table-column prop="number" label="车辆" align="center"></el-table-column>
<el-table-column prop="driver" label="司机" align="center"></el-table-column>
<el-table-column prop="type" label="报警类型" align="center" :formatter="baojingleixingChange"></el-table-column> <el-table-column prop="type" label="报警类型" align="center" :formatter="baojingleixingChange"></el-table-column>
<el-table-column prop="areaName" label="报警区域" align="center"></el-table-column> <el-table-column prop="areaName" label="报警区域" align="center"></el-table-column>
<el-table-column prop="operator" label="处理人" align="center"></el-table-column> <el-table-column prop="operator" label="处理人" align="center"></el-table-column>
...@@ -129,10 +139,18 @@ export default { ...@@ -129,10 +139,18 @@ export default {
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.size = this.size;
param.sort = sort; param.sort = sort;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.query.createTime == undefined){
}else{
param.startTime = this.query.createTime[0]
param.endTime = this.query.createTime[1]
}
//获取报警信息 //获取报警信息
HttpReq.truckDispatching.callPoliceHistroyQuery(param).then((res) => { if(param.createTime){
delete param.createTime
}
HttpReq.truckDispatching.apiMineAlarmHistoryLbQuery(param).then((res) => {
this.loading = false; this.loading = false;
this.tableData = res.content; this.tableData = res.content;
this.total = res.totalElements; this.total = res.totalElements;
......
src/views/MLargeScreen/components/smallComponents/DPcomputer2.vue
View file @ ecb236ae
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
<img src="../../../../assets/images/cutGraph/siji11.png"> <img src="../../../../assets/images/cutGraph/siji11.png">
<div> <div>
<div style="text-align: center;font-size:15px;">司机总人数</div> <div style="text-align: center;font-size:15px;">司机总人数</div>
<div style="text-align: center;font-size:18px;">{{driverData.totalNumber}}</div> <div style="text-align: center;font-size:18px;">{{zr}}</div>
</div> </div>
</div> </div>
<div class="presentDrivernumberStyle"> <div class="presentDrivernumberStyle">
<div style="color:#3DFBEB;"> <div style="color:#3DFBEB;">
<div style="text-align: center;font-size:15px;">当前工作人数</div> <div style="text-align: center;font-size:15px;">当前工作人数</div>
<div style="text-align: center;font-size:18px;">{{driverData.workersNumber}}</div> <div style="text-align: center;font-size:18px;">{{zx}}</div>
</div> </div>
<div style="color:#F7E518;"> <div style="color:#F7E518;">
<div style="text-align: center;font-size:15px;">当前休息人数</div> <div style="text-align: center;font-size:15px;">当前休息人数</div>
<div style="text-align: center;font-size:18px;">{{driverData.restNumber}}</div> <div style="text-align: center;font-size:18px;">{{lx}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -61,6 +61,9 @@ export default { ...@@ -61,6 +61,9 @@ export default {
restNumber:0, restNumber:0,
driverTableData:[], driverTableData:[],
}, },
zr:0,
zx:0,
lx:0,
} }
}, },
mounted(){ mounted(){
...@@ -89,6 +92,12 @@ export default { ...@@ -89,6 +92,12 @@ export default {
}) })
this.DPcomputer2BoxTimer = setInterval(() => { this.DPcomputer2BoxTimer = setInterval(() => {
//获取工作人员统计
HttpReq.truckDispatching.apiManmadesTjQuery().then( res => {
this.zr = res.data[0].zr
this.zx = res.data[0].zx
this.lx = res.data[0].lx
})
//获取司机信息 //获取司机信息
HttpReq.truckDispatching.apiManmadesRenQuery({size:9999}).then((res) => { HttpReq.truckDispatching.apiManmadesRenQuery({size:9999}).then((res) => {
if(res.code == 200){ if(res.code == 200){
......
src/views/MLargeScreen/components/smallComponents/DPcomputer4.vue
View file @ ecb236ae
...@@ -78,21 +78,24 @@ export default { ...@@ -78,21 +78,24 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanDayQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanZhouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanMouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
...@@ -109,21 +112,24 @@ export default { ...@@ -109,21 +112,24 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanDayQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanZhouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanMouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
...@@ -142,7 +148,8 @@ export default { ...@@ -142,7 +148,8 @@ export default {
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText; forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText;
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
if(text == 'day'){ if(text == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanDayQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
...@@ -150,7 +157,8 @@ export default { ...@@ -150,7 +157,8 @@ export default {
}) })
} }
if(text == 'week'){ if(text == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanZhouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
...@@ -158,7 +166,8 @@ export default { ...@@ -158,7 +166,8 @@ export default {
}) })
} }
if(text == 'month'){ if(text == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanMouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
...@@ -176,21 +185,24 @@ export default { ...@@ -176,21 +185,24 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanDayQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanZhouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
this.forkLiftRankListData.listData = transitionRes; this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { // HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
HttpReq.truckDispatching.apiManmadesChanSjjiedanMouQuery(forkLiftQuery1).then((res) => {
let transitionRes = res.sort(function(a,b){ let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText]; return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
}) })
......
src/views/regionalManagement/regionalCaiDian/index.vue
View file @ ecb236ae
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="铲车" prop="areashovel"> <el-form-item label="铲车" prop="areashovel">
<el-select v-model="form.item.areashovel" placeholder="请选择铲车" style="width:280px;"> <el-select v-model="form.item.areashovel" multiple placeholder="请选择铲车" style="width:280px;">
<el-option v-for="(obj,index) in dianchanCarInformationData" :label="obj.number" :value="obj.number" :key="index"></el-option> <el-option v-for="(obj,index) in dianchanCarInformationData" :label="obj.number" :value="obj.number" :key="index">{{obj.number}}</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="矿种" prop="arearesources"> <el-form-item label="矿种" prop="arearesources">
...@@ -225,6 +225,9 @@ export default { ...@@ -225,6 +225,9 @@ export default {
}, },
toEdit(item) { toEdit(item) {
// 请除表单验证 // 请除表单验证
this.form.item.areashovel = this.dianchanCarInformationData.map(function(v) {
return v.number;
});
this.$refs['form1'] && this.$refs['form1'].clearValidate(); this.$refs['form1'] && this.$refs['form1'].clearValidate();
this.form.title = '修改采点'; this.form.title = '修改采点';
this.form.status.cu = 0; this.form.status.cu = 0;
...@@ -254,6 +257,7 @@ export default { ...@@ -254,6 +257,7 @@ export default {
submitForm(validateName, item){ submitForm(validateName, item){
if(!this.form.status.cu){ if(!this.form.status.cu){
this.form.status.cu = 2; this.form.status.cu = 2;
item.areashovel = item.areashovel.toLocaleString();
this.$refs[validateName].validate(valid => { this.$refs[validateName].validate(valid => {
if(valid){ if(valid){
if(this.form.reqType === 'add'){ if(this.form.reqType === 'add'){
......
src/views/system/dataDictionary/notifiyFrequency/index.vue
View file @ ecb236ae
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="description" label="描述" align="center"></el-table-column> <el-table-column prop="description" label="描述" align="center"></el-table-column>
<el-table-column prop="name" label="名称" align="center"></el-table-column> <el-table-column prop="name" label="名称" align="center"></el-table-column>
<el-table-column prop="threshold" label="数值" align="center"></el-table-column> <el-table-column prop="threshold" label="数值（min）" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
......
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