From c4ade1d0ab38b02d5e2945b7b7ac93d2079b92de Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 7 Sep 2022 20:17:38 +0800
Subject: [PATCH] =?UTF-8?q?CN-697=20feat:=20=E5=A2=9E=E5=8A=A0=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8url=E4=BF=9D=E5=AD=98=E9=A1=B5=E9=9D=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=AD=A4=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=AE=9E=E7=8E=B0panel=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=92=8Cnetwork=20overview=E7=9A=84App=20lis?=
 =?UTF-8?q?t=E7=9A=84metric=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/networkOverviewLine.scss    |   2 +-
 .../common/TimeRange/DateTimeRange.vue        |  12 +-
 src/utils/tools.js                            |  23 ++++
 src/views/charts2/Panel.vue                   |  39 ++++--
 .../networkOverview/NetworkOverviewApps.vue   |   7 +-
 .../networkOverview/NetworkOverviewLine.vue   | 122 +++++++++---------
 6 files changed, 124 insertions(+), 81 deletions(-)

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 @@
               <li v-for="item in dateRangeArr" @click="quickChange(item.value)"
                   :class="(item.value==dateRangeValue.value || item.value==dateRangeValue)?'active':''"
                   :key="item.value">
-                            <span style="position: relative">
-                                {{ item.name }}
-                                <i v-if="(item.value==dateRangeValue.value || item.value==dateRangeValue)"
-                                   class="cn-icon cn-icon-check"></i>
-                            </span>
+                <span style="position: relative">
+                    {{ item.name }}
+                    <i v-if="(item.value==dateRangeValue.value || item.value==dateRangeValue)"
+                       class="cn-icon cn-icon-check"></i>
+                </span>
               </li>
             </ul>
           </el-col>
@@ -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 @@
 </template>
 
 <script>
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ref } from 'vue'
 import { panelTypeAndRouteMapping, bytesColumnNameGroupForNpm, scoreUrl, customTableTitlesForAppPerformance, operationType } from '@/utils/constants'
 import { getPanelList, getChartList } from '@/utils/api'
 import { getNowTime, getSecond } from '@/utils/date-util'
 import { getTypeCategory } from '@/views/charts/charts/tools'
-import { computeScore } from '@/utils/tools'
+import { computeScore, urlParamsHandler, overwriteUrl } from '@/utils/tools'
 import ChartList from '@/views/charts2/ChartList'
 import { get } from '@/utils/http'
 
