Toggle navigation
Toggle navigation
This project
Loading...
Sign in
monitor_v3
/
anji-plus-report
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
鲁尚清
3 years ago
Commit
4a40cec5825dd67f12bfed10795e19824767b2ef
1 parent
f54227be
是否刷新功能
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
64 additions
and
18 deletions
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-line-trend.js
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-liquid-Fill-chart.js
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-system-information.js
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-table-page.js
report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/customLineTrend.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/customLiquidFillChart.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/customPiePercentageCard.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/progressInformation.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/systemInformation.vue
report-ui/src/views/report/bigscreen/designer/widget/monitor/tablePage.vue
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js
View file @
4a40cec
...
...
@@ -728,6 +728,14 @@ export const monitorCustomBarLineChart = {
value
:
'staticData'
,
},
{
type
:
'el-switch'
,
label
:
'是否刷新'
,
name
:
'isRefresh'
,
relactiveDom
:
'dataType'
,
relactiveDomValue
:
'dynamicData'
,
value
:
false
},
{
type
:
'el-input-number'
,
label
:
'刷新时间(毫秒)'
,
name
:
'refreshTime'
,
...
...
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-line-trend.js
View file @
4a40cec
...
...
@@ -646,6 +646,14 @@ export const monitorCustomLineTrend = {
value
:
'staticData'
,
},
{
type
:
'el-switch'
,
label
:
'是否刷新'
,
name
:
'isRefresh'
,
relactiveDom
:
'dataType'
,
relactiveDomValue
:
'dynamicData'
,
value
:
false
},
{
type
:
'el-input-number'
,
label
:
'刷新时间(毫秒)'
,
name
:
'refreshTime'
,
...
...
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-liquid-Fill-chart.js
View file @
4a40cec
...
...
@@ -332,6 +332,14 @@ export const monitorCustomLiquidFillChart = {
value
:
'staticData'
,
},
{
type
:
'el-switch'
,
label
:
'是否刷新'
,
name
:
'isRefresh'
,
relactiveDom
:
'dataType'
,
relactiveDomValue
:
'dynamicData'
,
value
:
false
},
{
type
:
'el-input-number'
,
label
:
'刷新时间(毫秒)'
,
name
:
'refreshTime'
,
...
...
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-system-information.js
View file @
4a40cec
...
...
@@ -206,6 +206,14 @@ export const monitorSystemInformation = {
value
:
'staticData'
,
},
{
type
:
'el-switch'
,
label
:
'是否刷新'
,
name
:
'isRefresh'
,
relactiveDom
:
'dataType'
,
relactiveDomValue
:
'dynamicData'
,
value
:
false
},
{
type
:
'el-input-number'
,
label
:
'刷新时间(毫秒)'
,
name
:
'refreshTime'
,
...
...
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-table-page.js
View file @
4a40cec
...
...
@@ -291,6 +291,14 @@ export const monitorTablePage = {
value
:
'staticData'
,
},
{
type
:
'el-switch'
,
label
:
'是否刷新'
,
name
:
'isRefresh'
,
relactiveDom
:
'dataType'
,
relactiveDomValue
:
'dynamicData'
,
value
:
false
},
{
type
:
'el-input-number'
,
label
:
'刷新时间(毫秒)'
,
name
:
'refreshTime'
,
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue
View file @
4a40cec
...
...
@@ -482,7 +482,7 @@ export default {
const optionsData = this.optionsData; // 数据类型 静态 or 动态
optionsData.dataType == "staticData"
? this.staticDataFn(optionsData.staticData)
: this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime);
: this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime
,optionsData.isRefresh
);
},
staticDataFn(val) {
const series = this.options.series;
...
...
@@ -505,9 +505,9 @@ export default {
}
}
},
dynamicDataFn(val, refreshTime) {
dynamicDataFn(val, refreshTime
,isRefresh
) {
if (!val) return;
if (this.ispreview) {
if (this.ispreview
&& isRefresh
) {
this.getEchartData(val);
this.flagInter = setInterval(() => {
this.getEchartData(val);
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/customLineTrend.vue
View file @
4a40cec
...
...
@@ -348,7 +348,8 @@ export default {
: this.dynamicDataFn(
optionsData.dynamicData,
optionsData.refreshTime,
optionsSetup
optionsSetup,
optionsData.isRefresh
);
},
//去重
...
...
@@ -468,9 +469,9 @@ export default {
},
// 动态数据
dynamicDataFn(val, refreshTime, optionsSetup) {
dynamicDataFn(val, refreshTime, optionsSetup
,isRefresh
) {
if (!val) return;
if (this.ispreview) {
if (this.ispreview
&& isRefresh
) {
this.getEchartData(val, optionsSetup);
this.flagInter = setInterval(() => {
this.getEchartData(val, optionsSetup);
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/customLiquidFillChart.vue
View file @
4a40cec
...
...
@@ -250,7 +250,8 @@ export default {
? this.staticDataFn(optionsData.staticData)
: this.dynamicDataFn(
optionsData.dynamicData,
optionsData.refreshTime
optionsData.refreshTime,
optionsData.isRefresh
);
},
staticDataFn(val) {
...
...
@@ -269,9 +270,9 @@ export default {
'top':num+'%'
};
},
dynamicDataFn(val, refreshTime) {
dynamicDataFn(val, refreshTime
,isRefresh
) {
if (!val) return;
if (this.ispreview) {
if (this.ispreview
&& isRefresh
) {
this.getEchartData(val);
this.flagInter = setInterval(() => {
this.getEchartData(val);
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/customPiePercentageCard.vue
View file @
4a40cec
...
...
@@ -282,24 +282,26 @@ export default {
let arrstorage=[];
let optionArr=[]
dataArr.map(item=>{
if(item.cpuSetRate){
if(item.cpuSetRate
|| item.cpuSetRate==0
){
arrCpu=[{
num:item.cpuSetRate,
name:'cpu容量'
}]
}
if(item.storageSetRate){
if(item.storageSetRate
|| item.storageSetRate==0
){
arrmemory=[{
num:item.storageSetRate,
name:'存储容量'
}]
}
if(item.memorySetRate){
if(item.memorySetRate
|| item.memorySetRate==0
){
arrstorage=[{
num:item.memorySetRate,
name:'内存容量'
}]
}
console.log("####",arrCpu,arrmemory,arrstorage)
if(arrCpu.length>0 && arrmemory.length>0 && arrstorage.length>0){
item.percentData=arrCpu.concat(arrmemory).concat(arrstorage);
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/progressInformation.vue
View file @
4a40cec
...
...
@@ -70,6 +70,7 @@ export default {
return{
width:this.optionsSetup.flexFlow=='column'?'100%':'auto',
height:this.optionsSetup.itemHeight+'px',
flex:this.optionsSetup.flexFlow!='column'?'1':'',
// 'border':this.optionsSetup.isBorder?'0.5px solid '+this.optionsSetup.borderColor:'none',
// 'box-shadow':this.optionsSetup.isShadow?'0px 3px 12px '+this.optionsSetup.borderColor:'none',
'background':this.optionsSetup.itemBackground
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/systemInformation.vue
View file @
4a40cec
...
...
@@ -166,7 +166,8 @@ export default {
? this.staticDataFn(optionsData.staticData)
: this.dynamicDataFn(
optionsData.dynamicData,
optionsData.refreshTime
optionsData.refreshTime,
optionsData.isRefresh
);
},
staticDataFn(val) {
...
...
@@ -175,9 +176,9 @@ export default {
}
},
dynamicDataFn(val, refreshTime) {
dynamicDataFn(val, refreshTime
,isRefresh
) {
if (!val) return;
if (this.ispreview) {
if (this.ispreview
&& isRefresh
) {
this.getEchartData(val);
this.flagInter = setInterval(() => {
this.getEchartData(val);
...
...
report-ui/src/views/report/bigscreen/designer/widget/monitor/tablePage.vue
View file @
4a40cec
...
...
@@ -298,7 +298,7 @@ export default {
const tableData = this.optionsData;
tableData.dataType == "staticData"
? this.handlerStaticData(tableData.staticData)
: this.handlerDynamicData(tableData.dynamicData, tableData.refreshTime);
: this.handlerDynamicData(tableData.dynamicData, tableData.refreshTime
,tableData.isRefresh
);
},
handlerStaticData(data) {
this.list = data;
...
...
@@ -306,9 +306,9 @@ export default {
this.loading = false;
this.loadingAll = false;
},
handlerDynamicData(data, refreshTime) {
handlerDynamicData(data, refreshTime
,isRefresh
) {
if (!data) return;
if (this.ispreview) {
if (this.ispreview
&& isRefresh
) {
this.getEchartData(data);
this.flagInter = setInterval(() => {
this.getEchartData(data);
...
...
Please
register
or
login
to post a comment