diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index f0e655a12..b54d70c41 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -326,6 +326,9 @@
 .dc-dropdown.right-public-box-dropdown-top,.right-public-box-select-top.right-public-box-dropdown-top {
   margin: 5px 0 !important;
 }
+.agent-select {
+  z-index: 2200 !important;
+}
 .popper__arrow {
   opacity: 0;
 }
diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 1e2a4dfa3..91c37d324 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -315,7 +315,7 @@
     overflow: auto;
   }
   .el-table__fixed-body-wrapper {
-    top: 42px !important;
+    top: 41px !important;
   }
   .el-table__body-wrapper, .el-table__fixed-body-wrapper {
     box-shadow: 1px 0 $--right-box-border-color;
diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
index 2449de27f..741761b97 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="{'height': height + 'px'}" class="search-box__container">
-    <div v-for="(data, type, index) in titleSearchListCopy" v-cloak :key="index" ref="searchContentBox" class="search-content-box">
+    <div v-for="(data, type, index) in titleSearchListCopy" v-cloak :key="index" ref="searchContentBox" :class="{'search-content-box-height': data.length == 0}" class="search-content-box">
       <label class="search-title">{{data.label}}:</label>
       <el-skeleton v-if="data.type === 'checkBox'" :class="skeletonClass(data)" :loading="!data.show" :rows="1" class="search-items">
         <template>
@@ -372,14 +372,16 @@ export default {
   position: fixed;
   visibility: hidden;
 }
-.search-content-box {
+.search-content-box-height.search-content-box {
+  min-height: 31px;
+}
+.search-content-box,.search-content-box-height {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
   position: relative;
   padding: 5px 80px 5px 130px;
   width: calc(100vw - 333px);
-  min-height: 31px;
   box-sizing: border-box;
 
   /deep/ .el-checkbox__label {
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 3670e91cd..cac19518b 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1416,6 +1416,7 @@ const cn = {
       scrape_interval_placeholder: '默认全局时间间隔',
       scrape_timeout: '超时时间',
       scrape_timeout_placeholder: '默认全局超时时间',
+      protocol: '协议',
       type: '类型',
       bearer_token: 'bearer token',
       username: '用户名',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index ceeb45907..66ac42bc9 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1420,6 +1420,7 @@ const en = {
       scrape_interval_placeholder: 'default global scrape interval',
       scrape_timeout: 'Scrape timeout',
       scrape_timeout_placeholder: 'default global scrape timeout',
+      protocol: 'Protocol',
       type: 'Type',
       bearer_token: 'bearer token',
       username: 'Username',
diff --git a/nezha-fronted/src/components/common/popBox/selectWalk.vue b/nezha-fronted/src/components/common/popBox/selectWalk.vue
index e3cb5df9d..ba2708309 100644
--- a/nezha-fronted/src/components/common/popBox/selectWalk.vue
+++ b/nezha-fronted/src/components/common/popBox/selectWalk.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover :disabled="disabled" @show="tempWalk.detailShow = false" v-if="popBox.show" :placement="placement" width="367" ref="selectWalkPopBox" popper-class="nz-pop nz-pop-select-walk" transition="slide">
+  <el-popover :disabled="disabled" @show="tempWalk.detailShow = false" v-if="popBox.show" :placement="placement" width="367" ref="selectWalkPopBox" popper-class="right-public-box-select-top right-public-box-dropdown-top nz-pop nz-pop-select-walk" transition="slide">
     <div class="pop-item-wider" @click="tempWalk.detailShow = false">
       <div v-if="tempWalk.detailShow" class="el-popover walk-pop" :style="{left: detailPopPosition.left, top: detailPopPosition.top}">
         <p><span class="metirc-tip-list">Name&nbsp;:&nbsp;</span><span>{{tempWalk.name}}</span></p>
diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
index 695f472a3..f795572c8 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -52,6 +52,21 @@
           <el-form-item :label="$t('config.user.mobile')" prop="mobile">
             <el-input id="account-input-mobile" v-model="editUser.mobile" maxlength="64" show-word-limit placeholder="" size="small" type="text"></el-input>
           </el-form-item>
+          <!--language-->
+          <el-form-item :label="$t('config.user.language')" prop="lang">
+            <el-select id="account-input-language"
+                       class="right-box__select"
+                       v-model="editUser.lang"
+                       clearable
+                       collapse-tags
+                       placeholder=""
+                       popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
+                       size="small">
+              <template v-for="item in languageList">
+                <el-option :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </template>
+            </el-select>
+          </el-form-item>
           <!--roles-->
           <el-form-item :label="$t('config.user.roles')" prop="roleIds">
             <el-select id="account-input-roleIds"
@@ -171,6 +186,10 @@ export default {
         { value: 0, label: this.$t('config.user.disable') },
         { value: 1, label: this.$t('config.user.enableMfa') },
         { value: 2, label: this.$t('config.user.forceEnable') }
+      ],
+      languageList: [
+        { value: 'en', label: 'English' },
+        { value: 'cn', label: '简体中文' }
       ]
     }
   },
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index aa5961c14..b3110938f 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -111,7 +111,7 @@
             <el-tabs v-model="activeName" v-show="metricsShow" v-if="editEndpoint.configs[0].enable">
               <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
                 <!--type-->
-                <el-form-item :label='$t("project.endpoint.type")' class="half-form-item" prop="type">
+                <el-form-item :label='$t("project.endpoint.protocol")' class="half-form-item" prop="type">
                   <el-select id="module-box-input-type" v-model="editEndpoint.configs[0].config.protocol" :disabled="!!editEndpoint.id || true" class="right-box__select" placeholder="" popper-class="prevent-clickoutside" size="small" value-key="id">
                     <el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
                   </el-select>
@@ -122,7 +122,7 @@
                 </el-form-item>
                 <!--path-->
                 <el-form-item :label='$t("project.endpoint.path")' class="half-form-item" prop="configs.metrics_path">
-                  <el-input id="module-box-input-path" v-model="editEndpoint.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editEndpoint.configs[0].config.protocol != 'http'"></el-input>
+                  <el-input id="module-box-input-path" v-model="editEndpoint.configs[0].config.metrics_path" placeholder="" size="small" :disabled="editEndpoint.configs[0].config.protocol === 'snmp'"></el-input>
                 </el-form-item>
                 <!--port-->
                 <el-form-item :label='$t("project.endpoint.port")' class="half-form-item" prop="configs.0.config.port" :rules="[
@@ -685,6 +685,10 @@ export default {
         {
           value: 'snmp',
           name: 'SNMP'
+        },
+        {
+          value: 'https',
+          name: 'HTTPS'
         }
       ],
       logsBasicList: [
@@ -912,7 +916,7 @@ export default {
         return
       }
       this.editEndpoint.type = type
-      if (type == 'http') {
+      if (type !== 'snmp') {
         this.editEndpoint.port = 9100
       } else {
         this.$nextTick(() => {
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 7f6b2e7a8..34ebacf1c 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -92,7 +92,7 @@
             <el-tabs v-model="activeName" v-show="metricsShow" v-if="editModule.configs[0].enable">
             <el-tab-pane :label="$t('project.endpoint.basic')" name="Basic">
               <!--type-->
-              <el-form-item :label='$t("project.endpoint.type")' class="half-form-item" prop="type">
+              <el-form-item :label='$t("project.endpoint.protocol")' class="half-form-item" prop="type">
                 <el-select id="module-box-input-type" v-model="editModule.configs[0].config.protocol" :disabled="!!editModule.id" class="right-box__select" placeholder="" popper-class="right-box-select-top right-public-box-dropdown-top right-box-public-dropdown prevent-clickoutside" size="small" value-key="id" @change="changeBasicType">
                   <el-option v-for="item in typeList" :id="'module-type-'+item.id" :key="item.value" :label="item.name" :value="item.value"></el-option>
                 </el-select>
@@ -658,6 +658,10 @@ export default {
         {
           value: 'snmp',
           name: 'SNMP'
+        },
+        {
+          value: 'https',
+          name: 'HTTPS'
         }
       ],
       logsBasicList: [
@@ -847,7 +851,7 @@ export default {
         return
       }
       this.editModule.type = type
-      if (type !== 'http') {
+      if (type == 'snmp') {
         this.$refs.selectWalk.show()
       }
     },
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index d1876a25c..e914a7096 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -144,6 +144,11 @@ export default {
           prop: 'source',
           show: true,
           width: 150
+        }, {
+          label: this.$t('config.user.language'),
+          prop: 'lang',
+          show: true,
+          width: 150
         }, {
           label: this.$t('config.user.enable'),
           prop: 'status',
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index 5fbd22b10..27a1461e8 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -49,7 +49,7 @@
           <div class="right-box-sub-title">{{$t('config.agent.agent.download')}}</div>
           <div style="margin-bottom: 20px;width: 100%"></div>
           <el-form-item :label="$t('config.agent.agent.osType')" class="half-form-item" prop="osType">
-            <el-select v-model="agentParam.osType" style="z-index: 9999 !important;" class="right-box-row-with-btn" popper-class="right-public-box-select-top right-public-box-dropdown-top" placeholder="">
+            <el-select v-model="agentParam.osType" class="right-box-row-with-btn" popper-class="right-public-box-select-top agent-select right-public-box-dropdown-top" placeholder="">
               <el-option v-for="item in osTypes" :key="item.name" :label="item.label" :value="item.name">
                 <span class="panel-dropdown-label-txt" >{{item.label}}</span>
               </el-option>
@@ -62,14 +62,14 @@
           <div style="margin-bottom: 20px;width: 100%"></div>
 
           <el-form-item :label="$t('config.dc.dc')" class="half-form-item" prop="dc">
-            <el-select v-model="agentParam.dc" style="z-index: 9999 !important;" class="right-box-row-with-btn" popper-class="right-public-box-select-top right-public-box-dropdown-top" placeholder="">
+            <el-select v-model="agentParam.dc" class="right-box-row-with-btn" popper-class="right-public-box-select-top agent-select right-public-box-dropdown-top" placeholder="">
               <el-option v-for="item in allDc" :key="item.id" :label="item.name" :value="item.id">
                 <span class="panel-dropdown-label-txt" >{{item.name}}</span>
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('config.agent.agent.type')" class="half-form-item" prop="type">
-            <el-select v-model="agentParam.type" style="z-index: 9999 !important;" class="right-box-row-with-btn" popper-class="right-public-box-select-top right-public-box-dropdown-top" placeholder="">
+            <el-select v-model="agentParam.type" class="right-box-row-with-btn" popper-class="right-public-box-select-top agent-select right-public-box-dropdown-top" placeholder="">
               <el-option v-for="item in agent2.theData" :key="item.value" :label="item.label" :value="item.value" :disabled="federationEnabled && item.value == 2">
                 <span class="panel-dropdown-label-txt" >{{item.label}}</span>
               </el-option>
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index b3ee8425f..492c4855f 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -159,21 +159,23 @@ export default {
           label: this.$t('profile.role'),
           prop: '',
           icon: 'nz-icon nz-icon-role profile-role'
-        },
-        {
+        }, {
           id: 2,
           label: this.$t('profile.email'),
           prop: '',
           icon: 'nz-icon nz-icon-email profile-email'
-        },
-        {
+        }, {
           id: 3,
           label: this.$t('profile.mobile'),
           prop: '',
           icon: 'nz-icon nz-icon-mobile profile-mobile'
-        },
-        {
+        }, {
           id: 4,
+          label: this.$t('config.user.language'),
+          prop: '',
+          icon: 'nz-icon nz-icon-language-change'
+        }, {
+          id: 5,
           label: this.$t('profile.source'),
           prop: '',
           icon: 'nz-icon nz-icon-laiyuan profile-laiyuan'
@@ -210,7 +212,12 @@ export default {
             this.tableProfile[0].prop = this.userList.roles[0].i18n
             this.tableProfile[1].prop = this.userList.email
             this.tableProfile[2].prop = this.userList.mobile
-            this.tableProfile[3].prop = this.userList.source
+            if (this.userList.lang == 'cn') {
+              this.tableProfile[3].prop = '简体中文'
+            } else {
+              this.tableProfile[3].prop = 'English'
+            }
+            this.tableProfile[4].prop = this.userList.source
             const name = this.userList.name.substr(0, 1)
             this.profileName = name
           }
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index 2aff22124..118d14aa2 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -74,9 +74,9 @@ export default {
         receiver: [],
         roleIds: '',
         roles: [],
-        lang: '',
         notifications: [],
-        mfaLevel: 0
+        mfaLevel: 0,
+        lang: 'English'
       },
       tableId: 'userTable',
       searchMsg: { // 给搜索框子组件传递的信息
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 6806e3ddd..db7bfc178 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -22,7 +22,7 @@
             </el-cascader-panel>
             <el-cascader-panel v-else v-show="dropDownVisible" ref="metricSelector" slot="dropdown"
                                v-model="cascaderValue" v-clickoutside="closeDropdown" v-loading="tempBoxShowLoading"
-                               :loading="loading" :props="cascaderProps" @change="logLabelChange">
+                               :loading="loading" :props="cascaderProps" @change="logLabelChange" style="margin-top: 5px;">
               <template slot-scope="{ node, data }">
                 <div :title="data.label" class="nz-cascade">
                   {{data.label}}
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
index 5d31e4282..222e57e06 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -1170,9 +1170,17 @@ export default {
           this.$refs.dataCenterMap.setOption({ geo: { zoom: value } })
         }
       }
+    },
+    fullScreenChange () {
+      if (document.fullscreenElement) {
+        this.isFullScreen = true
+      } else {
+        this.isFullScreen = false
+      }
     }
   },
   mounted () {
+    document.addEventListener('fullscreenchange', this.fullScreenChange)
     this.initData()
     this.querySystemState().then(() => {
       this.initDate()
@@ -1180,6 +1188,7 @@ export default {
   },
   beforeDestroy () {
     this.allProject = []
+    document.removeEventListener('fullscreenchange', this.fullScreenChange)
   },
   destroyed () {
     clearInterval(this.freshDataTimer)
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index f990d0d64..92d98c9e3 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -11,6 +11,7 @@ err => Promise.reject(err)
 )
 const accountErrorCode = [518003, 518004, 518005, 518006, 518007, 518008] // 账号锁定等
 const licenceErrorCode = [711001]
+const noJumpPath = ['#/','#/login']
 
 // 若get请求的url中带问号，则将url上的参数截取，改为对象形式传参
 axios.interceptors.request.use(
@@ -47,10 +48,10 @@ axios.interceptors.request.use(
 )
 axios.interceptors.response.use(
   response => {
-    if (licenceErrorCode.indexOf(response.data.code) !== -1) {
+    if (licenceErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.hash) == -1) {
       window.location.href = '/'
     } else if (response.status === 200) {
-      if (accountErrorCode.indexOf(response.data.code) !== -1) {
+      if (accountErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.hash) == -1) {
         window.location.href = '/'
       }
     }