|
|
@@ -125,7 +125,8 @@ export const initQueryParams = params => {
|
|
|
|
|
|
},
|
|
|
map: {},
|
|
|
- timeRange: null
|
|
|
+ timeRange: null,
|
|
|
+ timeRange1: null
|
|
|
};
|
|
|
return params ? { ...defParams, ...params } : defParams;
|
|
|
}
|
|
|
@@ -135,7 +136,7 @@ export const arrReduce = (arr, field) => {
|
|
|
let obj = {} // 用来存放已经出现过的id
|
|
|
return arr.reduce((pre, cur) => {
|
|
|
if(!obj[cur[field]]) { // obj没有cur的id则放入数组
|
|
|
- obj[cur[field]] = true
|
|
|
+ obj[cur[field]] = true
|
|
|
return [...pre, cur]
|
|
|
} else {
|
|
|
return pre
|
|
|
@@ -152,12 +153,12 @@ export const arrSort = (arr, field) => {
|
|
|
export const fullScreen = ($elDom) => {
|
|
|
let rfs = $elDom.requestFullScreen || $elDom.webkitRequestFullScreen || $elDom.mozRequestFullScreen || $elDom.msRequestFullScreen,
|
|
|
wscript;
|
|
|
-
|
|
|
+
|
|
|
if(typeof rfs != "undefined" && rfs) {
|
|
|
rfs.call($elDom);
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(typeof window.ActiveXObject != "undefined") {
|
|
|
wscript = new ActiveXObject("WScript.Shell");
|
|
|
if(wscript) {
|
|
|
@@ -165,18 +166,18 @@ export const fullScreen = ($elDom) => {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//退出全屏
|
|
|
export const exitFullScreen = () => {
|
|
|
let el= document,
|
|
|
cfs = el.cancelFullScreen || el.webkitCancelFullScreen || el.mozCancelFullScreen || el.exitFullScreen,
|
|
|
wscript;
|
|
|
-
|
|
|
+
|
|
|
if (typeof cfs != "undefined" && cfs) {
|
|
|
cfs.call(el);
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (typeof window.ActiveXObject != "undefined") {
|
|
|
wscript = new ActiveXObject("WScript.Shell");
|
|
|
if (wscript != null) {
|
|
|
@@ -251,7 +252,7 @@ export const percentPie = (data) => {
|
|
|
]
|
|
|
}]
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
echarts.init(_that.domEle).setOption(option);
|
|
|
}
|
|
|
|
|
|
@@ -262,4 +263,4 @@ export const randomFloor = (min, max, fiexd) => {
|
|
|
nums.toFixed(fiexd)
|
|
|
}*/
|
|
|
return nums
|
|
|
-}
|
|
|
+}
|
yejian