mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-10-27 18:32:52 +00:00
Minor Fixes
This commit is contained in:
parent
299572a4c2
commit
01eb713019
2 changed files with 11 additions and 11 deletions
2
web/assets/css/custom.min.css
vendored
2
web/assets/css/custom.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -39,7 +39,7 @@
|
||||||
</template>
|
</template>
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
<a-tooltip :overlay-class-name="themeSwitcher.currentTheme">
|
<a-tooltip :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<a-button size="small" type="default" class="ml-8" @click="openCpuHistory()">
|
<a-button size="small" shape="circle" class="ml-8" @click="openCpuHistory()">
|
||||||
<a-icon type="history" />
|
<a-icon type="history" />
|
||||||
</a-button>
|
</a-button>
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
|
|
@ -431,7 +431,7 @@
|
||||||
@cancel="() => cpuHistoryModal.visible = false" :class="themeSwitcher.currentTheme" width="900px" footer="">
|
@cancel="() => cpuHistoryModal.visible = false" :class="themeSwitcher.currentTheme" width="900px" footer="">
|
||||||
<template slot="title">
|
<template slot="title">
|
||||||
CPU History
|
CPU History
|
||||||
<a-select size="small" v-model="cpuHistoryModal.bucket" class="ml-10" style="width: 140px"
|
<a-select size="small" v-model="cpuHistoryModal.bucket" class="ml-10" style="width: 80px"
|
||||||
@change="fetchCpuHistoryBucket">
|
@change="fetchCpuHistoryBucket">
|
||||||
<a-select-option :value="2">2s</a-select-option>
|
<a-select-option :value="2">2s</a-select-option>
|
||||||
<a-select-option :value="30">30s</a-select-option>
|
<a-select-option :value="30">30s</a-select-option>
|
||||||
|
|
@ -441,7 +441,7 @@
|
||||||
<a-select-option :value="300">5m</a-select-option>
|
<a-select-option :value="300">5m</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</template>
|
</template>
|
||||||
<div style="padding: 8px 0;">
|
<div style="padding:16px">
|
||||||
<sparkline :data="cpuHistoryLong" :labels="cpuHistoryLabels" :vb-width="840" :height="220"
|
<sparkline :data="cpuHistoryLong" :labels="cpuHistoryLabels" :vb-width="840" :height="220"
|
||||||
:stroke="status.cpu.color" :stroke-width="2.2" :show-grid="true" :show-axes="true" :tick-count-x="5"
|
:stroke="status.cpu.color" :stroke-width="2.2" :show-grid="true" :show-axes="true" :tick-count-x="5"
|
||||||
:max-points="cpuHistoryLong.length" :fill-opacity="0.18" :marker-radius="3.2" :show-tooltip="true" />
|
:max-points="cpuHistoryLong.length" :fill-opacity="0.18" :marker-radius="3.2" :show-tooltip="true" />
|
||||||
|
|
@ -466,7 +466,7 @@
|
||||||
strokeWidth: { type: Number, default: 2 },
|
strokeWidth: { type: Number, default: 2 },
|
||||||
maxPoints: { type: Number, default: 120 },
|
maxPoints: { type: Number, default: 120 },
|
||||||
showGrid: { type: Boolean, default: true },
|
showGrid: { type: Boolean, default: true },
|
||||||
gridColor: { type: String, default: 'rgba(255,255,255,0.08)' },
|
gridColor: { type: String, default: 'rgba(0,0,0,0.1)' },
|
||||||
fillOpacity: { type: Number, default: 0.15 },
|
fillOpacity: { type: Number, default: 0.15 },
|
||||||
showMarker: { type: Boolean, default: true },
|
showMarker: { type: Boolean, default: true },
|
||||||
markerRadius: { type: Number, default: 2.8 },
|
markerRadius: { type: Number, default: 2.8 },
|
||||||
|
|
@ -606,7 +606,7 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
template: `
|
template: `
|
||||||
<svg width="100%" :height="height" :viewBox="viewBoxAttr" preserveAspectRatio="none" style="display:block"
|
<svg width="100%" :height="height" :viewBox="viewBoxAttr" preserveAspectRatio="none" class="idx-cpu-history-svg"
|
||||||
@mousemove="onMouseMove" @mouseleave="onMouseLeave">
|
@mousemove="onMouseMove" @mouseleave="onMouseLeave">
|
||||||
<defs>
|
<defs>
|
||||||
<linearGradient id="spkGrad" x1="0" y1="0" x2="0" y2="1">
|
<linearGradient id="spkGrad" x1="0" y1="0" x2="0" y2="1">
|
||||||
|
|
@ -615,16 +615,16 @@
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
</defs>
|
</defs>
|
||||||
<g v-if="showGrid">
|
<g v-if="showGrid">
|
||||||
<line v-for="(g,i) in gridLines" :key="i" :x1="g.x1" :y1="g.y1" :x2="g.x2" :y2="g.y2" :stroke="gridColor" stroke-width="1"/>
|
<line v-for="(g,i) in gridLines" :key="i" :x1="g.x1" :y1="g.y1" :x2="g.x2" :y2="g.y2" :stroke="gridColor" stroke-width="1" class="cpu-grid-line" />
|
||||||
</g>
|
</g>
|
||||||
<g v-if="showAxes">
|
<g v-if="showAxes">
|
||||||
<!-- Y ticks/labels -->
|
<!-- Y ticks/labels -->
|
||||||
<g v-for="(t,i) in yTicks" :key="'y'+i">
|
<g v-for="(t,i) in yTicks" :key="'y'+i">
|
||||||
<text :x="Math.max(0, paddingLeft - 4)" :y="t.y + 4" text-anchor="end" font-size="10" fill="rgba(200,200,200,0.8)" v-text="t.label"></text>
|
<text class="cpu-grid-y-text" :x="Math.max(0, paddingLeft - 4)" :y="t.y + 4" text-anchor="end" font-size="10" fill="rgba(0,0,0,0.3)" v-text="t.label"></text>
|
||||||
</g>
|
</g>
|
||||||
<!-- X ticks/labels -->
|
<!-- X ticks/labels -->
|
||||||
<g v-for="(t,i) in xTicks" :key="'x'+i">
|
<g v-for="(t,i) in xTicks" :key="'x'+i">
|
||||||
<text :x="t.x" :y="paddingTop + drawHeight + 14" text-anchor="middle" font-size="10" fill="rgba(200,200,200,0.8)" v-text="t.label"></text>
|
<text class="cpu-grid-x-text" :x="t.x" :y="paddingTop + drawHeight + 14" text-anchor="middle" font-size="10" fill="rgba(0,0,0,0.3)" v-text="t.label"></text>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<path v-if="areaPath" :d="areaPath" fill="url(#spkGrad)" stroke="none" />
|
<path v-if="areaPath" :d="areaPath" fill="url(#spkGrad)" stroke="none" />
|
||||||
|
|
@ -632,9 +632,9 @@
|
||||||
<circle v-if="showMarker && lastPoint" :cx="lastPoint[0]" :cy="lastPoint[1]" :r="markerRadius" :fill="stroke" />
|
<circle v-if="showMarker && lastPoint" :cx="lastPoint[0]" :cy="lastPoint[1]" :r="markerRadius" :fill="stroke" />
|
||||||
<!-- Hover marker/tooltip -->
|
<!-- Hover marker/tooltip -->
|
||||||
<g v-if="showTooltip && hoverIdx >= 0">
|
<g v-if="showTooltip && hoverIdx >= 0">
|
||||||
<line :x1="pointsArr[hoverIdx][0]" :x2="pointsArr[hoverIdx][0]" :y1="paddingTop" :y2="paddingTop + drawHeight" stroke="rgba(255,255,255,0.25)" stroke-width="1" />
|
<line class="cpu-grid-h-line" :x1="pointsArr[hoverIdx][0]" :x2="pointsArr[hoverIdx][0]" :y1="paddingTop" :y2="paddingTop + drawHeight" stroke="rgba(0,0,0,0.2)" stroke-width="1" />
|
||||||
<circle :cx="pointsArr[hoverIdx][0]" :cy="pointsArr[hoverIdx][1]" r="3.5" :fill="stroke" />
|
<circle :cx="pointsArr[hoverIdx][0]" :cy="pointsArr[hoverIdx][1]" r="3.5" :fill="stroke" />
|
||||||
<text :x="pointsArr[hoverIdx][0]" :y="paddingTop + 12" text-anchor="middle" font-size="11" fill="#fff" style="paint-order: stroke; stroke: rgba(0,0,0,0.35); stroke-width: 3;" v-text="fmtHoverText()"></text>
|
<text class="cpu-grid-text" :x="pointsArr[hoverIdx][0]" :y="paddingTop + 12" text-anchor="middle" font-size="11" fill="rgba(0,0,0,0.8)" v-text="fmtHoverText()"></text>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
`,
|
`,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue