diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js index e5f6ad870..41fe93316 100644 --- a/nezha-fronted/config/index.js +++ b/nezha-fronted/config/index.js @@ -1,3 +1,4 @@ +'use strict' // Template version: 1.3.1 // see http://vuejs-templates.github.io/webpack for documentation. @@ -11,7 +12,6 @@ module.exports = { proxyTable: { '/api': { target: 'http://192.168.40.247:8080/nz-admin', //设置调用接口域名和端口号别忘了加http - // target: 'http://192.168.40.247:8080/nz-admin', //设置调用接口域名和端口号别忘了加http changeOrigin: true, pathRewrite: { '^/api': '/' //这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替 diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index f6bc86e2a..a6cbc4588 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -36,26 +36,26 @@ html { .config-receiver-dropdown { width: 550px; } -.config-receiver-dropdown__btn { +.config-receiver-dropdown-btn { display: inline-block; margin-left: 7px; float: right; color: #60BEFF; font-size: 13px } -.config-receiver-dropdown__btn:hover { +.config-receiver-dropdown-btn:hover { color: #409EFF; } -.config-receiver-dropdown__btn_delete { +.config-receiver-dropdown-btn-delete { color: #F98D9A; font-size: 13px } -.config-receiver-dropdown__btn_delete:hover { +.config-receiver-dropdown-btn-delete:hover { color: #D96D7A; } .config-receiver-dropdown.is-multiple .el-select-dropdown__item.selected::after { content: "" !important; } -.config-receiver-dropdown__error-message { +.config-receiver-dropdown-error-message { color: #F98D9A; } diff --git a/nezha-fronted/src/components/common/home.vue b/nezha-fronted/src/components/common/home.vue index ee01d09f7..3108ff755 100644 --- a/nezha-fronted/src/components/common/home.vue +++ b/nezha-fronted/src/components/common/home.vue @@ -47,4 +47,4 @@ export default { } } - \ No newline at end of file + diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index c6f786d38..2814d025f 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1,10 +1,16 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' //引入element语言包 const cn = { - overall: { - dashboard: '仪表盘', - project: '工程', - asset: '资产', - alarm: '警告' + overall:{ + dashboard:'仪表盘', + project:'工程', + asset:'资产', + create: '新增', + edit: '修改', + delete: '删除', + esc: '取消', + cancel: '取消', + save: '保存', + search: '搜索' }, asset: { tableTitle: { @@ -30,7 +36,24 @@ const cn = { alarm: 'Alarm', }, }, + config: { + account: { + //列表表头 + account: "用户", + language: "语言", + receiver: "用户组", + createTime: "创建时间", + enable: "可用", + option: "操作", + + //侧滑框 + accountId: "用户ID", + createAccount: "新增用户", + editAccount: "修改用户", + notCurrentlySupport: '暂不支持' + } + }, ...zhLocale } -export default cn; \ No newline at end of file +export default cn; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index a4f1c33f6..0883a00e8 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -3,7 +3,14 @@ const en = { overall:{ dashboard:'dashboard', project:'project', - asset:'asset' + asset:'asset', + create: 'Create', + edit: 'Edit', + delete: 'Delete', + esc: 'Esc', + cancel: 'Cancel', + save: 'Save', + search: 'Search' }, asset:{ tableTitle: { @@ -29,7 +36,24 @@ const en = { alarm: 'Alarm', }, }, + config: { + account: { + //列表表头 + account: "Account", + language: "Language", + receiver: "Receiver", + createTime: "Create Time", + enable: "Enable", + option: "Option", + + //侧滑框 + accountId: "Accound ID", + createAccount: "Create Account", + editAccount: "Edit Account", + notCurrentlySupport: 'Not currently supported' + } + }, ...enLocale } -export default en; \ No newline at end of file +export default en; diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index dd9fd49b8..f80ee4d54 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -3,9 +3,30 @@ height: 100%; } .account-list { - + height: calc(100% - 51px); + } + .account-list-option { + cursor: pointer; + display: inline-block; + margin-right: 6px; + } + .account-list-option .el-icon-delete { + color: #F98D9A; + } + .account-list-option .el-icon-delete:hover { + color: #D96D7A; + } + .account-list-option .el-icon-view { + color: #60BEFF; + } + .account-list-option .el-icon-view:hover { + color: #409EFF; + } + .account-list-search { + float: right; + width: 220px; + margin: 15px 0; } - /* begin--右侧弹框*/ .right-box { position: fixed; @@ -17,15 +38,15 @@ background-color: white; padding: 0 20px; } - .right-box_account { + .right-box-account { width: 550px; - height: calc(100% - 60px); + height: calc(100% - 61px); } /* begin--右侧弹框--顶部按钮*/ - .right-box__top-btns { + .right-box-top-btns { text-align: center; } - .right-box__top-btn { + .right-box-top-btn { border-radius: 0 0 9px 9px; float: right; color: #656565; @@ -37,7 +58,7 @@ cursor: pointer; margin-left: 20px; } - .right-box__top-btn_full { + .right-box-top-btn-full { background-color: #656565; border: 1px solid #656565; border-top: none; @@ -46,37 +67,37 @@ /* end--右侧弹框--顶部按钮*/ /* begin--右侧弹框--内容*/ - .right-box__title { + .right-box-title { height: 30px; line-height: 40px; text-align: left; } - .right-box__form { + .right-box-form { margin-top: 35px; } - .right-box__form-row { + .right-box-form-row { margin-top: 25px; } - .right-box__form-label { + .right-box-form-label { margin-bottom: 8px; text-align: left; } - .right-box__form-content { + .right-box-form-content { height: 32px; line-height: 32px; text-align: left; width: 100%; } - .right-box__form-content-txt { + .right-box-form-content-txt { padding-left: 11px; } - .right-box__form-content .el-select { - width: calc(100% - 37px); + .right-box-form-content .el-select { + width: calc(100% - 38px); vertical-align: top; } - .el-select__add-btn { - width: 32px; - height: 32px; + .el-select-add-btn { + width: 33px; + height: 33px; display: inline-block; text-align: center; border-radius: 5px; @@ -85,14 +106,14 @@ color: #C7C9CE; transition: border-color .2s cubic-bezier(.645,.045,.355,1); } - .el-select__add-btn:hover { + .el-select-add-btn:hover { border: 1px solid #C0C4CC; cursor: pointer; } /* end--右侧弹框--内容*/ /* begin--右侧弹框--底部按钮*/ - .right-box__bottom-btns { + .right-box-bottom-btns { position: absolute; bottom: 0; width: 100%; @@ -100,13 +121,13 @@ left: 0; text-align: center; } - .right-box__bottom-btn:first-of-type { + .right-box-bottom-btn:first-of-type { border-bottom-left-radius: 8px; } - .right-box__bottom-btn:last-of-type{ + .right-box-bottom-btn:last-of-type{ border-bottom-right-radius: 8px; } - .right-box__bottom-btn { + .right-box-bottom-btn { display: inline-block; background-color: #656565; color: white; @@ -115,15 +136,15 @@ cursor: pointer; width: 100%; } - .config-receiver-dropdown__label_input { + .config-receiver-dropdown-label-input { width: 50%; display: inline-block; } - .right-box__bottom-btn_cancel { + .right-box-bottom-btn-cancel { background-color: #DADADA; color: #656565; } - .right-box__bottom-btn_50 { + .right-box-bottom-btn-50 { width: 50%; } /* end--右侧弹框--底部按钮*/ @@ -149,69 +170,86 @@