monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 9dcfad32dd999ed40a3558610ba545b3fb1e7e44 2 parents 298b5f45 06b9dac6

Merge branch 'master-v32-lushangqing' into 'master' 

weblogic列表增加扩展字段，字段类型修改； 故障诊断基础资源卡片列表默认图标



See merge request !862
Inline Side-by-side
Showing 7 changed files with 239 additions and 220 deletions
... ... @@ -2979,111 +2979,124 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
layer.close(subtips);
});
//lsq T3和IOP点击修改删除 2022-08-04
$('.edit-delete-tpl').unbind('click').on('click',function (){
var $T3Dom = $(this);
//判断是字段类型T3/IOP
let tplType=$T3Dom.data('tpltype');
//获取资源id
var resId = $T3Dom.data('resid');
//获取旧数据
let old_T3Dom=$T3Dom.text();
//获取扩展字段id
let expandId=$T3Dom.data('expandid');
//获取字段为输入框或者下拉选择 0 输入框 1下拉选择
let fieldSourceType=$T3Dom.data('fieldsourcetype');
//获取下拉选择值
let fieldList=$T3Dom.data('list');
let url='/api-web/resource/expand/saveOrUpdate';
//判断类型是输入框还是下拉列表
let titleName='';
let promptHtml='';
if(fieldSourceType == '0'){
titleName='请输入';
promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
}else if(fieldSourceType== '1'){
titleName='请选择';
promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
if(fieldList){
let fieldListArr=fieldList.split(",")
fieldListArr.map(item=>{
promptHtml+=`<option value="`+item+`">`+item+`</option>`;
})
}
promptHtml+=`</select>`;
}else{
promptHtml=``
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
area: ['280px','170px'],
content: html_tpl,
success: function () {
$('#promptInput').val(old_T3Dom)
let fsTypeEl=$('.edit-delete-tpl');
if(fsTypeEl && fsTypeEl.length>0){
fsTypeEl.map((index,item)=>{
if($(item).data('fieldsourcetype')=='text'){
$(item).removeAttr('lay-tips')
}
, id: 'lay_T3_IOP' //设定一个id，防止重复弹出
, btn: ['清空', '保存']
, yes: function (index, layero) {
layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
layer.load(2);
admin.req({
//删除T3值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:'',
expandId:expandId,//扩展字段id
})
}
$('.edit-delete-tpl').unbind('click').on('click',function (){
var $T3Dom = $(this);
//判断是字段类型T3/IOP
let tplType=$T3Dom.data('tpltype');
//获取资源id
var resId = $T3Dom.data('resid');
//获取旧数据
let old_T3Dom=$T3Dom.text();
//获取扩展字段id
let expandId=$T3Dom.data('expandid');
//获取字段为输入框或者下拉选择 0 输入框 1下拉选择
let fieldSourceType=$T3Dom.data('fieldsourcetype');
if(fieldSourceType!='text'){
//获取下拉选择值
let fieldList=$T3Dom.data('list');
let url='/api-web/resource/expand/saveOrUpdate';
//判断类型是输入框还是下拉列表
let titleName='';
let promptHtml='';
if(fieldSourceType == 'input'){
titleName='请输入';
promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
}else if(fieldSourceType== 'select'){
titleName='请选择';
promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
if(fieldList){
let fieldListArr=fieldList.split(",")
fieldListArr.map(item=>{
promptHtml+=`<option value="`+item+`">`+item+`</option>`;
})
}
promptHtml+=`</select>`;
}else{
titleName='请查看';
promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
area: ['280px','170px'],
content: html_tpl,
success: function () {
$('#promptInput').val(old_T3Dom)
}
, id: 'lay_T3_IOP' //设定一个id，防止重复弹出
, btn: ['清空', '保存']
, yes: function (index, layero) {
layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
layer.load(2);
admin.req({
//删除T3值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:'',
expandId:expandId,//扩展字段id
},
}).done(function (response) {
layer.closeAll('loading');
if (response.success) {
layer.msg('删除成功!', {icon: 1, time: 3000});
$T3Dom.text('');
},
}).done(function (response) {
layer.closeAll('loading');
if (response.success) {
layer.msg('删除成功!', {icon: 1, time: 3000});
$T3Dom.text('');
} else {
layer.msg('删除失败!', {icon: 2, time: 3000});
}
layer.close(index);
});
})
}
, btn2:function(index, layero){
var value = $('#promptInput').val();
if (value !== old_T3Dom) {
layer.load(2);
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:value,
expandId:expandId,//扩展字段id
},
success: function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('修改成功', {icon: 1});
$T3Dom.text(value);
} else {
layer.msg('修改失败', {icon: 2});
}
layer.close(index);
},
error: function (err) {
layer.closeAll('loading');
layer.msg('修改失败', {icon: 2});
}
});
} else {
layer.msg('删除失败!', {icon: 2, time: 3000});
layer.close(index);
}
layer.close(index);
});
})
},
});
}
, btn2:function(index, layero){
var value = $('#promptInput').val();
if (value !== old_T3Dom) {
layer.load(2);
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:value,
expandId:expandId,//扩展字段id
},
success: function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('修改成功', {icon: 1});
$T3Dom.text(value);
} else {
layer.msg('修改失败', {icon: 2});
}
layer.close(index);
})
},
error: function (err) {
layer.closeAll('loading');
layer.msg('修改失败', {icon: 2});
}
});
} else {
layer.close(index);
}
},
});
})
//end lsq T3和IOP点击修改/删除 2022-08-04
function showTips(id, message, state) {
subtips = layer.tips(state + "失败原因：" + message,
... ...
... ... @@ -811,29 +811,24 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
});
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: this.domainName + "/api-web/resource/expand/list?resType=" + resType
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
//lsq 资源管理增加扩展字段 待验证 2022-08-12
// if(this.fieldExpandArr.indexOf(resType)!=-1){
// }else{
// this.fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
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" lay-tips="点击修改/删除" 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>`})
})
}
// }
if(arr.length>0){
arr.map(item=>{
let listStr='';
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
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" lay-tips="点击修改/删除" 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>`})
})
}
} else {
console.log(res.msg);
}
... ... @@ -1133,111 +1128,122 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
resTopo();
//lsq T3和IOP点击修改删除 2022-08-04
$('.edit-delete-tpl').unbind('click').on('click',function (){
var $T3Dom = $(this);
//判断是字段类型T3/IOP
let tplType=$T3Dom.data('tpltype');
//获取资源id
var resId = $T3Dom.data('resid');
//获取旧数据
let old_T3Dom=$T3Dom.text();
//获取扩展字段id
let expandId=$T3Dom.data('expandid');
//获取字段为输入框或者下拉选择 0 输入框 1下拉选择
let fieldSourceType=$T3Dom.data('fieldsourcetype');
//获取下拉选择值
let fieldList=$T3Dom.data('list');
let url='/api-web/resource/expand/saveOrUpdate';
//判断类型是输入框还是下拉列表
let titleName='';
let promptHtml='';
if(fieldSourceType == '0'){
titleName='请输入';
promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
}else if(fieldSourceType== '1'){
titleName='请选择';
promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
if(fieldList){
let fieldListArr=fieldList.split(",")
fieldListArr.map(item=>{
promptHtml+=`<option value="`+item+`">`+item+`</option>`;
})
}
promptHtml+=`</select>`;
}else{
promptHtml=``
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
area: ['280px','170px'],
content: html_tpl,
success: function () {
$('#promptInput').val(old_T3Dom)
let fsTypeEl=$('.edit-delete-tpl');
if(fsTypeEl && fsTypeEl.length>0){
fsTypeEl.map((index,item)=>{
if($(item).data('fieldsourcetype')=='text'){
$(item).removeAttr('lay-tips')
}
, id: 'lay_T3_IOP' //设定一个id，防止重复弹出
, btn: ['清空', '保存']
, yes: function (index, layero) {
layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
layer.load(2);
admin.req({
//删除T3值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:'',
expandId:expandId,//扩展字段id
},
}).done(function (response) {
layer.closeAll('loading');
if (response.success) {
layer.msg('删除成功!', {icon: 1, time: 3000});
$T3Dom.text('');
})
}
$('.edit-delete-tpl').unbind('click').on('click',function (){
var $T3Dom = $(this);
//判断是字段类型T3/IOP
let tplType=$T3Dom.data('tpltype');
//获取资源id
var resId = $T3Dom.data('resid');
//获取旧数据
let old_T3Dom=$T3Dom.text();
//获取扩展字段id
let expandId=$T3Dom.data('expandid');
//获取字段为输入框或者下拉选择 0 输入框 1下拉选择
let fieldSourceType=$T3Dom.data('fieldsourcetype');
if(fieldSourceType!='text'){
//获取下拉选择值
let fieldList=$T3Dom.data('list');
let url='/api-web/resource/expand/saveOrUpdate';
//判断类型是输入框还是下拉列表
let titleName='';
let promptHtml='';
if(fieldSourceType == 'input'){
titleName='请输入';
promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
}else if(fieldSourceType== 'select'){
titleName='请选择';
promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
if(fieldList){
let fieldListArr=fieldList.split(",")
fieldListArr.map(item=>{
promptHtml+=`<option value="`+item+`">`+item+`</option>`;
})
}
promptHtml+=`</select>`;
}else{
titleName='请查看';
promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
area: ['280px','170px'],
content: html_tpl,
success: function () {
$('#promptInput').val(old_T3Dom)
}
, id: 'lay_T3_IOP' //设定一个id，防止重复弹出
, btn: ['清空', '保存']
, yes: function (index, layero) {
layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
layer.load(2);
admin.req({
//删除T3值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:'',
expandId:expandId,//扩展字段id
},
}).done(function (response) {
layer.closeAll('loading');
if (response.success) {
layer.msg('删除成功!', {icon: 1, time: 3000});
$T3Dom.text('');
} else {
layer.msg('删除失败!', {icon: 2, time: 3000});
}
layer.close(index);
});
})
}
, btn2:function(index, layero){
var value = $('#promptInput').val();
if (value !== old_T3Dom) {
layer.load(2);
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:value,
expandId:expandId,//扩展字段id
},
success: function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('修改成功', {icon: 1});
$T3Dom.text(value);
} else {
layer.msg('修改失败', {icon: 2});
}
layer.close(index);
},
error: function (err) {
layer.closeAll('loading');
layer.msg('修改失败', {icon: 2});
}
});
} else {
layer.msg('删除失败!', {icon: 2, time: 3000});
}
layer.close(index);
});
})
}
, btn2:function(index, layero){
var value = $('#promptInput').val();
if (value !== old_T3Dom) {
layer.load(2);
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + url,
data: {
resId:resId,
fieldValue:value,
expandId:expandId,//扩展字段id
},
success: function (response) {
layer.closeAll('loading');
if (response && response.success) {
layer.msg('修改成功', {icon: 1});
$T3Dom.text(value);
} else {
layer.msg('修改失败', {icon: 2});
}
layer.close(index);
},
error: function (err) {
layer.closeAll('loading');
layer.msg('修改失败', {icon: 2});
}
});
} else {
layer.close(index);
}
},
});
})
},
});
}
})
//end lsq T3和IOP点击修改/删除 2022-08-04
}
});
... ...
... ... @@ -61,7 +61,7 @@
<template #content>
{{item.resTypeName}}
</template>
<img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+item.health+'.png'">
<img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+(item.health?item.health:'no')+'.png'">
</el-tooltip>
</el-col>
<el-col :span="16" style="color: #666666;">
... ...