diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 99f9198d1..5035175e9 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -79,6 +79,7 @@ @import './page/alert/nzAlertTag.scss'; @import './page/config/system/notifyMethodTab.scss'; @import './page/config/system/license.scss'; +@import './page/config/licenseGen.scss'; @import './page/config/about.scss'; @import './page/config/agent.scss'; @import './page/config/assetMeta.scss'; diff --git a/nezha-fronted/src/assets/css/components/page/config/licenseGen.scss b/nezha-fronted/src/assets/css/components/page/config/licenseGen.scss new file mode 100644 index 000000000..a3039a1c7 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/page/config/licenseGen.scss @@ -0,0 +1,29 @@ +.license-gen { + background-color: $--background-color-empty; + margin: 10px; + height: calc(100% - 20px) !important; + overflow: auto; + .license-gen-form { + padding: 30px 0 0 30px; + .license-gen-btn { + text-align: center; + } + .el-textarea__inner { + min-height: 89px; + } + .license-gen-form__upload { + height: 150px; + border: 1px solid $--border-color-light; + box-shadow: 0 6px 16px 0 rgba(0,0,0,0.08); + border-radius: 3px; + .upload-demo { + margin: 20px; + height: calc(100% - 40px); + .el-upload-list.el-upload-list--text { + overflow: auto; + height: 75px; + } + } + } + } +} diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue index 701c1758a..b08984379 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue @@ -22,7 +22,7 @@ - + @@ -231,7 +231,12 @@ export default { }, modelTypeList () { this.$get('asset/model', { pageSize: -1, pageNo: 1 }).then(res => { - this.typeDataList = res.data.list + this.typeDataList = res.data.list.map((e, i) => { + return { + name: e.type.name, + id: e.type.id + } + }) }) } } diff --git a/nezha-fronted/src/components/page/config/licenseGen.vue b/nezha-fronted/src/components/page/config/licenseGen.vue index 5722f93c5..8664db327 100644 --- a/nezha-fronted/src/components/page/config/licenseGen.vue +++ b/nezha-fronted/src/components/page/config/licenseGen.vue @@ -1,13 +1,88 @@ - - diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 4b2a0b591..35e19eb61 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -102,6 +102,10 @@ export default new Router({ path: '/ipam', component: resolve => require(['../components/page/config/ipam.vue'], resolve) }, + { + path: '/license/gen', + component: resolve => require(['../components/page/config/licenseGen.vue'], resolve) + }, { path: '/profile', component: resolve => require(['../components/page/config/profile.vue'], resolve)