diff --git a/src/components/LicenseTipDialog.vue b/src/components/LicenseTipDialog.vue index 7ddcc7a7..ebc25f19 100644 --- a/src/components/LicenseTipDialog.vue +++ b/src/components/LicenseTipDialog.vue @@ -17,8 +17,6 @@ - - @@ -56,7 +54,6 @@ const props = defineProps({ isLicenseExpiry: { type: Boolean, default: false }, isLicenseReadyExpiry: { type: Boolean, default: false }, isHardwareMismatch: { type: Boolean, default: false }, - isOverMaximumNodes: { type: Boolean, default: false }, isOverMaximumTags: { type: Boolean, default: false }, isDefaultLicense: { type: Boolean, default: false }, }) diff --git a/src/composables/useCheckLicense.ts b/src/composables/useCheckLicense.ts index 2fe0279e..fd480dd7 100644 --- a/src/composables/useCheckLicense.ts +++ b/src/composables/useCheckLicense.ts @@ -15,7 +15,6 @@ export default () => { const isLicenseInvalid = ref(false) const isHardwareMismatch = ref(false) const isOverMaximumTags = ref(false) - const isOverMaximumNodes = ref(false) const isDefaultLicense = ref(false) const checkLicense = async () => { @@ -31,7 +30,6 @@ export default () => { isHasLicense.value = !(Number(error) === 2400) // no License isLicenseInvalid.value = Number(error) === 2401 // Invalid isLicenseExpiry.value = Number(error) === 2402 // expired - isOverMaximumNodes.value = Number(error) === 2404 // over Maximum nodes isOverMaximumTags.value = Number(error) === 2405 // over Maximum Tags isHardwareMismatch.value = Number(error) === 2406 // hardware mismatch @@ -43,7 +41,6 @@ export default () => { isLicenseInvalid.value || isLicenseExpiry.value || isHardwareMismatch.value || - isOverMaximumNodes.value || isOverMaximumTags.value || isLicenseReadyExpiry.value || isDefaultLicense @@ -65,7 +62,6 @@ export default () => { isLicenseExpiry, isLicenseReadyExpiry, isHardwareMismatch, - isOverMaximumNodes, isOverMaximumTags, isDefaultLicense, } diff --git a/src/views/about/License.vue b/src/views/about/License.vue index e3855c6c..1488fc9a 100644 --- a/src/views/about/License.vue +++ b/src/views/about/License.vue @@ -15,11 +15,11 @@ {{ licenseData.object }} - + {{ licenseData.used_tags }} / {{ licenseData.max_node_tags }} @@ -121,12 +121,10 @@ const getLicense = async () => { isDataLoading.value = true const { data } = await queryLicense() const { error, ...license } = data - const { max_nodes, used_nodes, used_tags, max_node_tags } = license - const nodesUsage = parseFloat((Number(used_nodes) / Number(max_nodes)).toFixed(2)) * 100 + const { used_tags, max_node_tags } = license const tagsUsage = parseFloat((Number(used_tags) / Number(max_node_tags)).toFixed(2)) * 100 licenseData.value = { ...license, - nodesUsage, tagsUsage, } } catch (error) { diff --git a/src/views/config/southDriver/Index.vue b/src/views/config/southDriver/Index.vue index e0d03f37..5b636167 100644 --- a/src/views/config/southDriver/Index.vue +++ b/src/views/config/southDriver/Index.vue @@ -186,7 +186,6 @@ :isLicenseExpiry="isLicenseExpiry" :isLicenseReadyExpiry="isLicenseReadyExpiry" :isHardwareMismatch="isHardwareMismatch" - :isOverMaximumNodes="isOverMaximumNodes" :isOverMaximumTags="isOverMaximumTags" :isDefaultLicense="isDefaultLicense" /> @@ -311,7 +310,6 @@ const { isLicenseReadyExpiry, isLicenseInvalid, isHardwareMismatch, - isOverMaximumNodes, isOverMaximumTags, isDefaultLicense, } = useCheckLicense()