diff --git a/src/assets/css/components/views/charts2/networkOverviewLine.scss b/src/assets/css/components/views/charts2/networkOverviewLine.scss
index 43f07ffa..29f31ce0 100644
--- a/src/assets/css/components/views/charts2/networkOverviewLine.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewLine.scss
@@ -4,7 +4,7 @@
border: 1px solid #E2E5EC;
border-radius: 4px;
.chart-drawing {
- height: 80%;
+ height: 100%;
width: 100%;
.echarts-tooltip.echarts-tooltip-dark {
.cn-chart-body {
diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index dab15a6b..afefa6de 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -59,11 +59,11 @@
-
- {{ item.name }}
-
-
+
+ {{ item.name }}
+
+
@@ -118,7 +118,7 @@ export default {
const utc = localStorage.getItem(storageKey.timezoneOffset)
const rangeHistory = ref(localStorage.getItem(storageKey.dataRangeHistory) ? JSON.parse(localStorage.getItem(storageKey.dataRangeHistory)) : [])
const dateRangeValue = props.dateRange ? ref(props.dateRange) : ref(60)
- const isCustom = ref(false)
+ const isCustom = ref(dateRangeValue.value === -1)
const dateRangeArr = [
{
value: 5,
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 3aeda473..3021b6e1 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -836,3 +836,26 @@ export function computeScore (data, index) {
}
return score * k
}
+
+// cleanOldParams: true|false,是否清除oldParams
+export function urlParamsHandler (url, oldParams, newParams, cleanOldParams) {
+ let newUrl = url.split('?')[0]
+ let params
+ if (cleanOldParams) {
+ params = newParams
+ } else {
+ params = Object.assign(oldParams, newParams)
+ }
+ if (Object.keys(params).length > 0) {
+ newUrl += '?'
+ Object.keys(params).forEach(key => {
+ newUrl += `${key}=${newParams[key]}&`
+ })
+ newUrl = newUrl.substring(0, newUrl.length - 1)
+ }
+ return newUrl
+}
+
+export function overwriteUrl (url) {
+ window.history.pushState('', '', url)
+}
diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index a4b70630..10ff3e1c 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -38,13 +38,13 @@