Skip to content

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

Merge branch 'master' of http://h.gemho.cn:7099/caicaicai/truckDispatching

parents 41a9b5c0 8f58a429
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2496 additions and 782 deletions
public/config/config.json
View file @ fcbbe8e9
......@@ -20,7 +20,7 @@
},
"cameraController": {
"zoomFactor": 3.0,
"minimumZoomDistance": 200,
"minimumZoomDistance": 100,
"maximumZoomDistance": 50000000,
"enableRotate": true,
"enableTranslate": true,
......
src/assets/js/common.js
View file @ fcbbe8e9
......@@ -1171,14 +1171,14 @@ var HttpReq = function(){
//绩效统计——日报——区域产量报表采区
caiquAreaQueryDay: function(param){
return request({
url: '/api/Panel',
url: 'api/PlanNew/Day',
method: 'get',
params:param,
})
},
caiquAreaAddDay: function(data){
return request({
url: '/api/Panel',
url: 'api/PlanNew/Day',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1187,14 +1187,14 @@ var HttpReq = function(){
},
caiquAreaUpdateDay: function(data){
return request({
url: '/api/Panel',
url: 'api/PlanNew/Day',
method: 'PUT',
data:data,
})
},
caiquAreaDelDay: function(data){
return request({
url: '/api/Panel',
url: 'api/PlanNew/Day',
method: 'Delete',
data:data,
})
......@@ -1419,14 +1419,14 @@ var HttpReq = function(){
//绩效统计——月报——区域产量报表采区
caiquAreaQueryMonth: function(param){
return request({
url: '/api/PanelMonth',
url: '/api/PlanNew/Month',
method: 'get',
params:param,
})
},
caiquAreaAddMonth: function(data){
return request({
url: '/api/PanelMonth',
url: '/api/PlanNew/Month',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1435,14 +1435,14 @@ var HttpReq = function(){
},
caiquAreaUpdateMonth: function(data){
return request({
url: '/api/PanelMonth',
url: '/api/PlanNew/Month',
method: 'PUT',
data:data,
})
},
caiquAreaDelMonth: function(data){
return request({
url: '/api/PanelMonth',
url: '/api/PlanNew/Month',
method: 'Delete',
data:data,
})
......@@ -1667,14 +1667,14 @@ var HttpReq = function(){
//绩效统计——年报——区域产量报表采区
caiquAreaQueryYear: function(param){
return request({
url: '/api/PanelYear',
url: 'api/PlanNew/Year',
method: 'get',
params:param,
})
},
caiquAreaAddYear: function(data){
return request({
url: '/api/PanelYear',
url: 'api/PlanNew/Year',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1683,14 +1683,14 @@ var HttpReq = function(){
},
caiquAreaUpdateYear: function(data){
return request({
url: '/api/PanelYear',
url: 'api/PlanNew/Year',
method: 'PUT',
data:data,
})
},
caiquAreaDelYear: function(data){
return request({
url: '/api/PanelYear',
url: 'api/PlanNew/Year',
method: 'Delete',
data:data,
})
......@@ -1967,6 +1967,76 @@ var HttpReq = function(){
params:param,
})
},
//大屏——数据总览——卡车铲车排行榜
kaChanRankListDayQuery: function(param){
return request({
url: '/api/Manmades/jiedanDay',
method: 'get',
params:param,
})
},
kaChanRankListZhouQuery: function(param){
return request({
url: '/api/Manmades/jiedanZhou',
method: 'get',
params:param,
})
},
kaChanRankListMouQuery: function(param){
return request({
url: '/api/Manmades/jiedanMou',
method: 'get',
params:param,
})
},
//大屏——数据总览——中间下方图表
apiPlanTime1Query: function(param){
return request({
url: '/api/Plan/time',
method: 'get',
params:param,
})
},
//大屏——数据总览——运载数据
apiPlanZDay1Query: function(param){
return request({
url: '/api/Plan/ZDay',
method: 'get',
params:param,
})
},
//大屏——数据总览——装载数据
apiPlanZMonth1Query: function(param){
return request({
url: '/api/Plan/ZMonth',
method: 'get',
params:param,
})
},
//大屏——车辆管理——卡车铲车排行榜day
apiManmadesDay1Query: function(param){
return request({
url: '/api/Manmades/Day',
method: 'get',
params:param,
})
},
//大屏——车辆管理——卡车铲车排行榜week
apiManmadesZhou1Query: function(param){
return request({
url: '/api/Manmades/Zhou',
method: 'get',
params:param,
})
},
//大屏——车辆管理——卡车铲车排行榜month
apiManmadesMou1Query: function(param){
return request({
url: '/api/Manmades/Mou',
method: 'get',
params:param,
})
},
//大屏——智能调度——近期通知列表
recentNoticeQuery: function(param){
return request({
......@@ -2038,6 +2108,14 @@ var HttpReq = function(){
params:param,
})
},
//大屏——车辆信息弹框——车辆实时数据
screenCarInforCarRealQuery2: function(param){
return request({
url: '/api/CarPeop/realtime',
method: 'get',
params:param,
})
},
//大屏——地图的增删改查
screenMapSetUpQuery: function(param){
return request({
......@@ -2181,6 +2259,14 @@ var HttpReq = function(){
params:param
})
},
//大屏数据分析——采区产量统计
getApiHl1: function(param){
return request({
url: '/api/Hl',
method: 'get',
params:param
})
},
......
src/components/mars3d/Map.vue
View file @ fcbbe8e9
......@@ -200,7 +200,8 @@ export default {
//模型配置
const graphic = new mars3d.graphic.ModelPrimitive({
style: {
url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
//url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/mars/car/tufangche.glb',
scale: 2,
minimumPixelSize: 50,
// 高亮时的样式（默认为鼠标移入，也可以指定type:'click'单击高亮），构造后也可以openHighlight、closeHighlight方法来手动调用
......
src/components/mars3d/Map2.vue
View file @ fcbbe8e9
......@@ -236,7 +236,7 @@ export default {
pixelOffset: new Cesium.Cartesian2(10, -25), //偏移量
},
model: {
url: '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
url: '//data.mars3d.cn/gltf/mars/car/tufangche.glb',
scale: 1,
minimumPixelSize: 50,
},
......
src/views/MLargeScreen/components/intelligentSchedul/index.vue
View file @ fcbbe8e9
......@@ -1169,7 +1169,6 @@ export default {
<style scoped>
.intelligentSchScrView{
position: absolute;
z-index: 1;
width: 100%;
height: 100%;
overflow: hidden;
......@@ -1179,10 +1178,12 @@ export default {
.intelligentSchScrView_leftView{
height: 100%;
width: 20%;
z-index: 3;
}
.intelligentSchScrView_rightView{
height: 100%;
width: 20%;
z-index: 3;
}
.intelligentSchScrView_leftView1{
width: 100%;
......
src/views/MLargeScreen/index.vue
View file @ fcbbe8e9
......@@ -34,7 +34,8 @@
<kaungEZUIKitJs v-if="kaungEZUIKitJsShow"/>
</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> -->
<!-- <iframe src="http://192.168.0.101:3003/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
<!-- 单个车辆视频监控 -->
<div class="monitorCover1" v-show="monitorCover1Show">
<div class="monitorCover1_closePic" @click="closeMonitorCoverFn"></div>
......@@ -42,7 +43,6 @@
<video id="monitorCover1Id" width="1300" height="700" muted autoplay></video>
</div>
</div>
</div>
</template>
......@@ -97,7 +97,7 @@ export default {
this.timer = setInterval(() => {
this.setNowTimes();
}, 1000)
window.addEventListener('message', this.handleMessage);
// window.addEventListener('message', this.handleMessage);
},
methods: {
loadData() {
......@@ -318,6 +318,7 @@ export default {
top: 0px;
position: absolute;
overflow: hidden;
z-index: 2;
}
.bigScreenView{
width: 100vw;
......@@ -331,7 +332,7 @@ export default {
background:no-repeat center center url('~@/assets/images/cutGraph/top_title.png');
background-size:100% 100%;
position: relative;
z-index: 1;
z-index: 3;
}
.content_view{
width: 100%;
......@@ -343,7 +344,7 @@ export default {
.videoSelectView{
position: absolute;
top: 5.5vh;
z-index: 1;
z-index: 3;
width: 100%;
height: 5.5vh;
background-color: rgb(102,204,255);
......@@ -360,7 +361,7 @@ export default {
.jiankongView{
position: absolute;
top: 11vh;
z-index: 1;
z-index: 3;
width: 100%;
}
.top_titl_left{
......
src/views/components/echarts/bingtu3d.js 0 → 100644
View file @ fcbbe8e9
// 生成模拟 3D 饼图的配置项
// pieData（object）：饼图数据
// internalDiameterRatio（0~1之间的浮点数）：内径/外径的值（默认值 1/2），当该值等于 0 时，
// heigth配置每个数据生成的高度
export function getPie3D(pieData, internalDiameterRatio, height) {
let series = [];
let sumValue = 0;
let startValue = 0;
let endValue = 0;
let legendData = [];
let k =
typeof internalDiameterRatio !== "undefined"
? (1 - internalDiameterRatio) / (1 + internalDiameterRatio)
: 1 / 3;
//console.log(k) //internalDiameterRatio==>2时,k=-0.3333333333333333
// 计算比例
let total = 0;
for (let i = 0; i < pieData.length; i++) {
pieData[i].value=Number(pieData[i].value)
// console.log(Number(pieData[i].value))
total += Number(pieData[i].value);
}
// console.log(total)
for (let i = 0; i < pieData.length; i++) {
pieData[i].proportion =parseFloat(pieData[i].value / total).toFixed(4);
// console.log(pieData[i].proportion)
}
// 为每一个饼图数据，生成一个 series-surface 配置
for (let i = 0; i < pieData.length; i++) {
sumValue += pieData[i].value;
let seriesItem = {
name:
typeof pieData[i].name === "undefined"
? `series${i}`
: pieData[i].name,
type: "surface",
parametric: true,
wireframe: {
show: false,
},
pieData: pieData[i],
pieStatus: {
selected: pieData[i].selected?pieData[i].selected:false,
hovered: pieData[i].hovered?pieData[i].hovered:false,
k: k,
},
};
if (typeof pieData[i].itemStyle != "undefined") {
let itemStyle = {};
typeof pieData[i].itemStyle.color != "undefined"
? (itemStyle.color = pieData[i].itemStyle.color)
: null;
typeof pieData[i].itemStyle.opacity != "undefined"
? (itemStyle.opacity = pieData[i].itemStyle.opacity)
: null;
seriesItem.itemStyle = itemStyle;
}
series.push(seriesItem);
}
// 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
// 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
for (let i = 0; i < series.length; i++) {
endValue = startValue + series[i].pieData.value;
// console.log(series[i]);
series[i].pieData.startRatio = startValue / sumValue;
series[i].pieData.endRatio = endValue / sumValue;
series[i].parametricEquation = getParametricEquation(
series[i].pieData.startRatio,
series[i].pieData.endRatio,
series[i].pieStatus.selected,
series[i].pieStatus.hovered,
k,
height ? series[i].pieData.proportion *height: 1 //自己自定义传入高度，每个类型按比例生成高度
// series[i].pieData.value ==>这个是饼图默认自己生成高度
// 1 设置为1所有的扇形高度都一样高
);
startValue = endValue;
legendData.push(series[i].name);
}
// console.log(series);
return series;
}
// startRatio（浮点数）: 当前扇形起始比例，取值区间[0, endRatio)
// endRatio（浮点数）: 当前扇形结束比例，取值区间(startRatio, 1]
// isSelected（布尔值）: 是否选中，效果参照二维饼图选中效果（单选）
// isHovered（布尔值）: 是否放大，效果接近二维饼图高亮（放大）效果（未能实现阴影）
// k（0~1之间的浮点数）：用于参数方程的一个参数，取值 0~1 之间，通过「内径 / 外径」的值换算而来。
//height配置3d扇形高度
export function getParametricEquation(
startRatio,
endRatio,
isSelected,
isHovered,
k,
height
) {
// 计算
let midRatio = (startRatio + endRatio) / 2;
let startRadian = startRatio * Math.PI * 2;
let endRadian = endRatio * Math.PI * 2;
let midRadian = midRatio * Math.PI * 2;
// 如果只有一个扇形，则不实现选中效果。
if (startRatio === 0 && endRatio === 1) {
isSelected = false;
}
// 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3）
k = typeof k !== "undefined" ? k : 1 / 3;
// 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0）
let offsetX = isSelected ? Math.cos(midRadian) * 0.2 : 0;
let offsetY = isSelected ? Math.sin(midRadian) * 0.2 : 0;
// 计算高亮效果的放大比例（未高亮，则比例为 1）
let hoverRate = isHovered ? 1.05 : 1;
// 返回曲面参数方程
return {
u: {
min: -Math.PI,
max: Math.PI * 3,
step: Math.PI / 32,
},
v: {
min: 0,
max: Math.PI * 2,
step: Math.PI / 20,
},
x: function (u, v) {
if (u < startRadian) {
return (
offsetX +
Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate
);
}
if (u > endRadian) {
return (
offsetX +
Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate
);
}
return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate;
},
y: function (u, v) {
if (u < startRadian) {
return (
offsetY +
Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate
);
}
if (u > endRadian) {
return (
offsetY +
Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate
);
}
return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate;
},
z: function (u, v) {
if (u < -Math.PI * 0.5) {
return Math.sin(u);
}
if (u > Math.PI * 2.5) {
return Math.sin(u);
}
return Math.sin(v) > 0 ? 1 * height : -1;
},
};
}
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ fcbbe8e9
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<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="dayPlan" 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="nowPlan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" 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="lorry" label="卡车车数" align="center"></el-table-column>
......@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data.content;
this.total = res.data.totalElements;
}
this.tableData = res;
this.total = res.length;
})
})
......
src/views/performanceStatistics/caiquOutput/month/index.vue
View file @ fcbbe8e9
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<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="dayPlan" 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="nowPlan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" 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="lorry" label="卡车车数" align="center"></el-table-column>
......@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryMonth(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data.content;
this.total = res.data.totalElements;
}
this.tableData = res;
this.total = res.length;
})
})
......
src/views/performanceStatistics/caiquOutput/year/index.vue
View file @ fcbbe8e9
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<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="dayPlan" 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="nowPlan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" 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="lorry" label="卡车车数" align="center"></el-table-column>
......@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryYear(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data.content;
this.total = res.data.totalElements;
}
this.tableData = res;
this.total = res.length;
})
})
......
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