diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 8ab979bf0..6f8d94bae 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -650,10 +650,8 @@ li{ } /*此处自定义弹框尺寸,不同功能可能需要的尺寸不一样,需自行添加*/ -.right-box-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, .right-box-edit-endpoint, .right-box-panel, .right-box-dc { - width: 520px; -} -.right-box-add-asset, .right-box-add-chart { +.right-box-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, +.right-box-edit-endpoint, .right-box-panel, .right-box-dc, .right-box-model, .right-box-add-asset, .right-box-add-chart { width: 520px; } .right-box-chart .el-input__inner, .right-box-chart input { @@ -663,7 +661,7 @@ li{ width: 850px; } .right-box-cabinet{ - width:400px + width: 400px } /* begin--右侧弹框--顶部按钮*/ .right-box-top-btns { diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index c32f50231..b70cdff81 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -7,7 +7,7 @@ active="1" unique-opened > - +
{{$store.state.consoleCount<=10?$store.state.consoleCount:'10+'}}
@@ -27,7 +27,7 @@ - +
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index c70bd4841..30638d212 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -16,6 +16,7 @@ const en = { edit: 'Edit', //'编辑' delete: 'Delete', //'删除' view: 'View', + type: 'Type', esc: 'Cancel', //'取消' cancel: 'Cancel', //'取消' save: 'Save', //'保存' @@ -35,7 +36,7 @@ const en = { back: 'Back', //返回 unavailable: 'Unavailable', available: 'Available', - changePwd:'Change Password',//修改密码 + changePwd:'Change Password',//修改密码 createChart:'create chart', createProject:'create project', createAsset:'create asset', @@ -44,6 +45,7 @@ const en = { createPrometheusServer:'create prometheus server', createDatacenter:'create datacenter', createCabinet:'create cabinet', + createModel:'create model', exportExcel:'Export', importExcel:'Import', importExcelLower:'import', @@ -411,6 +413,14 @@ const en = { cabinetNum: "Cabinet number", assets: "Assets", remark:'Remark', + }, + model: { + model: 'Model', + vendor: 'Vendor', + assets: "Assets", + editModel: 'Edit model', + createModel: 'Create model', + remark: 'Remark' } }, alert: { diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index e2dd2eee8..d006e5bb8 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -43,7 +43,7 @@ - +
{{alertRule.expr}}
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 9f9f36421..2ac024362 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -111,51 +111,6 @@ ], }, areaData: [], - data: { - code: 200, - msg: "success", - data: { - list: [{ - id: 1, - pid: 0, - name: "astana", - longitude: 100.3, - latitude: 24.3, - i18n:{en:'astana',cn:'阿斯塔纳'}, - children: [{ - id: 2, - pid: 1, - name: "qu", - longitude: 100.3, - latitude: 24.3, - i18n:{en:'qu',cn:'阿斯塔纳一个区'}, - children: [{ - id: 3, - pid: 2, - name: "qu2", - longitude: 100.3, - latitude: 24.3, - i18n:{en:'qu2',cn:'阿斯塔纳二个区'}} - ] - }, { - id: 4, - pid: 0, - name: "alamutu", - longitude: 100.3, - latitude: 24.3, - i18n:{en:'alamutu',cn:'阿拉木图'}, - children: [{ - id: 5, - pid: 4, - name: "qu3", - longitude: 100.3, - latitude: 24.3, - i18n: {en: 'qu3', cn: '阿拉木图一个区'} - }] - }] - }] - } - }, } }, methods: { diff --git a/nezha-fronted/src/components/common/rightBox/modelBox.vue b/nezha-fronted/src/components/common/rightBox/modelBox.vue new file mode 100644 index 000000000..873105c51 --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/modelBox.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 4e1e73f3d..93d570173 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -15,6 +15,9 @@ +
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 8df810bdc..415d7a38f 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -45,6 +45,9 @@ +
@@ -97,7 +100,7 @@ -