Browse Source

add wait

master
zeus 2 years ago
parent
commit
3062dbc145
  1. 2
      dist/css/app.fe053294.css
  2. 2
      dist/index.html
  3. 2
      dist/js/app.2778fb2b.js
  4. 1
      dist/js/app.2778fb2b.js.map
  5. 2
      dist/js/app.35b3f955.js
  6. 1
      dist/js/app.35b3f955.js.map
  7. 6
      src-local/llo/new.js
  8. 1
      src-local/pid-0.pid
  9. 28
      src/components/manageservices/view-dashboard.vue

2
dist/css/app.026b5e89.css → dist/css/app.fe053294.css

File diff suppressed because one or more lines are too long

2
dist/index.html

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="/css/app.026b5e89.css" rel="preload" as="style"><link href="/css/chunk-vendors.e469b508.css" rel="preload" as="style"><link href="/js/app.35b3f955.js" rel="preload" as="script"><link href="/js/chunk-vendors.dd2c43c6.js" rel="preload" as="script"><link href="/css/chunk-vendors.e469b508.css" rel="stylesheet"><link href="/css/app.026b5e89.css" rel="stylesheet"></head><body><div id="app"></div><script src="/js/chunk-vendors.dd2c43c6.js"></script><script src="/js/app.35b3f955.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="/css/app.fe053294.css" rel="preload" as="style"><link href="/css/chunk-vendors.e469b508.css" rel="preload" as="style"><link href="/js/app.2778fb2b.js" rel="preload" as="script"><link href="/js/chunk-vendors.dd2c43c6.js" rel="preload" as="script"><link href="/css/chunk-vendors.e469b508.css" rel="stylesheet"><link href="/css/app.fe053294.css" rel="stylesheet"></head><body><div id="app"></div><script src="/js/chunk-vendors.dd2c43c6.js"></script><script src="/js/app.2778fb2b.js"></script></body></html>

2
dist/js/app.2778fb2b.js

File diff suppressed because one or more lines are too long

1
dist/js/app.2778fb2b.js.map

File diff suppressed because one or more lines are too long

2
dist/js/app.35b3f955.js

File diff suppressed because one or more lines are too long

1
dist/js/app.35b3f955.js.map

File diff suppressed because one or more lines are too long

6
src-local/llo/new.js

@ -2649,7 +2649,7 @@ app.get('/get_stats_containers', (req, res, next) => {
var action = req.query["action"]
var showexec = `docker stats --no-stream --format '{"container": "{{ .Name }}", "memory": { "raw": "{{ .MemUsage }}", "percent": "{{ .MemPerc }}"}, "cpu": "{{ .CPUPerc }}"}' | jq . -s`
console.log(showexec)
//console.log(showexec)
try {
exec(showexec, (err1, stdout1, stderr1) => {
if (err1) {
@ -2659,7 +2659,7 @@ app.get('/get_stats_containers', (req, res, next) => {
if (stdout1) {
var string1 = stdout1.toString()
var datajson1 = JSON.parse(string1);
console.log(stdout1)
//console.log(stdout1)
RES.error = false
RES.error_msg = "ok"
RES.data = datajson1;
@ -2668,7 +2668,7 @@ app.get('/get_stats_containers', (req, res, next) => {
}
})
} catch (error) {
console.error(`exec error: ${error}`);
//console.error(`exec error: ${error}`);
RES.error = true
RES.error_msg = error
RES.data = "nodata";

1
src-local/pid-0.pid

@ -1 +0,0 @@
7544

28
src/components/manageservices/view-dashboard.vue

@ -3,13 +3,29 @@
<div class="row ">
<div class="col-sm-12 col-lg-6">
<div class="col-sm-12 col-lg-6 text-center">
<v-wait for="stats_stats_imagescontainers">
<template slot="waiting">
<div>
<img src="@/assets/loading.gif" width="50" height="50" />
Build Stats...
</div>
</template>
</v-wait>
<div class="card h-50 shadow p-3 mb-5 bg-white rounded">
<v-chart class="chart" :key="stats_stats_imagescontainers" style="min-width: 100%;" :option="optionsystem" />
</div>
</div>
<div class="col-sm-12 col-lg-6">
<div class="col-sm-12 col-lg-6 text-center">
<v-wait for="wait_stats_stats_container">
<template slot="waiting">
<div>
<img src="@/assets/loading.gif" width="50" height="50" />
Build Stats...
</div>
</template>
</v-wait>
<div class="card h-50 shadow p-3 mb-5 bg-white rounded">
<v-chart class="chart" :key="stats_stats_container" :option="optiondocker" />
</div>
@ -182,7 +198,7 @@ optionsystem: {
{
name: 'TOTAL',
type: 'bar',
data: [5, 20],
//data: [5, 20],
emphasis: {
itemStyle: {
shadowBlur: 10,
@ -194,7 +210,7 @@ optionsystem: {
{
name: 'ACTIVE',
type: 'bar',
data: [2, 3],
//data: [2, 3],
emphasis: {
itemStyle: {
shadowBlur: 10,
@ -218,6 +234,8 @@ optionsystem: {
//console.log("token "+ this.token);
(async () => {
this.$wait.start('stats_stats_imagescontainers');
this.$wait.start('wait_stats_stats_container');
var log = await store.dispatch("pipelineLLO/get_stats_imagescontainers",{
token:this.token,
action:'images_containers'
@ -251,6 +269,7 @@ optionsystem: {
]
}
this.$wait.end('stats_stats_imagescontainers');
var logcontainers = await store.dispatch("pipelineLLO/get_stats_containers",{
token:this.token,
@ -281,6 +300,7 @@ optionsystem: {
//console.log(this.optiondocker)
//this.stats_stats_container += 1
}
this.$wait.end('wait_stats_stats_container');
})();

Loading…
Cancel
Save