@riil-frontend/component-topology 9.0.0-a.5 → 9.0.0-a.6

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -24,7 +24,7 @@ function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
-  var arr = ['downNetDelayRatio', 'downRetansRatio', 'upNetDelayRatio', 'upRetransRatio'];
+  var arr = ['netDelayRatio', 'retansRatio'];
   var oldCodes = [];
   var newCodes = [];
   linkMetricCodes.map(function (item) {
@@ -52,39 +52,21 @@ function useMetricPolling(_ref) {
         linkOther: []
       };
 
-      if (newCodes.includes('downNetDelayRatio')) {
+      if (newCodes.includes('netDelayRatio')) {
         datas.linkOther.push({
-          'code': 'downNetDelayRatio',
+          'code': 'netDelayRatio',
           'name': '下行RTT时延',
           'ts': result.time,
-          'value': result.downNetDelayRatio + ' ms'
+          'value': result.upNetDelayRatio + ' ms' + '|' + result.downNetDelayRatio + ' ms'
         });
       }
 
-      if (newCodes.includes('downRetansRatio')) {
+      if (newCodes.includes('retansRatio')) {
         datas.linkOther.push({
-          'code': 'downRetansRatio',
-          'name': '下行重传率',
+          'code': 'retansRatio',
+          'name': '重传率',
           'ts': result.time,
-          'value': result.downRetansRatio + ' %'
-        });
-      }
-
-      if (newCodes.includes('upNetDelayRatio')) {
-        datas.linkOther.push({
-          'code': 'upNetDelayRatio',
-          'name': '上行RTT时延',
-          'ts': result.time,
-          'value': result.upNetDelayRatio + ' ms'
-        });
-      }
-
-      if (newCodes.includes('upRetransRatio')) {
-        datas.linkOther.push({
-          'code': 'upRetransRatio',
-          'name': '上行重传率',
-          'ts': result.time,
-          'value': result.upRetransRatio + ' %'
+          'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
         });
       }
 

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js

@@ -47,7 +47,7 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var monitorMetrics, ciMonitorMetricModels, checkMenus, isOpen, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, checkMenus, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -69,61 +69,28 @@ var useMetricModels = function useMetricModels(props) {
             case 6:
               checkMenus = _context.sent;
 
-              if (!(checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial'])) {
-                _context.next = 12;
-                break;
-              }
-
-              _context.next = 10;
-              return (0, _services.isOpenFlow)({
-                'name': resourceData.attributes.display_name
-              });
-
-            case 10:
-              isOpen = _context.sent;
-
-              //
-              if (isOpen) {
-                ciMonitorMetricModels.push({
+              if (checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial']) {
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downNetDelayRatio",
-                  id: "downNetDelayRatio",
+                  code: "netDelayRatio",
+                  id: "netDelayRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行RTT时延",
+                  name: "RTT时延",
                   unit: "ms"
                 });
-                ciMonitorMetricModels.push({
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downRetansRatio",
-                  id: "downRetansRatio",
+                  code: "retansRatio",
+                  id: "retansRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行重传率",
+                  name: "重传率",
                   unit: "%"
                 });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upNetDelayRatio",
-                  id: "upNetDelayRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行RTT时延",
-                  unit: "ms"
-                });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upRetransRatio",
-                  id: "upRetransRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行重传率",
-                  unit: "%"
-                });
-              }
+              } // 未监控不显示指标，临时在这里处理
+
 
-            case 12:
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
                 ciMonitorMetricModels = [];
               }
@@ -155,7 +122,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 17:
+            case 13:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.5",
+  "version": "9.0.0-a.6",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.5/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.6/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }