Skip to content

Commit

Permalink
Merge pull request fofapro#138 from fofapro/0.3.2.1
Browse files Browse the repository at this point in the history
### v0.3.2.1
  • Loading branch information
xxxxbxxxxx authored Dec 25, 2020
2 parents d39f8b2 + aae67b9 commit 6bc7772
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 16 deletions.
Binary file added dist.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>vulfocus</title><link href=/static/css/chunk-elementUI.b80cec6e.css rel=stylesheet><link href=/static/css/chunk-libs.39c2b454.css rel=stylesheet><link href=/static/css/app.56499025.css rel=stylesheet></head><body><noscript><strong>We're sorry but vulfocus doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.1bb3aa65.js></script><script src=/static/js/chunk-libs.1b5d7731.js></script><script>(function(e){function n(n){for(var r,c,a=n[0],f=n[1],d=n[2],i=0,h=[];i<a.length;i++)c=a[i],u[c]&&h.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);l&&l(n);while(h.length)h.shift()();return o.push.apply(o,d||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],r=!0,c=1;c<t.length;c++){var a=t[c];0!==u[a]&&(r=!1)}r&&(o.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-01170188":"f48e265b","chunk-5346b088":"c64c17f3","chunk-0b1d9d94":"99348f8b","chunk-192e2f18":"c90e8c12","chunk-1a93f14a":"555b27a9","chunk-23f5043e":"dcb88077","chunk-25a46167":"5868a068","chunk-2d0a4bac":"461160d8","chunk-2d0bb1fd":"c566a2a8","chunk-2d0dd05f":"c75393b4","chunk-4de1c2b6":"f7a633fb","chunk-63140e38":"75c21ec3","chunk-6e9243ef":"1e480c81","chunk-b7fe23c0":"8c671968","chunk-26d3c488":"1f25a223","chunk-eeb0b196":"6a0699b6"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-5346b088":1,"chunk-0b1d9d94":1,"chunk-1a93f14a":1,"chunk-23f5043e":1,"chunk-25a46167":1,"chunk-4de1c2b6":1,"chunk-b7fe23c0":1,"chunk-26d3c488":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-01170188":"31d6cfe0","chunk-5346b088":"99323927","chunk-0b1d9d94":"fa66e7df","chunk-192e2f18":"31d6cfe0","chunk-1a93f14a":"c4ec7c15","chunk-23f5043e":"65ce5a0c","chunk-25a46167":"3375552b","chunk-2d0a4bac":"31d6cfe0","chunk-2d0bb1fd":"31d6cfe0","chunk-2d0dd05f":"31d6cfe0","chunk-4de1c2b6":"a37cd815","chunk-63140e38":"31d6cfe0","chunk-6e9243ef":"31d6cfe0","chunk-b7fe23c0":"e22f3f54","chunk-26d3c488":"c9e5910f","chunk-eeb0b196":"31d6cfe0"}[e]+".css",u=f.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var d=o[a],i=d.getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(i===r||i===u))return n()}var h=document.getElementsByTagName("style");for(a=0;a<h.length;a++){d=h[a],i=d.getAttribute("data-href");if(i===r||i===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],l.parentNode.removeChild(l),t(o)},l.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var o=new Promise((function(n,t){r=u[e]=[n,t]}));n.push(r[2]=o);var d,i=document.createElement("script");i.charset="utf-8",i.timeout=120,f.nc&&i.setAttribute("nonce",f.nc),i.src=a(e),d=function(n){i.onerror=i.onload=null,clearTimeout(h);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");o.type=r,o.request=c,t[1](o)}u[e]=void 0}};var h=setTimeout((function(){d({type:"timeout",target:i})}),12e4);i.onerror=i.onload=d,document.head.appendChild(i)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="/",f.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]||[],i=d.push.bind(d);d.push=n,d=d.slice();for(var h=0;h<d.length;h++)n(d[h]);var l=i;t()})([]);
//# sourceMappingURL=runtime.7b0f2bc5.js.map</script><script src=/static/js/app.5958d828.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>vulfocus</title><link href=/static/css/chunk-elementUI.b80cec6e.css rel=stylesheet><link href=/static/css/chunk-libs.39c2b454.css rel=stylesheet><link href=/static/css/app.56499025.css rel=stylesheet></head><body><noscript><strong>We're sorry but vulfocus doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.1bb3aa65.js></script><script src=/static/js/chunk-libs.1b5d7731.js></script><script>(function(e){function n(n){for(var r,c,a=n[0],f=n[1],d=n[2],i=0,h=[];i<a.length;i++)c=a[i],u[c]&&h.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);l&&l(n);while(h.length)h.shift()();return o.push.apply(o,d||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],r=!0,c=1;c<t.length;c++){var a=t[c];0!==u[a]&&(r=!1)}r&&(o.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-01170188":"f48e265b","chunk-361eb6c4":"c432a1be","chunk-0b1d9d94":"99348f8b","chunk-192e2f18":"c90e8c12","chunk-23f5043e":"dcb88077","chunk-25a46167":"5868a068","chunk-2d0a4bac":"461160d8","chunk-2d0bb1fd":"c566a2a8","chunk-2d0dd05f":"c75393b4","chunk-4abf1f38":"f485d3b2","chunk-4de1c2b6":"f7a633fb","chunk-63140e38":"75c21ec3","chunk-6e9243ef":"1e480c81","chunk-b7fe23c0":"8c671968","chunk-26d3c488":"1f25a223","chunk-eeb0b196":"6a0699b6"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-361eb6c4":1,"chunk-0b1d9d94":1,"chunk-23f5043e":1,"chunk-25a46167":1,"chunk-4abf1f38":1,"chunk-4de1c2b6":1,"chunk-b7fe23c0":1,"chunk-26d3c488":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-01170188":"31d6cfe0","chunk-361eb6c4":"6e5125ab","chunk-0b1d9d94":"fa66e7df","chunk-192e2f18":"31d6cfe0","chunk-23f5043e":"65ce5a0c","chunk-25a46167":"3375552b","chunk-2d0a4bac":"31d6cfe0","chunk-2d0bb1fd":"31d6cfe0","chunk-2d0dd05f":"31d6cfe0","chunk-4abf1f38":"a7f83702","chunk-4de1c2b6":"a37cd815","chunk-63140e38":"31d6cfe0","chunk-6e9243ef":"31d6cfe0","chunk-b7fe23c0":"e22f3f54","chunk-26d3c488":"c9e5910f","chunk-eeb0b196":"31d6cfe0"}[e]+".css",u=f.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var d=o[a],i=d.getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(i===r||i===u))return n()}var h=document.getElementsByTagName("style");for(a=0;a<h.length;a++){d=h[a],i=d.getAttribute("data-href");if(i===r||i===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],l.parentNode.removeChild(l),t(o)},l.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var o=new Promise((function(n,t){r=u[e]=[n,t]}));n.push(r[2]=o);var d,i=document.createElement("script");i.charset="utf-8",i.timeout=120,f.nc&&i.setAttribute("nonce",f.nc),i.src=a(e),d=function(n){i.onerror=i.onload=null,clearTimeout(h);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");o.type=r,o.request=c,t[1](o)}u[e]=void 0}};var h=setTimeout((function(){d({type:"timeout",target:i})}),12e4);i.onerror=i.onload=d,document.head.appendChild(i)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="/",f.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]||[],i=d.push.bind(d);d.push=n,d=d.slice();for(var h=0;h<d.length;h++)n(d[h]);var l=i;t()})([]);
//# sourceMappingURL=runtime.3deec9f1.js.map</script><script src=/static/js/app.018d4f75.js></script></body></html>
1 change: 0 additions & 1 deletion dist/static/css/chunk-1a93f14a.c4ec7c15.css

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/static/css/chunk-4abf1f38.a7f83702.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/static/js/chunk-1a93f14a.555b27a9.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/static/js/chunk-1a93f14a.555b27a9.js.map

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/static/js/chunk-4abf1f38.f485d3b2.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/static/js/chunk-4abf1f38.f485d3b2.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions vulfocus-frontend/src/views/dashboard/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
<svg-icon style="color: #20a0ff;" icon-class="stop" />
</el-tooltip>
<div style="display: inline-block;margin: 0;" v-if="item.status.status === 'running' && item.status.start_date !== null && item.status.start_date !=='' && item.status.end_date !== null && item.status.end_date !== '' && item.status.end_date !== 0">
<el-tooltip content="容器剩余时间,-1 为用不过期" placement="top">
<el-tooltip content="容器剩余时间,0 为用不过期" placement="top">
<i class="el-icon-time"></i>
</el-tooltip>
<count-down style="display: inline-block;height: 20px;line-height: 20px;size: 20px;margin-block-start: 0em;margin-block-end: 0em;" v-on:end_callback="stop(item.status.container_id, item)" :currentTime="item.status.now" :startTime=item.status.now :endTime=item.status.end_date :secondsTxt="''"></count-down>
</div>
<div style="display: inline-block;" v-else-if="item.status.status === 'running' && item.status.start_date !== null && item.status.start_date !=='' && item.status.end_date !== null && item.status.end_date !== '' && item.status.end_date === 0">
<el-tooltip content="容器剩余时间,-1 为用不过期" placement="top">
<el-tooltip content="容器剩余时间,0 为用不过期" placement="top">
<i class="el-icon-time"></i>
</el-tooltip>
<p style="display: inline-block;">-1</p>
Expand Down

0 comments on commit 6bc7772

Please sign in to comment.