diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index a4c25ba6a..74cfef446 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -6,10 +6,10 @@ display: none; } body { - height: 100%; + height: 100%; } html { - height: 100%; + height: 100%; } .content-box { height: 100%; @@ -57,23 +57,23 @@ html { } /*侧滑文字*/ .el-form-item .el-form-item__label{ - font-size: 10px; - text-align : left; + font-size: 10px; + text-align : left; } /*侧滑输入框高度*/ .el-input .el-input__inner{ - line-height: 26px; - height: 26px; + line-height: 26px; + height: 26px; } /*侧滑输入框宽度*/ .right-menu .el-form-item__content .el-input{ - width: 90%; + width: 90%; } - /* begin--按钮组件*/ +/* begin--按钮组件*/ .nz-btn { border-radius: 4px; cursor: pointer; - line-height: 21px; + line-height: 18px; font-size: 14px; font-weight: 700; padding: 4px 14px; @@ -127,7 +127,7 @@ html { border-bottom-left-radius: 0; border-top-left-radius: 0; } - /* end--按钮组件*/ +/* end--按钮组件*/ /* end--通用*/ /* begin--左侧列表*/ @@ -172,15 +172,15 @@ html { margin-left: 270px; padding: 0 15px 0 25px; } - /* begin--顶部工具栏*/ +/* begin--顶部工具栏*/ .top-tools { padding: 22px 0 13px 0; } .top-tools .top-tool-search { width: 320px; } - /* end--顶部工具栏*/ - /* start--内容*/ +/* end--顶部工具栏*/ +/* start--内容*/ .content-right>.el-table{ border: 1px solid #d4d4d4; border-left: none; @@ -205,21 +205,27 @@ html { border-left: 1px solid white; border-bottom: 1px solid #d4d4d4;; } +.content-right .el-table .el-table__header th:first-of-type { + border-left: none; +} +.content-right .el-table .el-table__header th:nth-last-child(2) { + border-right: none; +} .content-right .el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed { border-right: none; } .content-right .el-table td { padding: 4px 0; } - /* end--内容*/ - /* start--分页*/ +/* end--内容*/ +/* start--分页*/ .pagination { padding-top: 18px; text-align: center; } - /* end--分页*/ +/* end--分页*/ - /* begin--右弹框滑入滑出动画*/ +/* begin--右弹框滑入滑出动画*/ @keyframes slide-in-from-right { from {right: -800px} to {right: 0} @@ -234,9 +240,9 @@ html { .right-box-leave-active { animation: slide-out-to-right 0.4s; } - /* end--右弹框滑入滑出动画*/ +/* end--右弹框滑入滑出动画*/ - /* begin--右子弹框动画*/ +/* begin--右子弹框动画*/ @keyframes appear { from {opacity:0} to {opacity:1} @@ -251,7 +257,7 @@ html { .right-sub-box-leave-active { animation: disappear 0.4s; } - /* end--右子弹框动画*/ +/* end--右子弹框动画*/ /* end--右侧内容*/ /* begin--右侧弹框*/ @@ -266,8 +272,8 @@ html { padding: 0 20px; } - /*此处自定义弹框尺寸，不同功能可能需要的尺寸不一样，需自行添加*/ -.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-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, .right-box-edit-endpoint { width: 520px; height: calc(100% - 100px); } @@ -275,7 +281,7 @@ html { width: 820px; height: calc(100% - 100px); } - /* begin--右侧弹框--顶部按钮*/ +/* begin--右侧弹框--顶部按钮*/ .right-box-top-btns { text-align: center; } @@ -298,9 +304,9 @@ html { border-top: none; color: white; } - /* end--右侧弹框--顶部按钮*/ +/* end--右侧弹框--顶部按钮*/ - /* begin--右侧弹框--内容*/ +/* begin--右侧弹框--内容*/ .right-box-title { height: 30px; line-height: 40px; @@ -362,9 +368,9 @@ html { .right-box-row-btn-active:hover { border: 1px solid #656565; } - /* end--右侧弹框--内容*/ +/* end--右侧弹框--内容*/ - /* begin--右侧弹框--底部按钮*/ +/* begin--右侧弹框--底部按钮*/ .right-box-bottom-btns { position: absolute; bottom: 0; @@ -399,7 +405,7 @@ html { .right-box-bottom-btn-50 { width: 50%; } - /* end--右侧弹框--底部按钮*/ +/* end--右侧弹框--底部按钮*/ /* end--右侧弹框*/ /* begin--endpoint->子弹框asset搜索框前缀和后缀*/ .right-sub-box .el-input-group__append, .right-sub-box .el-input-group__prepend, .assets-box .el-input-group__append, .assets-box .el-input-group__prepend { diff --git a/nezha-fronted/src/assets/img/lang-box-active.svg b/nezha-fronted/src/assets/img/lang-box-active.svg new file mode 100644 index 000000000..8a59be2d4 --- /dev/null +++ b/nezha-fronted/src/assets/img/lang-box-active.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/lang-box.svg b/nezha-fronted/src/assets/img/lang-box.svg new file mode 100644 index 000000000..5029539c6 --- /dev/null +++ b/nezha-fronted/src/assets/img/lang-box.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/login-background.png b/nezha-fronted/src/assets/img/login-background.png new file mode 100644 index 000000000..cc3c51943 Binary files /dev/null and b/nezha-fronted/src/assets/img/login-background.png differ diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index dd65b80bb..5e7894bc0 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -1,417 +1,433 @@ diff --git a/nezha-fronted/src/components/common/i18n.js b/nezha-fronted/src/components/common/i18n.js index 3c4055a1a..ad425df51 100644 --- a/nezha-fronted/src/components/common/i18n.js +++ b/nezha-fronted/src/components/common/i18n.js @@ -5,9 +5,9 @@ import messages from './language' Vue.use(VueI18n) //从localStorage获取语言选择。 const i18n = new VueI18n({ - locale: localStorage.language || 'en', //初始未选择默认 en 英文 + locale: localStorage.getItem('nz-language') || 'en', //初始未选择默认 en 英文 messages, }) locale.i18n((key, value) => i18n.t(key, value)) //兼容element -export default i18n \ No newline at end of file +export default i18n diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index f92796203..bb231f3e4 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -1,27 +1,45 @@ \ No newline at end of file + diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index f21c88aec..5d5a7eacf 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -267,6 +267,7 @@ methods: { show(show) { this.rightBox.show = show; + this.currentModuleCopy = JSON.parse(JSON.stringify(this.currentModule)); //打开弹框时将currentModule还原 }, //子弹框控制 obj: module或endpoint对象 type:1module2endpoint diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue index 8359377c5..13f31bb9d 100644 --- a/nezha-fronted/src/components/common/rightBox/projectBox.vue +++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue @@ -56,9 +56,9 @@ --> -
+
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 536ef062d..49e2fb548 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -1022,14 +1022,14 @@ display: flex; position: relative; box-shadow: 0px 0px 20px 0px rgba(0,0,0,.08); - line-height: 31px; + line-height: 28px; } .new-search .search-input-all{ width: 300px; background: #fff; color: rgba(0,0,0,.55); - height: 31px; - line-height: 31px; + height: 28px; + line-height: 28px; border-bottom-left-radius: 5px; border-top-left-radius: 5px; display: flex; @@ -1042,8 +1042,8 @@ } .search-input-all .search-history{ padding: 0px 10px; - height: 23px; - line-height: 23px; + height: 20px; + line-height: 20px; text-align: center; border-right: 1px solid #e5e5e5; margin-top: 4px; diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 75b43a1a9..b6a85a849 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -59,6 +59,7 @@ height="calc(100% - 65px)" style="width: 100%;"> { if (response.code === 200) { - for (var i = 0; i < response.data.list.length; i++) { + for (let i = 0; i < response.data.list.length; i++) { response.data.list[i].status = response.data.list[i].status + ""; } this.tableData = response.data.list; @@ -459,7 +460,7 @@ export default { } }, blurEditReceiver: function() { - for (var i = 0; i < this.receiverData.length; i++) { + for (let i = 0; i < this.receiverData.length; i++) { if (this.receiverData[i].isEdit) { this.receiverData[i].name = this.receiverData[i].oldName; this.receiverData[i].isEdit = false; @@ -473,7 +474,7 @@ export default { //TODO 请求后台，删除用户组 }, initReceiverData: function() { - for (var i = 0; i < this.receiverData.length; i++) { + for (let i = 0; i < this.receiverData.length; i++) { this.$set(this.receiverData[i], 'oldName', this.receiverData[i].name); this.$set(this.receiverData[i], 'isEdit', false); } @@ -483,7 +484,7 @@ export default { }, updateReceiverName: function(item) { //TODO 请求接口改名 - var code = 200; + let code = 200; //this.$set(item, 'errorMessage', 'err'); item.errorMessage = ''; item.oldName = item.name; diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index a79733702..11cdf5875 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -82,6 +82,7 @@ height="calc(100% - 65px)" style="width: 100%;"> {{scope.row[item.prop]}} - + - +