@riil-frontend/component-topology 9.0.0-a.3 → 9.0.0-a.30

package/lib/core/store/models/topoConfig.js

@@ -27,6 +27,8 @@ var _topoData = require("../../../utils/topoData");
 
 var _topoData2 = require("../../../core/models/topoData");
 
+var _networkLink = _interopRequireDefault(require("../../../networkTopo/services/topo/networkLink"));
+
 var _getTopoData = require("../../../networkTopo/getTopoData");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -264,24 +266,26 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, query, data;
+            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, _editState$ipNodes, ipNodes, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink;
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                    console.log("editState", editState);
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
                       groups: groups,
-                      exportLinkIdList: exportLinkIdList
+                      exportLinkIdList: exportLinkIdList,
+                      ipNodes: ipNodes
                     };
-                    _context2.next = 5;
+                    _context2.next = 6;
                     return _this2.getTopoByConditions(query);
 
-                  case 5:
+                  case 6:
                     data = _context2.sent;
 
                     _rlog["default"].debug("按配置查询拓扑数据", {
@@ -294,7 +298,7 @@ function _default(topoApp) {
 
                     return _context2.abrupt("return", data);
 
-                  case 8:
+                  case 9:
                   case "end":
                     return _context2.stop();
                 }
@@ -330,36 +334,42 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
-                    // rlog.debug("getTopoByConditions--------", params);
-                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
+                    _rlog["default"].debug("getTopoByConditions--------", params);
+
+                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                       return (0, _extends2["default"])({}, group, {
                         layout: (0, _topoData2.getLayoutId)(group.layout),
                         resources: (0, _topoData2.resToConditions)(group.resources)
                       });
-                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
+                    });
 
-                    _context4.next = 5;
-                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
 
-                  case 5:
+                    _context4.next = 7;
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+
+                  case 7:
                     data = _context4.sent;
-                    _context4.next = 8;
+
+                    _rlog["default"].debug("getTopoByConditions--------data", data);
+
+                    _context4.next = 11;
                     return (0, _getTopoData.buildData)(data);
 
-                  case 8:
+                  case 11:
                     data = _context4.sent;
-                    _context4.next = 11;
+                    _context4.next = 14;
                     return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 11:
+                  case 14:
                     _yield$Promise$all = _context4.sent;
                     dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -386,7 +396,7 @@ function _default(topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 19:
+                  case 22:
                   case "end":
                     return _context4.stop();
                 }
@@ -416,7 +426,7 @@ function _default(topoApp) {
                       }))
                     };
 
-                    _rlog["default"].debug('saveGlobalConfig', config);
+                    _rlog["default"].debug("saveGlobalConfig", config);
 
                     _context5.next = 5;
                     return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
@@ -485,6 +495,33 @@ function _default(topoApp) {
         switchToViewMode: function switchToViewMode() {
           this.reset();
           dispatch.topoMod.switchToViewMode();
+        },
+        queryAllLinkByIp: function queryAllLinkByIp(data) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+            var _result$data;
+
+            var ids, ip, result;
+            return _regenerator["default"].wrap(function _callee8$(_context8) {
+              while (1) {
+                switch (_context8.prev = _context8.next) {
+                  case 0:
+                    ids = data.ids, ip = data.ip;
+                    console.log("queryAllLinkByIp", ids, ip);
+                    _context8.next = 4;
+                    return _networkLink["default"].queryLinksByIp(ids, ip);
+
+                  case 4:
+                    result = _context8.sent;
+                    console.log("queryAllLinkByIp-result", result);
+                    return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
+
+                  case 7:
+                  case "end":
+                    return _context8.stop();
+                }
+              }
+            }, _callee8);
+          }))();
         }
       };
     }

package/lib/core/test/Test.js

