Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【无】扩展字段接口增加参数parentId See merge request !933
Showing
4 changed files
with
11 additions
and
11 deletions
| @@ -124,7 +124,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | @@ -124,7 +124,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
| 124 | var cols = commonCols.resTypeCls[colResType]; | 124 | var cols = commonCols.resTypeCls[colResType]; |
| 125 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 125 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 126 | admin.req({ | 126 | admin.req({ |
| 127 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 127 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + parentId |
| 128 | , done: function (res) { | 128 | , done: function (res) { |
| 129 | if (res && res.data ) { | 129 | if (res && res.data ) { |
| 130 | let arr=res.data; | 130 | let arr=res.data; |
| @@ -271,7 +271,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | @@ -271,7 +271,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
| 271 | var cols = commonCols.resTypeCls[resType]; | 271 | var cols = commonCols.resTypeCls[resType]; |
| 272 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 272 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 273 | admin.req({ | 273 | admin.req({ |
| 274 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 274 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val() |
| 275 | , done: function (res) { | 275 | , done: function (res) { |
| 276 | if (res && res.data ) { | 276 | if (res && res.data ) { |
| 277 | let arr=res.data; | 277 | let arr=res.data; |
| @@ -838,7 +838,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -838,7 +838,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
| 838 | }); | 838 | }); |
| 839 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 839 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 840 | admin.req({ | 840 | admin.req({ |
| 841 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 841 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" +$("#resManageIndexForm").find("select[name='parentId']").val() |
| 842 | , done: function (res) { | 842 | , done: function (res) { |
| 843 | if (res && res.data ) { | 843 | if (res && res.data ) { |
| 844 | let arr=res.data; | 844 | let arr=res.data; |
| @@ -443,7 +443,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -443,7 +443,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 443 | }); | 443 | }); |
| 444 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 444 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 445 | admin.req({ | 445 | admin.req({ |
| 446 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem" | 446 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem" + "&parentId=" + $("#biz_res_cluster").val() |
| 447 | , done: function (res) { | 447 | , done: function (res) { |
| 448 | if (res && res.data ) { | 448 | if (res && res.data ) { |
| 449 | let arr=res.data; | 449 | let arr=res.data; |
| @@ -595,7 +595,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -595,7 +595,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 595 | var cols = commonCols.resTypeCls[resType]; | 595 | var cols = commonCols.resTypeCls[resType]; |
| 596 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 596 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 597 | admin.req({ | 597 | admin.req({ |
| 598 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 598 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_res_cluster").val() |
| 599 | , done: function (res) { | 599 | , done: function (res) { |
| 600 | if (res && res.data ) { | 600 | if (res && res.data ) { |
| 601 | let arr=res.data; | 601 | let arr=res.data; |
| @@ -722,7 +722,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -722,7 +722,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 722 | var cols = commonCols.resTypeCls[resType]; | 722 | var cols = commonCols.resTypeCls[resType]; |
| 723 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 723 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 724 | admin.req({ | 724 | admin.req({ |
| 725 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 725 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_res_cluster").val() |
| 726 | , done: function (res) { | 726 | , done: function (res) { |
| 727 | if (res && res.data ) { | 727 | if (res && res.data ) { |
| 728 | let arr=res.data; | 728 | let arr=res.data; |
| @@ -862,7 +862,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -862,7 +862,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 862 | var cols = commonCols.resTypeCls[resType]; | 862 | var cols = commonCols.resTypeCls[resType]; |
| 863 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 863 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 864 | admin.req({ | 864 | admin.req({ |
| 865 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 865 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val() |
| 866 | , done: function (res) { | 866 | , done: function (res) { |
| 867 | if (res && res.data ) { | 867 | if (res && res.data ) { |
| 868 | let arr=res.data; | 868 | let arr=res.data; |
| @@ -207,7 +207,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -207,7 +207,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 207 | } | 207 | } |
| 208 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 208 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 209 | admin.req({ | 209 | admin.req({ |
| 210 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 210 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val() |
| 211 | , done: function (res) { | 211 | , done: function (res) { |
| 212 | if (res && res.data ) { | 212 | if (res && res.data ) { |
| 213 | let arr=res.data; | 213 | let arr=res.data; |
| @@ -842,7 +842,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -842,7 +842,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 842 | var cols = commonCols.resTypeCls[resType]; | 842 | var cols = commonCols.resTypeCls[resType]; |
| 843 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 843 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 844 | admin.req({ | 844 | admin.req({ |
| 845 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 845 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val() |
| 846 | , done: function (res) { | 846 | , done: function (res) { |
| 847 | if (res && res.data ) { | 847 | if (res && res.data ) { |
| 848 | let arr=res.data; | 848 | let arr=res.data; |
| @@ -1086,7 +1086,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -1086,7 +1086,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 1086 | var cols = commonCols.resTypeCls[resType]; | 1086 | var cols = commonCols.resTypeCls[resType]; |
| 1087 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 1087 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 1088 | admin.req({ | 1088 | admin.req({ |
| 1089 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 1089 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val() |
| 1090 | , done: function (res) { | 1090 | , done: function (res) { |
| 1091 | if (res && res.data ) { | 1091 | if (res && res.data ) { |
| 1092 | let arr=res.data; | 1092 | let arr=res.data; |
| @@ -1257,7 +1257,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -1257,7 +1257,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 1257 | var cols = commonCols.resTypeCls[resType]; | 1257 | var cols = commonCols.resTypeCls[resType]; |
| 1258 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 | 1258 | //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 |
| 1259 | admin.req({ | 1259 | admin.req({ |
| 1260 | - url: common.domainName + "/api-web/resource/expand/list?resType=" + resType | 1260 | + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val() |
| 1261 | , done: function (res) { | 1261 | , done: function (res) { |
| 1262 | if (res && res.data ) { | 1262 | if (res && res.data ) { |
| 1263 | let arr=res.data; | 1263 | let arr=res.data; |
-
Please register or login to post a comment