Skip to content

卡
卡车调度系统
Commit 5c7fbb96 authored by xxx's avatar xxx
Browse files
Options

修改

parent 0ee1634d
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
src/components/mars3d/Map.vue
View file @ 5c7fbb96
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
//模型配置 //模型配置
const graphic = new mars3d.graphic.ModelPrimitive({ const graphic = new mars3d.graphic.ModelPrimitive({
style: { style: {
url: carclass == '电铲' ? '//data.mars3d.cn/gltf/mars/qzcar/GKZY_anim.gltf' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf', url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/qzcar/GKZY_anim.gltf' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
scale: 2, scale: 2,
minimumPixelSize: 50, minimumPixelSize: 50,
// 高亮时的样式（默认为鼠标移入，也可以指定type:'click'单击高亮），构造后也可以openHighlight、closeHighlight方法来手动调用 // 高亮时的样式（默认为鼠标移入，也可以指定type:'click'单击高亮），构造后也可以openHighlight、closeHighlight方法来手动调用
......
src/views/DeviceManage/callPolice/index.vue
View file @ 5c7fbb96
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<el-form-item label="终端车辆类型" prop="carclass"> <el-form-item label="终端车辆类型" prop="carclass">
<el-select v-model="form.item.carclass" placeholder="请选择终端车辆类型" style="width:280px;"> <el-select v-model="form.item.carclass" placeholder="请选择终端车辆类型" style="width:280px;">
<el-option label="卡车" value="卡车"></el-option> <el-option label="卡车" value="卡车"></el-option>
<el-option label="电铲" value="电铲"></el-option> <el-option label="铲车" value="铲车"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="安装车辆" prop="carname"> <el-form-item label="安装车辆" prop="carname">
......
src/views/IntelligentDispatchManagement/carManualScheduling/index.vue
View file @ 5c7fbb96
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
this.carInformationData = res; this.carInformationData = res;
}) })
//获取总的车辆信息 //获取总的车辆信息
HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'电铲'}).then((res) => { HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'铲车'}).then((res) => {
if(res.code == 200){ if(res.code == 200){
let aa1 = []; let aa1 = [];
aa1 = res.data.content; aa1 = res.data.content;
......
src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue
View file @ 5c7fbb96
...@@ -307,7 +307,7 @@ export default { ...@@ -307,7 +307,7 @@ export default {
this.carInformationDataAdd = res.data.content; this.carInformationDataAdd = res.data.content;
let array1 = []; let array1 = [];
res.data.content.forEach((item,index)=>{ res.data.content.forEach((item,index)=>{
if(item.carclass == '电铲'){ if(item.carclass == '铲车'){
array1.push(item); array1.push(item);
} }
}) })
......
src/views/MLargeScreen/components/dataScreening/index.vue
View file @ 5c7fbb96
...@@ -117,10 +117,10 @@ ...@@ -117,10 +117,10 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 电铲司机排行榜--> <!-- 铲车司机排行榜-->
<div> <div>
<div class="dataScrView_leftView_title truck_titleStyle"> <div class="dataScrView_leftView_title truck_titleStyle">
<div>电铲司机排行榜</div> <div>铲车司机排行榜</div>
<div class="driverTitleDateStyle"> <div class="driverTitleDateStyle">
<div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')">日</div> <div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')">日</div>
<div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')">周</div> <div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')">周</div>
...@@ -369,9 +369,9 @@ export default { ...@@ -369,9 +369,9 @@ export default {
listData:[], listData:[],
selectTimeDate:'', selectTimeDate:'',
}, },
//电铲排行榜 //铲车排行榜
forkLiftRankListData:{ forkLiftRankListData:{
carclass:'电铲', carclass:'铲车',
selectTimeText:'day', selectTimeText:'day',
selectFieldText:'time', selectFieldText:'time',
listData:[], listData:[],
...@@ -542,7 +542,7 @@ export default { ...@@ -542,7 +542,7 @@ export default {
} }
}) })
}) })
//获取电铲排行榜 //获取铲车排行榜
this.forkLiftRankListData.selectTimeDate = this.currentTime.day; this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -572,7 +572,7 @@ export default { ...@@ -572,7 +572,7 @@ export default {
if(res.data.totalElements == 0){ if(res.data.totalElements == 0){
this.carWorkTimeData.listData = [ this.carWorkTimeData.listData = [
{cartype:'卡车',gongshi:0,xianzhi:0}, {cartype:'卡车',gongshi:0,xianzhi:0},
{cartype:'电铲',gongshi:0,xianzhi:0}, {cartype:'铲车',gongshi:0,xianzhi:0},
{cartype:'其他车辆',gongshi:0,xianzhi:0}, {cartype:'其他车辆',gongshi:0,xianzhi:0},
]; ];
}else{ }else{
...@@ -632,7 +632,7 @@ export default { ...@@ -632,7 +632,7 @@ export default {
}) })
}) })
}, },
//电铲切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
if(text == 'day'){ if(text == 'day'){
...@@ -645,7 +645,7 @@ export default { ...@@ -645,7 +645,7 @@ export default {
this.forkLiftRankListData.selectTimeDate = this.currentTime.year; this.forkLiftRankListData.selectTimeDate = this.currentTime.year;
} }
}, },
//电铲切换字段排序 //铲车切换字段排序
forkLiftChangeField(text){ forkLiftChangeField(text){
this.forkLiftRankListData.selectFieldText = text; this.forkLiftRankListData.selectFieldText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
...@@ -755,7 +755,7 @@ export default { ...@@ -755,7 +755,7 @@ export default {
if(res.data.totalElements == 0){ if(res.data.totalElements == 0){
this.carWorkTimeData.listData = [ this.carWorkTimeData.listData = [
{cartype:'卡车',gongshi:0,xianzhi:0}, {cartype:'卡车',gongshi:0,xianzhi:0},
{cartype:'电铲',gongshi:0,xianzhi:0}, {cartype:'铲车',gongshi:0,xianzhi:0},
{cartype:'其他车辆',gongshi:0,xianzhi:0}, {cartype:'其他车辆',gongshi:0,xianzhi:0},
]; ];
}else{ }else{
......
src/views/MLargeScreen/components/intelligentSchedul/index.vue
View file @ 5c7fbb96
...@@ -579,7 +579,7 @@ export default { ...@@ -579,7 +579,7 @@ export default {
}, },
}, },
{ {
name: '电铲', name: '铲车',
type: 'bar', type: 'bar',
stack: 'total', stack: 'total',
label: { label: {
......
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际日产量" align="center"></el-table-column> <el-table-column prop="output" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/performanceStatistics/caiquOutput/month/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际月产量" align="center"></el-table-column> <el-table-column prop="output" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/performanceStatistics/caiquOutput/year/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际年产量" align="center"></el-table-column> <el-table-column prop="output" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/performanceStatistics/xiedianOutput/day/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际日产量" align="center"></el-table-column> <el-table-column prop="output" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/performanceStatistics/xiedianOutput/month/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际月产量" align="center"></el-table-column> <el-table-column prop="output" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/performanceStatistics/xiedianOutput/year/index.vue
View file @ 5c7fbb96
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column> <el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际年产量" align="center"></el-table-column> <el-table-column prop="output" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="电铲工作时间(h)" align="center"></el-table-column> <el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="电铲车数" align="center"></el-table-column> <el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
......
src/views/regionalManagement/regionalCaiDian/index.vue
View file @ 5c7fbb96
...@@ -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="name" label="采点名称" align="center"></el-table-column> <el-table-column prop="name" label="采点名称" align="center"></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="areashovel" label="电铲名称" align="center"></el-table-column> <el-table-column prop="areashovel" label="铲车名称" align="center"></el-table-column>
<el-table-column prop="arearesources" label="矿种" align="center"></el-table-column> <el-table-column prop="arearesources" label="矿种" align="center"></el-table-column>
<el-table-column prop="areaore" label="是否配矿" align="center"></el-table-column> <el-table-column prop="areaore" label="是否配矿" align="center"></el-table-column>
<el-table-column prop="areapriority" label="优先级" align="center"></el-table-column> <el-table-column prop="areapriority" label="优先级" align="center"></el-table-column>
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
<el-option v-for="(obj,index) in caidianAreaInformationData" :label="obj.name" :value="obj.name" :key="index"></el-option> <el-option v-for="(obj,index) in caidianAreaInformationData" :label="obj.name" :value="obj.name" :key="index"></el-option>
</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" 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"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
{required: true, message: '请输入采点名称', trigger: 'blur' } {required: true, message: '请输入采点名称', trigger: 'blur' }
], ],
areashovel: [ areashovel: [
{required: true, message: '请选择电铲车', trigger: 'change' } {required: true, message: '请选择铲车', trigger: 'change' }
], ],
}, },
...@@ -190,8 +190,8 @@ export default { ...@@ -190,8 +190,8 @@ export default {
HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => { HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
this.caidianAreaInformationData = res; this.caidianAreaInformationData = res;
}) })
//获取电铲车辆信息 //获取铲车车辆信息
HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'电铲'}).then((res) => { HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'铲车'}).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.dianchanCarInformationData = res.data.content; this.dianchanCarInformationData = res.data.content;
} }
......
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