@@ -27,6 +27,58 @@ var Test = /*#__PURE__*/function () {
   _proto.onReady = function onReady() {// TODO 待移除测试代码
     // this.iconManage.openUpload()
     // this.topo.store.getModelDispatchers('linkDynamicStyleConfig').open({type: 'networkLink'});
+  }
+  /**
+   * 关联IP示例代码
+   */
+  ;
+
+  _proto.createExportLink = function createExportLink() {
+    var htTopo = this.topo.getHtTopo();
+    var dm = htTopo.getGraphView().dm(); // 设置节点关联IP
+
+    var nodeElement = htTopo.getGraphView().sm().fd();
+    var ip = {
+      'id': 'ip:1.1.1.1',
+      'name': '1.1.1.1',
+      customName: null,
+      // 'groupId': null,
+      // 'groupTag': null,
+      'ipAddress': '1.1.1.1',
+      // 'attributes': [],
+      // 'metrics': [],
+      'type': 'node' // 'dtype': 'device'
+
+    };
+    nodeElement.a(ip);
+    nodeElement.setTag('ip:1.1.1.1');
+    var link = {
+      'id': '0000000019b462d1',
+      'name': '172.17.160.116(Gi2/2/0/1) - 172.27.130.13(Gi 0/9)',
+      'source': '00000000029f9411',
+      'target': 'ip:1.1.1.1',
+      'operation': 'delete',
+      'interfaceSource': '0000000018080aee',
+      'interfaceTarget': '000000000341b015',
+      'ciType': 'network_link',
+      'attributes': [],
+      'manageStatus': 0,
+      'permission': {
+        'readable': true,
+        'writeable': true,
+        'deleteable': true
+      },
+      'metrics': [],
+      'type': 'link',
+      'dtype': 'link'
+    };
+    var createElementsData = {
+      groups: [],
+      nodes: [],
+      links: [link],
+      linkGroups: []
+    };
+    htTopo.createElements(createElementsData);
   };
 
   return Test;

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

@@ -53,8 +53,6 @@ var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTo
 
 var _EventsCard = _interopRequireDefault(require("./EventsCard"));
 
-var _services2 = require("./components/LinkTopo/services");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -726,7 +724,7 @@ function ResourceOverview(props) {
     _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
+      var codes, endTime, params, _ref5, times, metricList, metricLists;
 
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
@@ -774,14 +772,7 @@ function ResourceOverview(props) {
 
             case 11:
               metricList = _context8.sent;
-              _context8.next = 14;
-              return (0, _services2.queryLastestValue)({
-                'id': data.attributes.name
-              });
-
-            case 14:
-              newMetricList = _context8.sent;
-              metricLists = metricList.concat(getNewMetricList(newMetricList));
+              metricLists = metricList.concat(getNewMetricList());
 
               _rlog.rlog.debug('metricColChange', metricLists, monitorMetricModels);
 
@@ -809,7 +800,7 @@ function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 20:
+            case 17:
             case "end":
               return _context8.stop();
           }
@@ -819,36 +810,20 @@ function ResourceOverview(props) {
     return _metricColChange.apply(this, arguments);
   }
 
-  var getNewMetricList = function getNewMetricList(data) {
+  var getNewMetricList = function getNewMetricList() {
     return [{
       errorMsg: null,
-      mainCiId: "downNetDelayRatio",
-      metricCode: "downNetDelayRatio",
-      metricValue: data.downNetDelayRatio,
-      subCiId: '',
-      subCiType: null,
-      mainCiType: null
-    }, {
-      errorMsg: null,
-      mainCiId: "downRetansRatio",
-      metricCode: "downRetansRatio",
-      metricValue: data.downRetansRatio,
-      subCiId: '',
-      subCiType: null,
-      mainCiType: null
-    }, {
-      errorMsg: null,
-      mainCiId: "upNetDelayRatio",
-      metricCode: "upNetDelayRatio",
-      metricValue: data.upNetDelayRatio,
+      mainCiId: "netDelayRatio",
+      metricCode: "netDelayRatio",
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null
     }, {
       errorMsg: null,
-      mainCiId: "upRetransRatio",
-      metricCode: "upRetransRatio",
-      metricValue: data.upRetransRatio,
+      mainCiId: "retansRatio",
+      metricCode: "retansRatio",
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null

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

@@ -25,6 +25,20 @@ function LinkTopo(props) {
     linkCi: data,
     linkMetricCodes: linkMetricCodes
   });
+  var linkMetrics = [].concat(metricData.linkMetrics, metricData.linkOther);
+  var linkMetricsList = [];
+
+  if (linkMetrics.length > 0) {
+    linkMetricCodes.forEach(function (e) {
+      var linkMetricsData = linkMetrics.filter(function (i) {
+        return e == i.code;
+      });
+      if (linkMetricsData.length > 0) linkMetricsList.push(linkMetricsData[0]);
+    });
+    metricData.linkMetrics = linkMetricsList;
+    metricData.linkOther = [];
+  }
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _LinkTopoModule["default"].container
   }, /*#__PURE__*/_react["default"].createElement(_componentCrucialLinkTopo["default"], (0, _extends2["default"])({

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

@@ -35,9 +35,9 @@ function LinkTopoCard(props) {
 
   var supportTemplates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
 
-  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial'];
+  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial']; //是不是关键链路
 
-  var _useState = (0, _react.useState)(-1),
+  var _useState = (0, _react.useState)(null),
       openFlow = _useState[0],
       setOpenFlow = _useState[1];
 
@@ -57,7 +57,7 @@ function LinkTopoCard(props) {
             case 2:
               checkMenus = _context.sent;
 
-              if (!(checkMenus[0].passed == 'PASS')) {
+              if (!(checkMenus[0].passed == 'PASS' && isCrucial)) {
                 _context.next = 10;
                 break;
               }
@@ -73,12 +73,12 @@ function LinkTopoCard(props) {
               //判断是不是有流量分析
               if (isOpen) {
                 setOpenFlow({
-                  name: '跳转关键链路详情',
+                  name: '查看流量构成',
                   url: linkDetailsUrl
                 });
               } else {
                 setOpenFlow({
-                  name: '跳转流量分析配置',
+                  name: '配置流量分析',
                   url: analysisUrl
                 });
               }
@@ -119,7 +119,9 @@ function LinkTopoCard(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement(_LinkTopo["default"], {
     data: data,
-    linkMetricCodes: metricCodes,
+    linkMetricCodes: openFlow && openFlow.name == '查看流量构成' ? metricCodes : metricCodes.filter(function (i) {
+      return i != 'netDelayRatio' && i != 'retansRatio';
+    }),
     openFlow: openFlow
   }));
 }

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

@@ -24,11 +24,11 @@ function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
-  var arr = ['downNetDelayRatio', 'downRetansRatio', 'upNetDelayRatio', 'upRetransRatio'];
-  var oldCodes = [];
-  var newCodes = [];
+  var arr = ['netDelayRatio', 'retansRatio'];
+  var codes = [];
+  var retansRatioNetDelayRatioCodes = [];
   linkMetricCodes.map(function (item) {
-    arr.indexOf(item) > -1 ? newCodes.push(item) : oldCodes.push(item);
+    arr.indexOf(item) > -1 ? retansRatioNetDelayRatioCodes.push(item) : codes.push(item);
   });
 
   var _useState = (0, _react.useState)({
@@ -42,53 +42,15 @@ function useMetricPolling(_ref) {
       data = _useState[0],
       setData = _useState[1];
 
-  var queryLastestValues = (0, _ahooks.useRequest)(_services.queryLastestValue, {
+  var queryLastestValues = (0, _ahooks.useRequest)(_services.queryRetansRatioNetDelayRatio, {
     pollingInterval: 1000 * 15,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      var datas = {
-        linkOther: []
-      };
-
-      if (newCodes.includes('downNetDelayRatio')) {
-        datas.linkOther.push({
-          'code': 'downNetDelayRatio',
-          'name': '下行RTT时延',
-          'ts': result.time,
-          'value': result.downNetDelayRatio + ' ms'
-        });
-      }
-
-      if (newCodes.includes('downRetansRatio')) {
-        datas.linkOther.push({
-          'code': 'downRetansRatio',
-          '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 + ' %'
-        });
-      }
-
-      setData((0, _extends2["default"])({}, data, datas));
+      setData((0, _extends2["default"])({}, data, {
+        linkOther: result
+      }));
     }
   }); // 轮询hooks
 
@@ -114,27 +76,38 @@ function useMetricPolling(_ref) {
       _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = oldCodes.map(function (item) {
+  var linkMetricCodesStr = codes.map(function (item) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
     if (linkId) {
       _rlog["default"].info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
-        oldCodes: oldCodes
+        codes: codes
       });
 
-      queryLinkMetricsRequest.run(linkCi, oldCodes);
-
-      if (newCodes.length > 0) {
-        queryLastestValues.run({
-          'id': linkCi.attributes.name
-        });
-      }
+      queryLinkMetricsRequest.run(linkCi, codes);
     }
 
     return function () {};
   }, [linkId, linkMetricCodesStr]);
+  var retansRatioNetDelayRatioCodesStr = retansRatioNetDelayRatioCodes.map(function (item) {
+    return item;
+  }).sort().join(',');
+  (0, _react.useEffect)(function () {
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标勾选rtt|重传率 轮询', {
+        linkCi: linkCi,
+        retansRatioNetDelayRatioCodes: retansRatioNetDelayRatioCodes
+      });
+
+      queryLastestValues.run({
+        'id': linkCi.attributes.name
+      }, retansRatioNetDelayRatioCodes);
+    }
+
+    return function () {};
+  }, [linkId, retansRatioNetDelayRatioCodesStr]);
   (0, _react.useEffect)(function () {
     if (linkId) {
       _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -10,6 +10,7 @@ exports.queryLastestValue = queryLastestValue;
 exports.queryLatestMetrics = queryLatestMetrics;
 exports.queryLinkInterfacesLatestMetrics = queryLinkInterfacesLatestMetrics;
 exports.queryLinkLatestMetrics = queryLinkLatestMetrics;
+exports.queryRetansRatioNetDelayRatio = queryRetansRatioNetDelayRatio;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -276,7 +277,7 @@ function isOpenFlow(_x6) {
   return _isOpenFlow.apply(this, arguments);
 }
 /**
- * @name  isOpenFlow 查指标值
+ * @name  queryLastestValue 查指标值
  * @returns  
  */
 
@@ -319,4 +320,60 @@ function _queryLastestValue() {
     }, _callee7);
   }));
   return _queryLastestValue.apply(this, arguments);
+}
+
+function queryRetansRatioNetDelayRatio(_x8, _x9) {
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
+}
+
+function _queryRetansRatioNetDelayRatio() {
+  _queryRetansRatioNetDelayRatio = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(params, retansRatioNetDelayRatioCodes) {
+    var result, linkOther;
+    return _regenerator["default"].wrap(function _callee8$(_context8) {
+      while (1) {
+        switch (_context8.prev = _context8.next) {
+          case 0:
+            if (retansRatioNetDelayRatioCodes.length) {
+              _context8.next = 2;
+              break;
+            }
+
+            return _context8.abrupt("return", []);
+
+          case 2:
+            _context8.next = 4;
+            return queryLastestValue(params);
+
+          case 4:
+            result = _context8.sent;
+            linkOther = [];
+
+            if (retansRatioNetDelayRatioCodes.includes('netDelayRatio')) {
+              linkOther.push({
+                'code': 'netDelayRatio',
+                'name': 'RTT时延',
+                'ts': result.time,
+                'value': (result.upNetDelayRatio * 1).toFixed(2) + ' ms' + '|' + (result.downNetDelayRatio * 1).toFixed(2) + ' ms'
+              });
+            }
+
+            if (retansRatioNetDelayRatioCodes.includes('retansRatio')) {
+              linkOther.push({
+                'code': 'retansRatio',
+                'name': '重传率',
+                'ts': result.time,
+                'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
+              });
+            }
+
+            return _context8.abrupt("return", linkOther);
+
+          case 9:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
 }

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

@@ -15,8 +15,6 @@ var _react = require("react");
 
 var _getCiDisplayMetricModels = require("../../../getCiDisplayMetricModels");
 
-var _services = require("../components/LinkTopo/services");
-
 /**
  * 概览指标定义
  * @param {*} props
@@ -47,7 +45,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, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -63,67 +61,29 @@ var useMetricModels = function useMetricModels(props) {
                   return item === m.code;
                 });
               });
-              _context.next = 6;
-              return (0, _services.checkMenu)();
-
-            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 (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 +115,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 17:
+            case 10:
             case "end":
               return _context.stop();
           }