From f6cf07e8cb073e5f7e7620e01b5833331a258d3b Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Fri, 8 Nov 2024 14:34:47 +0800 Subject: feat: job详情页增加pending状态页面 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/iconfont/iconfont.css | 10 ++++-- src/assets/iconfont/iconfont.js | 2 +- src/assets/iconfont/iconfont.json | 7 ++++ src/assets/iconfont/iconfont.ttf | Bin 25868 -> 26168 bytes src/assets/iconfont/iconfont.woff | Bin 16204 -> 16252 bytes src/assets/iconfont/iconfont.woff2 | Bin 13884 -> 13900 bytes src/i18n/en.js | 1 + src/i18n/zh.js | 1 + src/views/jobs/log.vue | 67 +++++++++++++++++++++---------------- 9 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 284962b..dc09a7b 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "asw-icon"; /* Project id 4624922 */ - src: url('iconfont.woff2?t=1730883204270') format('woff2'), - url('iconfont.woff?t=1730883204270') format('woff'), - url('iconfont.ttf?t=1730883204270') format('truetype'); + src: url('iconfont.woff2?t=1731046611593') format('woff2'), + url('iconfont.woff?t=1731046611593') format('woff'), + url('iconfont.ttf?t=1731046611593') format('truetype'); } .asw-icon { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-Pending1:before { + content: "\e84a"; +} + .icon-merge-request:before { content: "\e631"; } diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index 892df1a..f37f002 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4624922='',(l=>{var a=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,o,i,m,v,z=function(a,c){c.parentNode.insertBefore(a,c)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4624922,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,v=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){v||(v=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}t()}})(window); \ No newline at end of file +window._iconfont_svg_string_4624922='',(l=>{var a=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,o,i,m,v,z=function(a,c){c.parentNode.insertBefore(a,c)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4624922,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,v=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){v||(v=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}t()}})(window); \ No newline at end of file diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 6d1cb11..ae85963 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "42396854", + "name": "Pending", + "font_class": "Pending1", + "unicode": "e84a", + "unicode_decimal": 59466 + }, { "icon_id": "22911334", "name": "merge-request", diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index f0b2266..a3c4b2f 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 71333d2..1bbf34c 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 69cc5ae..e5da3fe 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/i18n/en.js b/src/i18n/en.js index 06b34d4..b730c09 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -324,6 +324,7 @@ export default { seconds: 'seconds', created_detail_message: 'This job has not started yet', cancel_detail_message: 'This job has been canceled', + pending_detail_message: 'This job has not been solved yet', retry_job: 'Retry this job', cancel_job: 'Cancel this job', }, diff --git a/src/i18n/zh.js b/src/i18n/zh.js index 2e7cdfb..775f02a 100644 --- a/src/i18n/zh.js +++ b/src/i18n/zh.js @@ -324,6 +324,7 @@ export default { seconds: '秒', created_detail_message: '此任务尚未开始', cancel_detail_message: '此任务已取消', + pending_detail_message: '此任务待处理', retry_job: '重试此任务', cancel_job: '取消此任务', }, diff --git a/src/views/jobs/log.vue b/src/views/jobs/log.vue index defa89e..e0d9835 100644 --- a/src/views/jobs/log.vue +++ b/src/views/jobs/log.vue @@ -50,35 +50,46 @@ -
- - +
+
+ + + +
+
{{t('job.created_detail_message')}}
+
+ + {{t('job.cancel_job')}} + +
+
+
+
+ + + +
+
{{t('job.cancel_detail_message')}}
+
+ + {{t('job.retry_job')}} + +
+
+
+
+ + + +
+
{{t('job.pending_detail_message')}}
+
+ + {{t('job.retry_job')}} + +
-
+
-- cgit v1.2.3