Commit e2414e39 authored by xxx's avatar xxx

修改

parent 9020a08d
......@@ -2518,11 +2518,22 @@ var HttpReq = function(){
params:param,
})
},
//大屏组件7接口
apiManmadesChanjiedanYearQuery: function(param){
return request({
url: '/api/Manmades/ChanjiedanYear',
method: 'get',
params:param,
})
},
//大屏组件26接口
apiAreaNewBlQuery: function(param){
return request({
url: '/api/AreaNew/Bl',
method: 'get',
params:param,
})
},
......
......@@ -196,7 +196,7 @@ export default {
data: [
//value当前进度 + 颜色
{
value: this.truckDynamicListData.rate ? this.truckDynamicListData.rate : 0,
value: this.truckDynamicListData.rate ? (parseFloat(this.truckDynamicListData.rate) > 100 ? 100 : this.truckDynamicListData.rate) : 0,
itemStyle: {
normal: {
color: 'rgb(2,220,251)'
......@@ -205,7 +205,7 @@ export default {
},
//(maxValue进度条最大值 - value当前进度) + 颜色
{
value: maxValue - parseInt(this.truckDynamicListData.rate ? this.truckDynamicListData.rate : 0),
value: maxValue - parseInt(this.truckDynamicListData.rate ? (parseFloat(this.truckDynamicListData.rate) > 100 ? 100 : this.truckDynamicListData.rate) : 0),
itemStyle: {
normal: {
color: 'rgb(0,34,125)'
......
......@@ -119,6 +119,7 @@ export default {
},
yAxis: {
type: 'value',
minInterval: 1,
axisLabel: {
show: true,
textStyle: {
......
......@@ -38,7 +38,17 @@ export default {
HttpReq.truckDispatching.caiquAreaQueryDay({size:6,page:0,sort:'total,desc',createTime:this.currentTime.day}).then((res) => {
let eh2_arr1 = [];
let eh2_arr2 = [];
res.forEach((item)=>{
let transitionData1 = [];
res.forEach((item,index)=>{
if(!item.total){
item.total = 0;
}
transitionData1.push(item)
})
let transitionData2 = transitionData1.sort(function(a,b){
return a.total - b.total;
})
transitionData2.forEach((item)=>{
eh2_arr1.push(item.name);
eh2_arr2.push(item.total);
})
......@@ -52,7 +62,17 @@ export default {
HttpReq.truckDispatching.caiquAreaQueryDay({size:6,page:0,sort:'total,desc',createTime:this.currentTime.day}).then((res) => {
let eh2_arr1 = [];
let eh2_arr2 = [];
res.forEach((item)=>{
let transitionData1 = [];
res.forEach((item,index)=>{
if(!item.total){
item.total = 0;
}
transitionData1.push(item)
})
let transitionData2 = transitionData1.sort(function(a,b){
return a.total - b.total;
})
transitionData2.forEach((item)=>{
eh2_arr1.push(item.name);
eh2_arr2.push(item.total);
})
......@@ -60,7 +80,7 @@ export default {
this.outputRankData.caiquSeriesData = eh2_arr2;
this.echarts2_1Fn();
})
},20000)
},60000)
},
//各采区日产量排名
......
......@@ -169,7 +169,7 @@ export default {
this.reconnect();
}, 20000)
//与嵌入的地图页面进行交互
window.addEventListener('message', this.handleMessage);
//window.addEventListener('message', this.handleMessage);
},
methods: {
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