-
+
@@ -115,8 +111,8 @@
-
- {{$t("login.login")}}
+ {{$t("login.login")}}
@@ -64,11 +64,11 @@
>
@@ -83,6 +83,7 @@
v-model="scope.row.state"
active-value="ON"
inactive-value="OFF"
+ :disabled="!hasButton('dc_toEdit')"
active-color="#ee9d3f"
@change="(val)=>{statusChange(scope.row)}"
/>
@@ -130,7 +131,7 @@
@@ -41,6 +41,7 @@ export default {
password: '',
remember: false
},
+ loading: false,
lang: localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en', //en/cn
langListShow: false,
}
@@ -48,7 +49,11 @@ export default {
methods: {
...mapActions(["loginSuccess"]),
login() {
+ if (this.loading) {
+ return;
+ }
if (this.validateLogin()&&(this.$route.path=='/'||this.$route.path=='/login')) {
+ this.loading = true;
this.$post('sys/login', this.loginData).then(res => {
if (res.code == 200) {
//登录成功,记录用户名、token和lang
@@ -60,6 +65,8 @@ export default {
} else {
this.$message.error(res.msg);
}
+ }).finally(() => {
+ this.loading = false;
});
}
},
@@ -202,6 +209,10 @@ export default {
color: white;
cursor: pointer;
}
+.login-foot .el-loading-spinner {
+ width: 36px;
+ height: 36px;
+}
.login-foot-lang-list::before {
content: " ";
width: 0px;
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index 1bbfc520b..e1b309028 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -12,7 +12,7 @@
- {{$t('project.topology.save')}}
+ {{$t('project.topology.save')}}
{{$t('project.topology.cancel')}}
{{$t('project.topology.selTwoNode')}} {{$t('project.topology.cancel')}}
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 46f1ff98d..fa5c0f1f5 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -24,7 +24,7 @@
-
-
+
-
+
diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue
index 40fe8dfd4..1cd3d4c61 100644
--- a/nezha-fronted/src/components/common/rightBox/accountBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue
@@ -2,7 +2,7 @@
@@ -76,7 +76,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 42ae8d3b7..a945a9037 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -2,7 +2,7 @@
-
+
-
@@ -98,8 +99,8 @@
P1
@@ -136,7 +137,7 @@
-
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 9b178ef91..03eee5ce0 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -26,11 +26,11 @@
-
-
+
@@ -41,6 +41,7 @@
:tableHeight="mainTableHeight"
:tableId="tableId"
@tableDataSort="tableDataSort"
+ :from="$CONSTANTS.fromRoute.message"
@deleteMessage="deleteMessage"
@select-change="(selection)=>{this.batchDeleteObjs=selection}"
>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index a98efcd20..019203892 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -10,17 +10,18 @@
export-url="/asset/export"
import-url="/asset/import"
:params="searchLabel"
+ :permissions="{import: 'asset_import', export: 'asset_export'}"
@afterImport="afterTableListChange"
>
-
+
-
+
-
+
@@ -147,22 +148,22 @@
class="nz-icon nz-icon-view">
-
-
-
+
-
- {{account.protocol}}
-
-
+
+ {{account.protocol}}
+
+
@@ -180,7 +181,7 @@
-
-
-
+
@@ -68,11 +68,9 @@
{{scope.row[item.prop] == 'en' ? 'English' : ''}}
@@ -88,7 +86,7 @@
active-value="1"
inactive-value="0"
active-color="#ee9d3f"
- :disabled="isCurrentUser(scope.row.username)"
+ :disabled="isCurrentUser(scope.row.username) || !hasButton('account_toEdit')"
@change="(val)=>{statusChange(scope.row)}">
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 8da53c217..439b55992 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -13,11 +13,11 @@
-
@@ -66,7 +66,7 @@
class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
{{$t('overall.cancel')}}
-
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index 4bae6dc10..bc7f15adc 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -295,7 +295,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
index 29be2f1a7..b87ebebd7 100644
--- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -111,7 +111,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index 397f34fd8..80605b29e 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -2,7 +2,7 @@
-
{{$t('overall.delete')}}
@@ -61,7 +61,7 @@
@change="modelChange"
>
-
+
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
index f9d358937..000e3d26a 100644
--- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
@@ -2,7 +2,7 @@
@@ -154,7 +154,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue
index 7d1954eb6..2bc4587ed 100644
--- a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue
@@ -251,7 +251,7 @@
-
+
{{$t('overall.delete')}}
@@ -36,7 +36,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index 20b029461..69a75261e 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -82,7 +82,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
index 15691acfb..23fffc4b3 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -127,7 +127,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue
index b20a213bb..4cb2f7ed5 100644
--- a/nezha-fronted/src/components/common/rightBox/mibBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -51,7 +51,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/modelBox.vue b/nezha-fronted/src/components/common/rightBox/modelBox.vue
index b41897097..f88d66cae 100644
--- a/nezha-fronted/src/components/common/rightBox/modelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/modelBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -34,9 +34,9 @@
{{item.value}}
@@ -57,9 +57,9 @@
{{item.value}}
-
-
-
+
+
+
-
-
-
+
+
+
-
+
{{$t('overall.delete')}}
@@ -308,7 +308,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index 877ff080a..e1936fe00 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -3,7 +3,7 @@
-
+
{{$t('overall.delete')}}
@@ -29,7 +29,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue
index 32a5628f4..78f71dd0f 100644
--- a/nezha-fronted/src/components/common/rightBox/projectBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue
@@ -2,7 +2,7 @@
-
+
{{$t('overall.delete')}}
@@ -28,7 +28,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/promServerBox.vue b/nezha-fronted/src/components/common/rightBox/promServerBox.vue
index 1e14306b4..8575a3f31 100644
--- a/nezha-fronted/src/components/common/rightBox/promServerBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/promServerBox.vue
@@ -2,7 +2,7 @@
-
@@ -57,7 +57,7 @@
class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
{{$t('overall.cancel')}}
-
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
index 8147218a0..4534ab18a 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
@@ -19,7 +19,7 @@
{{$t('overall.cancel')}}
-
+
{{$t('overall.save')}}
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index d2015ec6a..792502cdf 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -33,16 +33,17 @@