diff --git a/nezha-fronted/src/assets/css/components/common/login.scss b/nezha-fronted/src/assets/css/components/common/login.scss index 2b5d710fa..5316da747 100644 --- a/nezha-fronted/src/assets/css/components/common/login.scss +++ b/nezha-fronted/src/assets/css/components/common/login.scss @@ -171,6 +171,10 @@ height: 40px; width: auto; padding: 0 20px; + margin-bottom: 10px; + } + .download-btn.login-btn { + padding: 0 12px; } } .login-dialog-title{ diff --git a/nezha-fronted/src/assets/css/components/page/config/system.scss b/nezha-fronted/src/assets/css/components/page/config/system.scss index b2e584c66..1ec76b335 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system.scss @@ -334,6 +334,9 @@ width: 100%; height: 42px; } + .license-left-header-red.license-left-header { + background-color: #EC7F66; + } .license-left-header { background: #00c398; display: flex; @@ -343,8 +346,8 @@ color: #fff; } i.nz-icon-import-failed1 { - border-radius: 100%; - color: #EC7F66; + background-color: #EC7F66; + color: #fff; } div:nth-of-type(1) { display: flex; @@ -418,6 +421,7 @@ font-weight: 500; } .license-left-boyd-value { + height: 22px; opacity: 0.6; font-family: Roboto-Black; font-size: 14px; diff --git a/nezha-fronted/src/assets/css/font/iconfont.css b/nezha-fronted/src/assets/css/font/iconfont.css index aa35d25cb..14469a88e 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.css +++ b/nezha-fronted/src/assets/css/font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('iconfont.woff2?t=1639043279109') format('woff2'), - url('iconfont.woff?t=1639043279109') format('woff'), - url('iconfont.ttf?t=1639043279109') format('truetype'); + src: url('iconfont.woff2?t=1639385153414') format('woff2'), + url('iconfont.woff?t=1639385153414') format('woff'), + url('iconfont.ttf?t=1639385153414') format('truetype'); } .nz-icon { @@ -13,6 +13,30 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-Upload1:before { + content: "\e75c"; +} + +.nz-icon-jiazai:before { + content: "\e758"; +} + +.nz-icon-huiche:before { + content: "\e756"; +} + +.nz-icon-xiangshang:before { + content: "\e759"; +} + +.nz-icon-xiangxia:before { + content: "\e75a"; +} + +.nz-icon-esc:before { + content: "\e75b"; +} + .nz-icon-stack:before { content: "\e7c6"; } diff --git a/nezha-fronted/src/assets/css/font/iconfont.js b/nezha-fronted/src/assets/css/font/iconfont.js index 29d37ce59..8199769aa 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.js +++ b/nezha-fronted/src/assets/css/font/iconfont.js @@ -1 +1 @@ -!function(a){var c,h,l,z,o,i='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),v=function(a,c){c.parentNode.insertBefore(a,c)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=i,i=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?v(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),c()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(l=c,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); \ No newline at end of file +!function(a){var h,c,l,z,o,i='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),v=function(a,h){h.parentNode.insertBefore(a,h)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}h=function(){var a,h;(h=document.createElement("div")).innerHTML=i,i=null,(a=h.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",h=a,(a=document.body).firstChild?v(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),h()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=h,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index 3699a3d1b..ab3a3feaf 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index 381d818ad..416177263 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index 913b38289..ca0bb8595 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index 8be18c7b3..1fa0bf926 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('./font/iconfont.woff2?t=1639043279109') format('woff2'), - url('./font/iconfont.woff?t=1639043279109') format('woff'), - url('./font/iconfont.ttf?t=1639043279109') format('truetype'); + src: url('./font/iconfont.woff2?t=1639385153414') format('woff2'), + url('./font/iconfont.woff?t=1639385153414') format('woff'), + url('./font/iconfont.ttf?t=1639385153414') format('truetype'); } .nz-icon { @@ -13,6 +13,30 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-Upload1:before { + content: "\e75c"; +} + +.nz-icon-jiazai:before { + content: "\e758"; +} + +.nz-icon-huiche:before { + content: "\e756"; +} + +.nz-icon-xiangshang:before { + content: "\e759"; +} + +.nz-icon-xiangxia:before { + content: "\e75a"; +} + +.nz-icon-esc:before { + content: "\e75b"; +} + .nz-icon-stack:before { content: "\e7c6"; } diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index fdd415cf4..8f303fd28 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -28,7 +28,11 @@
{{license.warnInfo}}
-
INSTALLATION ID: {{license.token}}
+ +
+ + +
{ + const fileName = 'Login' + '-' + this.getTimeString() + '.xml' + if (window.navigator.msSaveOrOpenBlob) { + // 兼容ie11 + const blobObject = new Blob([res]) + window.navigator.msSaveOrOpenBlob(blobObject, fileName) + } else { + const url = URL.createObjectURL(new Blob([res])) + const a = document.createElement('a') + document.body.appendChild(a) // 此处增加了将创建的添加到body当中 + a.href = url + a.download = fileName + a.target = '_blank' + a.click() + a.remove() // 将a标签移除 + } + }, error => { + const $self = this + const reader = new FileReader() + reader.onload = function (event) { + const responseText = reader.result + const exception = JSON.parse(responseText) + if (exception.message) { + $self.$message.error(exception.message) + } else { + console.error(error) + } + } + reader.readAsText(error.response.data) + }) + }, + getTimeString () { + const split = '-' + const date = new Date() + const year = date.getFullYear() + const month = this.formatNum(date.getMonth() + 1) + const day = this.formatNum(date.getDate()) + const hours = this.formatNum(date.getHours()) + const minutes = this.formatNum(date.getMinutes()) + const seconds = this.formatNum(date.getSeconds()) + return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds + }, + formatNum (num) { + return num > 9 ? num : '0' + num + }, bindQRCode: function (text) { text = text || 'https://www.baidu.com' if (!this.QRCode) { diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue index 916790c22..2239027f6 100644 --- a/nezha-fronted/src/components/page/config/system/license.vue +++ b/nezha-fronted/src/components/page/config/system/license.vue @@ -1,19 +1,17 @@