monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 55c6a88895ba990718711f8763461684dba834f4 2 parents 8faae5ae b35c4cad

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev
Inline Side-by-side
Showing 5 changed files with 33 additions and 11 deletions
... ... @@ -124,7 +124,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
var cols = commonCols.resTypeCls[colResType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + parentId
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -271,7 +271,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ...
... ... @@ -118,6 +118,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
}
//加载右下角弹窗
loadRightBottomTips();
//长期登录账户自动刷新
getForeverUser();
//加载业务信息
function loadBizInfo() {
... ... @@ -2025,6 +2027,26 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
}
});
}
function getForeverUser(){
admin.req({
url: common.domainName + "/api-user/users/getForeverUser",
type: "get",
success: function (res) {
if (res.success) {
var lgn = localStorage.getItem("lgn");
if (res.str.indexOf(lgn) != -1) {
refresh();
}
}
}
});
}
function refresh(){
setInterval(function (){
loadBizInfo();
loadResTypeInfo();
},60000);
}
});
... ...
... ... @@ -838,7 +838,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
});
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" +$("#resManageIndexForm").find("select[name='parentId']").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ...
... ... @@ -443,7 +443,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
});
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem"
url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem" + "&parentId=" + $("#biz_res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -595,7 +595,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -722,7 +722,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -862,7 +862,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ...
... ... @@ -207,7 +207,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -842,7 +842,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -1086,7 +1086,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -1257,7 +1257,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ...