monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit d7ec6aca5d0af652c8b41fa3b192a5f395e6cbd5 1 parent 7debfec4

chore:资源管理增加cmdb同步资源判定

Inline Side-by-side
Showing 1 changed file with 13 additions and 3 deletions
@@ -217,10 +217,20 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -217,10 +217,20 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
217 }); 217 });
218 var resTypeTree = treeTable.pidToChildren(resTypeList, "value", "parentId"); 218 var resTypeTree = treeTable.pidToChildren(resTypeList, "value", "parentId");
219 var initValue = []; 219 var initValue = [];
220 - if (bean.resType) {  
221 - initValue = [bean.resType];  
222 - } else { 220 + //当从cmdb同步数据，且没有配置采集协议是，可以调整资源类型 joke modify 20230316
  221 + if (bean.recordWay == 'cmdb_sync' && !bean.collProtocol){
223 $('#slt-res-manage-add-restype').parents('.layui-form-item').removeClass('hide'); 222 $('#slt-res-manage-add-restype').parents('.layui-form-item').removeClass('hide');
  223 + //如果有资源类型，则回填 joke add 20230317
  224 + if (bean.resType) {
  225 + initValue = [bean.resType];
  226 + }
  227 + }else{
  228 + if (bean.resType) {
  229 + initValue = [bean.resType];
  230 + } else {
  231 + //当从资产同步的资源，可以选择资源类型
  232 + $('#slt-res-manage-add-restype').parents('.layui-form-item').removeClass('hide');
  233 + }
224 } 234 }
225 xmSelect.render({ 235 xmSelect.render({
226 el: '#slt-res-manage-add-restype', 236 el: '#slt-res-manage-add-restype',