monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit b649b3ff3f3320b47c6617600265805a03323710 2 parents c509da14 046974f7

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

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 8 changed files with 433 additions and 128 deletions
... ... @@ -107,8 +107,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
$("#bizResTreeTableContent").hide();
// 如果是虚拟机或者物理主机，展示电源状态查询条件
if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {
// $('#biz_reslist_power_state').val('poweredOn');
if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST'|| 'VIRTUALIZATION_'+resType === 'VIRTUALIZATION_VHOST'|| 'VIRTUALIZATION_'+resType == 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {
$('#biz_reslist_power_state').val('poweredOn');
$('#biz_reslist_power_state_id').show();
} else {
$('#biz_reslist_power_state_id').hide();
... ... @@ -128,27 +128,34 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -268,27 +275,34 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ...
... ... @@ -3027,13 +3027,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: 250, sort: true,
templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
},
{field: 'shortName', title: '别名', minWidth: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
// {field: 'shortName', title: '别名', minWidth: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', minWidth: 83, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', minWidth: 161, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: 101, align: 'center'},
{field: 'weblogicVersion', title: 'weblogic版本号', align: 'center', width: 135, sort: true},
{field: 'patchId', title: '反序列化补丁版本号', align: 'center', width: 83, sort: true},
{field: 'javaVersion', title: 'Java版本号', align: 'center', width: 100, sort: true},
// {field: 'weblogicVersion', title: 'weblogic版本号', align: 'center', width: 135, sort: true},
// {field: 'patchId', title: '反序列化补丁版本号', align: 'center', width: 83, sort: true},
// {field: 'javaVersion', title: 'Java版本号', align: 'center', width: 100, sort: true},
{field: 'state', title: '资源状态', minWidth: 98, align: 'center', sort: true, templet: '#resStateTpl'}
],
"MIDDLEWARE_TOMCAT": [
... ...
... ... @@ -3351,6 +3351,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
} else if (res.resType === 'NETSAFE_FIREWALL') {
var str = 'NETSAFE_FIREWALL_' + res.provider;
url = common.detailPath(str, res.resId)
} else if (res.resType == "MIDDLEWARE_WEBLOGIC" && !res.parentId) {
url = common.detailPath("MIDDLEWARE_WEBLOGICCONSOLE");
} else {
url = common.detailPath(res.resType, res.resId, protocol,res);
}
... ...
layui.define(['tree', 'laypage', 'laytpl', 'commonDetail', 'common', 'table', 'sessions', 'commonCols'], function (exports) {
var commonDetail = layui.commonDetail;
var common = layui.common;
var table = layui.table;
var commonCols = layui.commonCols;
//对外暴露的接口
exports('middleware_weblogicconsole', function (data) {
var sessions = layui.sessions;
var access_token = sessions.getToken().access_token;
var resid = '';
var showFlag = common.getUrlParam("show");
if (showFlag && showFlag == '0') {
resid = common.getUrlParam("resId");
} else {
resid = data.resId;
}
commonDetail.bindTips();
// 控制台基本信息
var consolejbxxkpiId = "KPIE13DD9A3,KPIF74D9D2B";
reloadConsoleInfo();
//渲染控制台页面
function reloadConsoleInfo() {
commonDetail.renderResServerState("weblogicconsole_health_state", resid, "KPI4DA976AF");
//基本信息
commonDetail.renderText("weblogicconsole_jbxx", resid, consolejbxxkpiId);
//活动告警
commonDetail.renderActiveAlarms("weblogicconsole_alarmTable", resid);
// 服务列表
var sortKey = '';
var cols = commonCols.resTypeCls['MIDDLEWARE_WEBLOGIC'];
// logInfo('logInfoViewConsole',5);
//获取配置的列
common.getTableCols({
domId: 'indexResListTable',
moduleId: 'indexReslist',
resType: 'MIDDLEWARE_WEBLOGIC'
}, function (retCols) {
if (retCols) {
cols = retCols;
}
table.render({
elem: '#weblogicconsole_childrenTable'
, url: common.domainName + '/api-web/home/res-list/MIDDLEWARE_WEBLOGIC'
, where: {
access_token: access_token,
parentId: resid
}
, height: 'auto'
, cellMinWidth: 50
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
, theme: '#1E9FFF'
}
, autoSort: false
, limit: 5
, limits: [5, 10, 20, 30, 40, 50]
, cols: [cols]
, done: function (res) {
commonCols.colsClickEvent();
table.on('sort(weblogicconsole_childrenTable)', function (obj) {
//有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
if (obj.type != null) {
sortKey = obj.field + ' ' + obj.type;
} else {
sortKey = '';
}
reloadTable();
});
}
});
function reloadTable() {
table.reload('weblogicconsole_childrenTable', {
page: {
curr: 1
}
, where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
access_token: access_token,
sortKey: sortKey,
parentId: resid
}
})
}
});
//日志查看，内容取自ES
function logInfo(target,size) {
table.render({
elem: '#' + target
, url: common.domainName + '/api-web/log/getLogInfo'
, where: {
access_token: access_token,
resId: resid,
startTime: '',
endTime: ''
},
parseData: function (res) {
if (res && res.data && res.data.length === 0) {
$('#' + target).parent().parent().hide();
}
}
, height: 'auto'
, cellMinWidth: 50
, page: false
, autoSort: false
, limit: size
, cols: [[
{field: 'dbTimeStr', title: '时间戳', width: 200, align: 'center'},
{field: 'severityLabel', title: '日志级别', width: 150, align: 'center'},
{field: 'message', title: '日志内容', minWidth: 350, align: 'left'},
{field: 'timestamp', title: '采集时间', width: 200, align: 'center'},
]]
});
//更多日志
$("#logInfoViewConsoleMore").unbind("click").on("click", function () {
layer.open({
title: ['更多日志', 'font-size:18px;'],
type: 1,
area: ['90%','690px'],
content: $('#logViewPgaeConsoleMore').html(),
success: function () {
logInfo('logViewPageConsole',100);
}
});
});
}
}
//定时任务
var timer = setInterval(function () {
reloadConsoleInfo();
}, commonDetail.timerTime);
commonDetail.detailTimer.push(timer);
});
});
\ No newline at end of file
... ...
... ... @@ -49,7 +49,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
$(newContainer).removeClass('active');
setTimeout(function () {
$(newContainer).remove();
}, 700)
}, 10000700)
};
timer = setTimeout(timeOut, options.duration);
var newTimes;
... ... @@ -98,7 +98,10 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
$(newContent).css('cursor', 'pointer').on(options.type, options.action);
}
}, 1);
$(options.dom).append(newContainer);
//lsq 快照完成后提示框显示在最上面，需要把提示框添加到body下 20022-08-30
// $(options.dom).append(newContainer);
$('body').append(newContainer);
$('.ez_tips ').css('z-index','99999999');
} else if (options.toastType == 'faultinfo' || options.toastType == 'faultprogress' || options.toastType == 'faultover') {
var container = "<div class='fault_ez_tips " + options.toastType + "' style=" + firstDirection + ":" + options.margin + "px;transform:translateX(" + minus + "110%); ></div>"
... ...
<!--weblogic中间件详细页面-->
<style>
.detail-chart-left .chart-left-box {
border: 1px solid #eaeaea;
text-align: center;
margin-top: 15px;
margin-left: 19px;
}
.detail-chart-left .chart-left-box:last-child{
margin-bottom: 5px;
}
.detail-chart-left .chart-left-box p:first-child{
font-size: 15px;
font-weight: bold;
line-height: 31px;
}
.detail-chart-left .chart-left-box p:last-child{
line-height: 18px;
}
.chart-bottom-infobox{
text-align: center;
width: 84%;
float: left;
/*text-decoration: underline;*/
}
</style>
<article class="page-container template">
<div class="page-panel">
<div class="main">
<div class="layui-card">
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">基本信息<i data-id="weblogicconsole_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="weblogicconsole_jbxx" style="height: auto"></ul>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">服务列表</h5>
<div id="weblogicconsole_childrenTable" lay-filter="weblogicconsole_childrenTable"></div>
</div>
</div>
<!--<div class="lay-row logInfo">
<div class="lay-row-item">
<h5 class="lay-row-title">日志信息<span id="logInfoViewConsoleMore" class="layui-table-link">更多</span></h5>
<div id="logInfoViewConsole"></div>
</div>
</div>-->
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="weblogicconsole_alarmTable"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</article>
<script type="text/html" id="logViewPgaeConsoleMore">
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="layui-card">
<div class="layui-card-body moreLog">
<table id="logViewPageConsole"></table>
</div>
</div>
</div>
</div>
</article>
</script>
<textarea id="middleware_weblogicconsole_param_id" style="display: none;">{{d}}</textarea>
<script>
layui.use('middleware_weblogicconsole', function (fn) {
var $ = layui.$;
var parm = $("#middleware_weblogicconsole_param_id").val();
if(parm.indexOf('{{d') != -1){
fn();
}else{
fn(JSON.parse(parm));
}
});
</script>
\ No newline at end of file
... ...
... ... @@ -447,27 +447,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf('OperatingSystem')!=-1){
}else{
fieldExpandArr.push('OperatingSystem');
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -592,27 +599,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -712,27 +726,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -845,27 +866,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ...
... ... @@ -211,27 +211,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -839,27 +846,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -1076,27 +1090,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ... @@ -1240,27 +1261,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
}
})
}
}
... ...