Merge branch 'master-mj-joke' into 'master-mj'
chore:资源管理增加cmdb同步资源判定 chore:资源管理增加cmdb同步资源判定 See merge request !1103
Showing
1 changed file
with
10 additions
and
0 deletions
| @@ -217,11 +217,21 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi | @@ -217,11 +217,21 @@ 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 | + //当从cmdb同步数据，且没有配置采集协议是，可以调整资源类型 joke modify 20230316 | ||
| 221 | + if (bean.recordWay == 'cmdb_sync' && !bean.collProtocol){ | ||
| 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{ | ||
| 220 | if (bean.resType) { | 228 | if (bean.resType) { |
| 221 | initValue = [bean.resType]; | 229 | initValue = [bean.resType]; |
| 222 | } else { | 230 | } else { |
| 231 | + //当从资产同步的资源，可以选择资源类型 | ||
| 223 | $('#slt-res-manage-add-restype').parents('.layui-form-item').removeClass('hide'); | 232 | $('#slt-res-manage-add-restype').parents('.layui-form-item').removeClass('hide'); |
| 224 | } | 233 | } |
| 234 | + } | ||
| 225 | xmSelect.render({ | 235 | xmSelect.render({ |
| 226 | el: '#slt-res-manage-add-restype', | 236 | el: '#slt-res-manage-add-restype', |
| 227 | name: "resType", | 237 | name: "resType", |
-
Please register or login to post a comment