monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 2dfc82a511d730e2d95390ffe4a18119bba2c9bb 2 parents bfba23ad 02d38826

Merge branch 'master-v32-lushangqing' into 'master' 

时间范围组件获取聚合频率更改



See merge request !370
Inline Side-by-side
Showing 3 changed files with 101 additions and 24 deletions
... ... @@ -9,8 +9,8 @@
range-separator="--"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="YYYY-MM-DD hh:mm:ss"
value-format="YYYY-MM-DD hh:mm:ss"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="shortcuts"
@change="changeDate"
size="small"
... ...
... ... @@ -61,7 +61,7 @@ export default {
//自定义选择时间
let dateValue=Vue.ref([]);
//选中的聚合频率
let checkedId=Vue.ref();
let checkedId=Vue.ref(0);
let commandVal=Vue.ref('聚合频率')
//聚合频率选择
// const changeItem=(val,name)=>{
... ... @@ -160,15 +160,7 @@ export default {
const start = formatDate(12,'M');
return [start, end]
},
},
{
text: '全部',
value: () => {
const end = new Date();
const start = ''
return [start, end]
},
},
}
])
//开始时间
let startTime=Vue.ref();
... ... @@ -191,19 +183,18 @@ export default {
}
//计算需要传参的code值
const calcCode=(val)=>{
console.log("&&",val)
let code='';
if(val>0 && val<7){
if(val>0 && val<3){
code='time_scope_DAY';
}else if(val>=7 && val<30){
}else if(val>=3 && val<7){
code='time_scope_WEEK';
}else if(val>=30 && val<90){
}else if(val>=7 && val<30){
code='time_scope_MONTH';
}else if(val>=90 && val<180){
}else if(val>=30){
code='time_scope_QUARTER';
}else if(val>=180 && val<365){
code='time_scope_SEMESTER';
}else if(val>=365){
code='time_scope_YEAR';
}else{
code='time_scope_MIN';
}
return code;
}
... ... @@ -285,12 +276,98 @@ export default {
}else{
oneDay();
}
if(props.intervalGroup){
checkedId.value=props.intervalGroup;
}
}
//获取聚合频率数据
const getRate=(defCode)=>{
let param = {
let resData=[
{
ddicId:'001',
ddicDesc:'0',
ddicName:'不聚合',
code:'time_scope_MIN'
},
{
ddicId:'002',
ddicDesc:'5',
ddicName:'5分钟',
code:'time_scope_MIN'
},
{
ddicId:'003',
ddicDesc:'10',
ddicName:'10分钟',
code:'time_scope_MIN'
},
{
ddicId:'004',
ddicDesc:'15',
ddicName:'15分钟',
code:'time_scope_MIN'
},
{
ddicId:'005',
ddicDesc:'30',
ddicName:'30分钟',
code:'time_scope_DAY'
},
{
ddicId:'006',
ddicDesc:'60',
ddicName:'1小时',
code:'time_scope_DAY'
},
{
ddicId:'007',
ddicDesc:'180',
ddicName:'3小时',
code:'time_scope_WEEK'
},
{
ddicId:'008',
ddicDesc:'360',
ddicName:'6小时',
code:'time_scope_WEEK'
},
{
ddicId:'009',
ddicDesc:'720',
ddicName:'12小时',
code:'time_scope_MONTH'
},
{
ddicId:'010',
ddicDesc:'1440',
ddicName:'1天',
code:'time_scope_MONTH'
},
{
ddicId:'011',
ddicDesc:'1440',
ddicName:'1天',
code:'time_scope_QUARTER'
}
]
let resDataArr=[];
resData.map(item=>{
if(defCode==item.code){
resDataArr.push(item)
}
})
frequencyData.value = resDataArr;
console.log("999",frequencyData.value.length,props.intervalGroup)
if(frequencyData.value.length>0){
if(!props.intervalGroup){
console.log("369",frequencyData.value[0].ddicDesc)
checkedId.value=frequencyData.value[0].ddicDesc
}
}
sureBtn();
/*let param = {
ddicName: defCode
}
proxy.$http.get(`/api-web/ContrastAnalysis/selectTogetherRate`, param, function (res) {
... ... @@ -304,7 +381,7 @@ export default {
}
sureBtn();
});
});*/
}
const oneDay=()=>{
... ...
... ... @@ -114,8 +114,8 @@ export default {
Object.keys(resData[key]).sort(function (a, b) {
return a<b?1:-1;
}).forEach(function(time){
nameArr.push(time);
dataArr.push(resData[key][time])
nameArr.unshift(time);
dataArr.unshift(resData[key][time])
})
})
rateData.value = {
... ...