Merge branch 'main' of github.com:Runner-Go-Team/RunnerGo-fe-open

Runner-Go-Team · Apr 17, 2023 · b5aaade · b5aaade
2 parents 423077d + f8deeab
commit b5aaade
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /node_modules
-
-.DS_Store
+.idea
+.DS_Store
diff --git a/src/pages/EmailReport/reportDetail/pressMonitor/index.jsx b/src/pages/EmailReport/reportDetail/pressMonitor/index.jsx
@@ -140,7 +140,13 @@ const PressMonitor = (props) => {
  lineStyle: {
  color: theme === 'dark' ? '#39393D' : '#E9E9E9'
  }
- }
+ },
+ max: function() {
+ return name === 'cpu' || name === "mem" ? 100 : undefined;
+ },
+ min: function() {
+ return name === 'cpu' || name === "mem" ? 0 : undefined;
+ },
  },
  // dataZoom: [
  // {
@@ -214,4 +220,4 @@ const PressMonitor = (props) => {
  )
 };
 
-export default PressMonitor;
+export default PressMonitor;
diff --git a/src/pages/Report/reportDetail/pressMonitor/index.jsx b/src/pages/Report/reportDetail/pressMonitor/index.jsx
@@ -89,7 +89,7 @@ const PressMonitor = (props) => {
  team_id: localStorage.getItem('team_id'),
  report_id: report_id ? report_id : JSON.parse(contrast)[select_plan].report_id,
  };
- 
+
  Bus.$emit('sendWsMessage', JSON.stringify({
  route_url: "stress_report_machine_monitor",
  param: JSON.stringify(query)
@@ -128,7 +128,7 @@ const PressMonitor = (props) => {
  // } else {
  // return value[0].value[1];
  // }
- 
+
  // }
  },
  xAxis: {
@@ -174,7 +174,13 @@ const PressMonitor = (props) => {
  lineStyle: {
  color: theme === 'dark' ? '#39393D' : '#E9E9E9'
  }
- }
+ },
+ max: function() {
+ return name === 'cpu' || name === "mem" ? 100 : undefined;
+ },
+ min: function() {
+ return name === 'cpu' || name === "mem" ? 0 : undefined;
+ },
  },
  // dataZoom: [
  // {
@@ -187,7 +193,7 @@ const PressMonitor = (props) => {
  // end: 20
  // }
  // ],
- series: name === 'net_io' ? 
+ series: name === 'net_io' ?
  [
  {
  name: "net_out",
@@ -209,7 +215,7 @@ const PressMonitor = (props) => {
  return [item[0], item[3]]
  }),
  }
- ] : 
+ ] :
  [
  {
  name,
@@ -248,4 +254,4 @@ const PressMonitor = (props) => {
  )
 };
 
-export default PressMonitor;
+export default PressMonitor;