Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue

nezha-fronted/src/components/common/pickTime.vue

@@ -14,7 +14,7 @@
         <transition name="el-zoom-in-top">
           <ul v-show="dropdownShow" class="el-dropdown-menu el-popper el-dropdown-menu--mini nz-dropdown">
             <li v-for="i in $CONSTANTS.intervalList" :key="i.value + i.label" :style="{color:interval === i.value || interval.value === i.value ? theme.themeColor : ''}" class="el-dropdown-menu__item dropdown-content" @click="selectInterval(i)">
-              {{i.label}}
+              {{$t(i.label)}}
             </li>
           </ul>
         </transition>
@@ -28,7 +28,6 @@ import bus from '../../libs/bus'
 import timePicker from './timePicker'
 import multipleTime from './multipleTime'
 import chartUnit from './chartUnit'
-let timeout
 export default {
   name: 'pickTime',
   components: {
@@ -92,6 +91,7 @@ export default {
   methods: {
     selectInterval (val) {
       this.visible = false
+      clearInterval(this.intervalTimer)
       this.interval = val.value
       this.interLabel = val.label
       if (!this.showTimePicker && val && val.value != -1) {