diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 1521c45..82350d9 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -347,6 +347,9 @@ export default {
]
};
myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ });
},
getFillMemoryInfo() {
fillMemoryInfo().then(res => {
@@ -416,6 +419,10 @@ export default {
]
};
myChart.setOption(option);
+ // 监听窗口大小变化
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ });
},
getFillJvmInfo() {
fillJvmInfo().then(res => {
@@ -484,6 +491,9 @@ export default {
]
};
myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ });
}
},
}
diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue
index 0559be6..a1e77f0 100644
--- a/src/views/data/dataSearch.vue
+++ b/src/views/data/dataSearch.vue
@@ -162,12 +162,12 @@ export default {
if (res.success) {
this.allTask = res.result
if (res.result.length > 0) {
- this.activeTaskId = res.result[0].id
+ this.activeTaskId = res.result[0].id
const start = moment(res.result[0].startTime)
- const end = moment(res.result[0].endTime)
- this.defaultTime.push(start, end)
+ const end = moment(res.result[0].endTime)
+ this.defaultTime.push(start, end)
this.tableParams.startTime = start.format(this.dateFormat);
- this.tableParams.endTime = end.format(this.dateFormat)
+ this.tableParams.endTime = end.format(this.dateFormat)
}
} else {
this.$message.warning(res.message);
@@ -175,13 +175,14 @@ export default {
})
},
handleTaskChange(value) {
- var curTask = this.allTask.filter(item => item.id == value)
- const start = moment(curTask.startTime)
- const end = moment(curTask.endTime)
- this.defaultTime.push(start, end)
- this.tableParams.startTime = start.format(this.dateFormat);
- this.tableParams.endTime = end.format(this.dateFormat)
-
+ var curTask = this.allTask.filter(item => item.id == value)[0]
+ if (curTask) {
+ const start = moment(curTask.startTime)
+ const end = moment(curTask.endTime)
+ this.defaultTime.push(start, end)
+ this.tableParams.startTime = start.format(this.dateFormat);
+ this.tableParams.endTime = end.format(this.dateFormat)
+ }
},
calculateScrollY() {
// 获取父容器高度(需减去表格内其他元素的高度,如分页栏)
diff --git a/src/views/data/statistics.vue b/src/views/data/statistics.vue
index f2aa2f3..245b561 100644
--- a/src/views/data/statistics.vue
+++ b/src/views/data/statistics.vue
@@ -3,96 +3,108 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
\ No newline at end of file
+}
+
+
\ No newline at end of file
diff --git a/src/views/task/statistics.vue b/src/views/task/statistics.vue
index ffd980b..d18ccd4 100644
--- a/src/views/task/statistics.vue
+++ b/src/views/task/statistics.vue
@@ -13,15 +13,15 @@
- 查询
+ 查询
-
+
选中
@@ -83,18 +83,20 @@
-
+
-
+
-
+
@@ -167,7 +169,7 @@ export default {
},
cleaningVariancesource: [],
totalNumberCataloguesData: [],
- selectedRowId :null
+ selectedRowId: null
}
},
mounted() {
@@ -189,7 +191,7 @@ export default {
this.selectedRowId = record.id;
},
class: {
- 'row-highlight': this.selectedRowId === record.id
+ 'row-highlight': this.selectedRowId === record.id
}
};
},
@@ -262,7 +264,7 @@ export default {
},
axisLine: {
lineStyle: {
- color:'#6C758B'
+ color: '#6C758B'
}
},
axisLine: {
@@ -292,6 +294,9 @@ export default {
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
};
myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ });
},
gettotalNumberCatalogues() {
var myChart = this.$echarts.init(this.$refs.totalNumberCatalogues);
@@ -317,6 +322,9 @@ export default {
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
};
myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ });
},
}
}
@@ -341,10 +349,12 @@ export default {
.quarter-div .datanum {
font-size: 26px;
}
+
/* 高亮样式 */
/deep/.row-highlight {
- background-color: #ffffff !important;
+ background-color: #ffffff !important;
}
+
.quarter-div .ant-col-8,
.quarter-div .ant-col-10 {
text-align: center;