@@ -147,10 +147,9 @@ export default {
   setup (props, ctx) {
     const panel = ref({})
     let panelType = 1 // 取得panel的type
-    const { params } = useRoute()
-    const router = useRouter()
-    const thirdPanel = router.currentRoute.value.params.thirdPanel
-    const fourthPanel = router.currentRoute.value.params.fourthPanel
+    const { params, query } = useRoute()
+    const thirdPanel = params.thirdPanel
+    const fourthPanel = params.fourthPanel
     if (fourthPanel) {
       panelType = Number(fourthPanel)
     } else if (thirdPanel) {
@@ -162,10 +161,21 @@ export default {
     function isEntityDetail (t) {
       return [4, 5, 6].indexOf(t) > -1
     }
-    // date
-    const dateRangeValue = isEntityDetail(panelType) ? 60 * 24 : 60
-    const { startTime, endTime } = getNowTime(dateRangeValue)
-    const timeFilter = ref({ startTime, endTime, dateRangeValue })
+    // 获取url携带的range、startTime、endTime
+    const rangeParam = query.range
+    const startTimeParam = query.startTime
+    const endTimeParam = query.endTime
+    // 若url携带了，使用携带的值，否则使用默认值。
+    const dateRangeValue = rangeParam ? parseInt(query.range) : (isEntityDetail(panelType) ? 60 * 24 : 60)
+    const timeFilter = ref({ dateRangeValue })
+    if (!startTimeParam || !endTimeParam) {
+      const { startTime, endTime } = getNowTime(isEntityDetail(panelType) ? 60 * 24 : 60)
+      timeFilter.value.startTime = startTime
+      timeFilter.value.endTime = endTime
+    } else {
+      timeFilter.value.startTime = parseInt(startTimeParam)
+      timeFilter.value.endTime = parseInt(endTimeParam)
+    }
 
     return {
       panelType,
@@ -206,7 +216,14 @@ export default {
       }
     },
     reload (startTime, endTime, dateRangeValue) {
-      this.timeFilter = { startTime: startTime, endTime: endTime, dateRangeValue: dateRangeValue }
+      this.timeFilter = { startTime: getSecond(startTime), endTime: getSecond(endTime), dateRangeValue: dateRangeValue }
+      const { query } = this.$route
+      const newUrl = urlParamsHandler(window.location.href, query, {
+        startTime: this.timeFilter.startTime,
+        endTime: this.timeFilter.endTime,
+        range: dateRangeValue.value
+      })
+      overwriteUrl(newUrl)
     },
     timeRefreshChange () {
       // 不是自选时间
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index bb82db83..3a62ee14 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -121,7 +121,7 @@ import unitConvert from '@/utils/unit-convert'
 import { storageKey, unitTypes, networkTable, operationType } from '@/utils/constants'
 import * as echarts from 'echarts'
 import { appListChartOption } from '@/views/charts2/charts/options/echartOption'
-import { shallowRef } from 'vue'
+import { ref, shallowRef } from 'vue'
 import { get, put } from '@/utils/http'
 import { api } from '@/utils/api'
 import _ from 'lodash'
@@ -131,6 +131,7 @@ import loading from '@/components/common/Loading'
 import ChartNoData from '@/views/charts/charts/ChartNoData'
 import { appStackedLineTooltipFormatter } from '@/views/charts/charts/tools'
 import chartMixin from '@/views/charts2/chart-mixin'
+import { useRoute } from 'vue-router'
 
 export default {
   name: 'NetworkOverviewApps',
@@ -140,13 +141,15 @@ export default {
   },
   mixins: [chartMixin],
   setup () {
+    const { query } = useRoute()
+    const metricFilter = ref(query.appListMetric || 'Bits/s')
     return {
+      metricFilter,
       myChart: shallowRef([])
     }
   },
   data () {
     return {
-      metricFilter: 'Bits/s',
       metricOptions: [
         {
           value: 'Bits/s',
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
index fe78956a..47a36872 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
@@ -1,66 +1,66 @@
 <template>
   <div class="line network">
-    <chart-no-data v-if="isNoData"></chart-no-data>
-    <template v-else>
-      <div class="line-header">
-        <div class="line-header-left">
-          <div class="line-value-active" v-if="activeShow"></div>
-          <div class="line-value">
-            <div class="line-value-mpackets"
-                 v-show="item.show"
-                 :class=" {'is-active': activeShow === item.class, 'mousemove-cursor': mousemoveCursor === item.class}"
-                 v-for="(item, index) in mpackets"
-                 :key="index"
-                 @mouseenter="mouseenter(item)"
-                 @mouseleave="mouseleave(item)"
-                 @click="activeChange(item, index)">
-              <div class="line-value-mpackets-name">
-                <div :class="item.class"></div>
-                <div class="mpackets-name">{{$t(item.name)}}</div>
-              </div>
-              <div class="line-value-unit">
-                <span class="line-value-unit-number">{{unitConvert(item.analysis.avg, unitTypes.number)[0]}}</span>
-                <span class="line-value-unit-number2">
-            <span>{{unitConvert(item.analysis.avg, unitTypes.number)[1]}}</span><span v-if="item.unitType">{{item.unitType}}</span>
-          </span>
-              </div>
+    <div class="line-header">
+      <div class="line-header-left">
+        <div class="line-value-active" v-if="activeTab"></div>
+        <div class="line-value">
+          <div class="line-value-mpackets"
+               v-show="item.show"
+               :class=" {'is-active': activeTab === item.class, 'mousemove-cursor': mousemoveCursor === item.class}"
+               v-for="(item, index) in mpackets"
+               :key="index"
+               @mouseenter="mouseenter(item)"
+               @mouseleave="mouseleave(item)"
+               @click="activeChange(item, index)">
+            <div class="line-value-mpackets-name">
+              <div :class="item.class"></div>
+              <div class="mpackets-name">{{$t(item.name)}}</div>
             </div>
-          </div>
-        </div>
-        <div class="line-select line-header-right">
-          <div class="line-select-metric">
-            <span>{{$t('network.metric')}}:</span>
-            <div class="line-select__operation">
-              <el-select
-                  size="mini"
-                  v-model="value1"
-                  popper-class="common-select"
-                  :popper-append-to-body="false"
-                  @change="metricSelectChange"
-              >
-                <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
-            </div>
-          </div>
-          <div class="line-select-reference-line">
-            <span>{{$t('network.referenceLine')}}:</span>
-            <div class="line-select__operation">
-              <el-select
-                  size="mini"
-                  v-model="value2"
-                  :disabled="!activeShow"
-                  popper-class="common-select"
-                  :popper-append-to-body="false"
-                  @change="referenceSelectChange"
-              >
-                <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
+            <div class="line-value-unit">
+              <span class="line-value-unit-number">{{unitConvert(item.analysis.avg, unitTypes.number)[0]}}</span>
+              <span class="line-value-unit-number2">
+                <span>{{unitConvert(item.analysis.avg, unitTypes.number)[1]}}</span><span v-if="item.unitType">{{item.unitType}}</span>
+              </span>
             </div>
           </div>
         </div>
       </div>
+      <div class="line-select line-header-right">
+        <div class="line-select-metric">
+          <span>{{$t('network.metric')}}:</span>
+          <div class="line-select__operation">
+            <el-select
+                size="mini"
+                v-model="value1"
+                popper-class="common-select"
+                :popper-append-to-body="false"
+                @change="metricSelectChange"
+            >
+              <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="line-select-reference-line">
+          <span>{{$t('network.referenceLine')}}:</span>
+          <div class="line-select__operation">
+            <el-select
+                size="mini"
+                v-model="value2"
+                :disabled="!activeTab"
+                popper-class="common-select"
+                :popper-append-to-body="false"
+                @change="referenceSelectChange"
+            >
+              <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div style="height: calc(100% - 74px); width: 100%;">
+      <chart-no-data v-if="isNoData"></chart-no-data>
       <div class="chart-drawing" v-show="showMarkLine" id="overviewLineChart"></div>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -132,7 +132,7 @@ export default {
       unitTypes,
       chartDateObject: [],
       timer: null,
-      activeShow: '',
+      activeTab: '',
       mousemoveCursor: '',
       leftOffset: 0,
       sizes: [3, 4, 6, 8, 9, 10],
@@ -143,7 +143,7 @@ export default {
     }
   },
   watch: {
-    activeShow (n) {
+    activeTab (n) {
       this.$nextTick(() => {
         this.handleActiveBar(n)
       })
@@ -365,7 +365,7 @@ export default {
       } else {
         this.echartsLabelValue = this.echartsLabelValue
       }
-      this.activeShow = item.class
+      this.activeTab = item.class
       this.legendSelectChange(item, index, 'active')
       this.showMarkLine = !item.invertTab
       this.init(this.echartsType, this.showMarkLine, 'active')
@@ -391,7 +391,7 @@ export default {
     },
     legendSelectChange (item, index, val) {
       if (index === 'index') {
-        this.activeShow = !item.class
+        this.activeTab = !item.class
         this.dispatchLegendSelectAction(item.name)
       } else if (this.mpackets[index].name === item.name) {
         this.dispatchLegendSelectAction(item.name)
@@ -409,7 +409,7 @@ export default {
             t.invertTab = true
           }
           if (t.invertTab && item.name === t.name) {
-            this.activeShow = !t.class
+            this.activeTab = !t.class
             this.mpackets.forEach((e) => {
               this.dispatchLegendSelectAction(e.name)
             })
@@ -429,7 +429,7 @@ export default {
     },
     metricSelectChange (val) {
       this.echartsType = val
-      this.activeShow = ''
+      this.activeTab = ''
       this.handleActiveBar()
       this.showMarkLine = !this.showMarkLine
       this.init(val, this.showMarkLine)