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', @@ -2979,111 +2979,124 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2979 layer.close(subtips); 2979 layer.close(subtips);
2980 }); 2980 });
2981 //lsq T3和IOP点击修改删除 2022-08-04 2981 //lsq T3和IOP点击修改删除 2022-08-04
2982 - $('.edit-delete-tpl').unbind('click').on('click',function (){  
2983 - var $T3Dom = $(this);  
2984 - //判断是字段类型T3/IOP  
2985 - let tplType=$T3Dom.data('tpltype');  
2986 - //获取资源id  
2987 - var resId = $T3Dom.data('resid');  
2988 - //获取旧数据  
2989 - let old_T3Dom=$T3Dom.text();  
2990 - //获取扩展字段id  
2991 - let expandId=$T3Dom.data('expandid');  
2992 - //获取字段为输入框或者下拉选择 0 输入框 1下拉选择  
2993 - let fieldSourceType=$T3Dom.data('fieldsourcetype');  
2994 - //获取下拉选择值  
2995 - let fieldList=$T3Dom.data('list');  
2996 - let url='/api-web/resource/expand/saveOrUpdate';  
2997 - //判断类型是输入框还是下拉列表  
2998 - let titleName='';  
2999 - let promptHtml='';  
3000 - if(fieldSourceType == '0'){  
3001 - titleName='请输入';  
3002 - promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`  
3003 - }else if(fieldSourceType== '1'){  
3004 - titleName='请选择';  
3005 - promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`  
3006 - if(fieldList){  
3007 - let fieldListArr=fieldList.split(",")  
3008 - fieldListArr.map(item=>{  
3009 - promptHtml+=`<option value="`+item+`">`+item+`</option>`;  
3010 - })  
3011 - }  
3012 - promptHtml+=`</select>`;  
3013 - }else{  
3014 - promptHtml=``  
3015 - }  
3016 - let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;  
3017 - layer.open({  
3018 - title: [titleName+tplType, 'font-size:14px;'],  
3019 - type: 1,  
3020 - area: ['280px','170px'],  
3021 - content: html_tpl,  
3022 - success: function () {  
3023 - $('#promptInput').val(old_T3Dom) 2982 + let fsTypeEl=$('.edit-delete-tpl');
  2983 + if(fsTypeEl && fsTypeEl.length>0){
  2984 + fsTypeEl.map((index,item)=>{
  2985 + if($(item).data('fieldsourcetype')=='text'){
  2986 + $(item).removeAttr('lay-tips')
3024 } 2987 }
3025 - , id: 'lay_T3_IOP' //设定一个id，防止重复弹出  
3026 - , btn: ['清空', '保存']  
3027 - , yes: function (index, layero) {  
3028 - layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {  
3029 - layer.load(2);  
3030 - admin.req({  
3031 - //删除T3值  
3032 - url: common.domainName + url,  
3033 - data: {  
3034 - resId:resId,  
3035 - fieldValue:'',  
3036 - expandId:expandId,//扩展字段id 2988 + })
  2989 + }
  2990 + $('.edit-delete-tpl').unbind('click').on('click',function (){
  2991 + var $T3Dom = $(this);
  2992 + //判断是字段类型T3/IOP
  2993 + let tplType=$T3Dom.data('tpltype');
  2994 + //获取资源id
  2995 + var resId = $T3Dom.data('resid');
  2996 + //获取旧数据
  2997 + let old_T3Dom=$T3Dom.text();
  2998 + //获取扩展字段id
  2999 + let expandId=$T3Dom.data('expandid');
  3000 + //获取字段为输入框或者下拉选择 0 输入框 1下拉选择
  3001 + let fieldSourceType=$T3Dom.data('fieldsourcetype');
  3002 + if(fieldSourceType!='text'){
  3003 + //获取下拉选择值
  3004 + let fieldList=$T3Dom.data('list');
  3005 + let url='/api-web/resource/expand/saveOrUpdate';
  3006 + //判断类型是输入框还是下拉列表
  3007 + let titleName='';
  3008 + let promptHtml='';
  3009 + if(fieldSourceType == 'input'){
  3010 + titleName='请输入';
  3011 + promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
  3012 + }else if(fieldSourceType== 'select'){
  3013 + titleName='请选择';
  3014 + promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
  3015 + if(fieldList){
  3016 + let fieldListArr=fieldList.split(",")
  3017 + fieldListArr.map(item=>{
  3018 + promptHtml+=`<option value="`+item+`">`+item+`</option>`;
  3019 + })
  3020 + }
  3021 + promptHtml+=`</select>`;
  3022 + }else{
  3023 + titleName='请查看';
  3024 + promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
  3025 + }
  3026 + let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
  3027 + layer.open({
  3028 + title: [titleName+tplType, 'font-size:14px;'],
  3029 + type: 1,
  3030 + area: ['280px','170px'],
  3031 + content: html_tpl,
  3032 + success: function () {
  3033 + $('#promptInput').val(old_T3Dom)
  3034 + }
  3035 + , id: 'lay_T3_IOP' //设定一个id，防止重复弹出
  3036 + , btn: ['清空', '保存']
  3037 + , yes: function (index, layero) {
  3038 + layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
  3039 + layer.load(2);
  3040 + admin.req({
  3041 + //删除T3值
  3042 + url: common.domainName + url,
  3043 + data: {
  3044 + resId:resId,
  3045 + fieldValue:'',
  3046 + expandId:expandId,//扩展字段id
3037 3047
3038 - },  
3039 - }).done(function (response) {  
3040 - layer.closeAll('loading');  
3041 - if (response.success) {  
3042 - layer.msg('删除成功!', {icon: 1, time: 3000});  
3043 - $T3Dom.text(''); 3048 + },
  3049 + }).done(function (response) {
  3050 + layer.closeAll('loading');
  3051 + if (response.success) {
  3052 + layer.msg('删除成功!', {icon: 1, time: 3000});
  3053 + $T3Dom.text('');
  3054 + } else {
  3055 + layer.msg('删除失败!', {icon: 2, time: 3000});
  3056 + }
  3057 + layer.close(index);
  3058 + });
  3059 + })
  3060 + }
  3061 + , btn2:function(index, layero){
  3062 + var value = $('#promptInput').val();
  3063 + if (value !== old_T3Dom) {
  3064 + layer.load(2);
  3065 +
  3066 + admin.req({
  3067 + //修改扩展字段T3/IOp值
  3068 + url: common.domainName + url,
  3069 + data: {
  3070 + resId:resId,
  3071 + fieldValue:value,
  3072 + expandId:expandId,//扩展字段id
  3073 +
  3074 + },
  3075 + success: function (response) {
  3076 + layer.closeAll('loading');
  3077 + if (response && response.success) {
  3078 + layer.msg('修改成功', {icon: 1});
  3079 + $T3Dom.text(value);
  3080 + } else {
  3081 + layer.msg('修改失败', {icon: 2});
  3082 + }
  3083 + layer.close(index);
  3084 +
  3085 + },
  3086 + error: function (err) {
  3087 + layer.closeAll('loading');
  3088 + layer.msg('修改失败', {icon: 2});
  3089 + }
  3090 + });
3044 } else { 3091 } else {
3045 - layer.msg('删除失败!', {icon: 2, time: 3000}); 3092 + layer.close(index);
3046 } 3093 }
3047 - layer.close(index);  
3048 - });  
3049 - }) 3094 + },
  3095 + });
3050 } 3096 }
3051 - , btn2:function(index, layero){  
3052 - var value = $('#promptInput').val();  
3053 - if (value !== old_T3Dom) {  
3054 - layer.load(2);  
3055 -  
3056 - admin.req({  
3057 - //修改扩展字段T3/IOp值  
3058 - url: common.domainName + url,  
3059 - data: {  
3060 - resId:resId,  
3061 - fieldValue:value,  
3062 - expandId:expandId,//扩展字段id  
3063 3097
3064 - },  
3065 - success: function (response) {  
3066 - layer.closeAll('loading');  
3067 - if (response && response.success) {  
3068 - layer.msg('修改成功', {icon: 1});  
3069 - $T3Dom.text(value);  
3070 - } else {  
3071 - layer.msg('修改失败', {icon: 2});  
3072 - }  
3073 - layer.close(index); 3098 + })
3074 3099
3075 - },  
3076 - error: function (err) {  
3077 - layer.closeAll('loading');  
3078 - layer.msg('修改失败', {icon: 2});  
3079 - }  
3080 - });  
3081 - } else {  
3082 - layer.close(index);  
3083 - }  
3084 - },  
3085 - });  
3086 - })  
3087 //end lsq T3和IOP点击修改/删除 2022-08-04 3100 //end lsq T3和IOP点击修改/删除 2022-08-04
3088 function showTips(id, message, state) { 3101 function showTips(id, message, state) {
3089 subtips = layer.tips(state + "失败原因：" + message, 3102 subtips = layer.tips(state + "失败原因：" + message,
@@ -811,29 +811,24 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -811,29 +811,24 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
811 }); 811 });
812 //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05 812 //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
813 admin.req({ 813 admin.req({
814 - url: this.domainName + "/api-web/resource/expand/list?resType=" + resType 814 + url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
815 , done: function (res) { 815 , done: function (res) {
816 if (res && res.data ) { 816 if (res && res.data ) {
817 let arr=res.data; 817 let arr=res.data;
818 - //lsq 资源管理增加扩展字段 待验证 2022-08-12  
819 - // if(this.fieldExpandArr.indexOf(resType)!=-1){  
820 - // }else{  
821 - // this.fieldExpandArr.push(resType);  
822 - if(arr.length>0){  
823 - arr.map(item=>{  
824 - let listStr='';  
825 - if(item.list && item.list.length>0){  
826 - listStr=item.list.join(',')  
827 - }  
828 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,  
829 - templet:` <div>  
830 - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"  
831 - data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">  
832 - {{d.`+item.field+` ? d.`+item.field+` : ''}}  
833 - </div></div>`})  
834 - })  
835 - }  
836 - // } 818 + if(arr.length>0){
  819 + arr.map(item=>{
  820 + let listStr='';
  821 + if(item.list && item.list.length>0){
  822 + listStr=item.list.join(',')
  823 + }
  824 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
  825 + templet:` <div>
  826 + <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
  827 + data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
  828 + {{d.`+item.field+` ? d.`+item.field+` : ''}}
  829 + </div></div>`})
  830 + })
  831 + }
837 } else { 832 } else {
838 console.log(res.msg); 833 console.log(res.msg);
839 } 834 }
@@ -1133,111 +1128,122 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -1133,111 +1128,122 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
1133 resTopo(); 1128 resTopo();
1134 1129
1135 //lsq T3和IOP点击修改删除 2022-08-04 1130 //lsq T3和IOP点击修改删除 2022-08-04
1136 - $('.edit-delete-tpl').unbind('click').on('click',function (){  
1137 - var $T3Dom = $(this);  
1138 - //判断是字段类型T3/IOP  
1139 - let tplType=$T3Dom.data('tpltype');  
1140 - //获取资源id  
1141 - var resId = $T3Dom.data('resid');  
1142 - //获取旧数据  
1143 - let old_T3Dom=$T3Dom.text();  
1144 - //获取扩展字段id  
1145 - let expandId=$T3Dom.data('expandid');  
1146 - //获取字段为输入框或者下拉选择 0 输入框 1下拉选择  
1147 - let fieldSourceType=$T3Dom.data('fieldsourcetype');  
1148 - //获取下拉选择值  
1149 - let fieldList=$T3Dom.data('list');  
1150 - let url='/api-web/resource/expand/saveOrUpdate';  
1151 - //判断类型是输入框还是下拉列表  
1152 - let titleName='';  
1153 - let promptHtml='';  
1154 - if(fieldSourceType == '0'){  
1155 - titleName='请输入';  
1156 - promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`  
1157 - }else if(fieldSourceType== '1'){  
1158 - titleName='请选择';  
1159 - promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`  
1160 - if(fieldList){  
1161 - let fieldListArr=fieldList.split(",")  
1162 - fieldListArr.map(item=>{  
1163 - promptHtml+=`<option value="`+item+`">`+item+`</option>`;  
1164 - })  
1165 - }  
1166 - promptHtml+=`</select>`;  
1167 - }else{  
1168 - promptHtml=``  
1169 - }  
1170 - let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;  
1171 - layer.open({  
1172 - title: [titleName+tplType, 'font-size:14px;'],  
1173 - type: 1,  
1174 - area: ['280px','170px'],  
1175 - content: html_tpl,  
1176 - success: function () {  
1177 - $('#promptInput').val(old_T3Dom) 1131 + let fsTypeEl=$('.edit-delete-tpl');
  1132 + if(fsTypeEl && fsTypeEl.length>0){
  1133 + fsTypeEl.map((index,item)=>{
  1134 + if($(item).data('fieldsourcetype')=='text'){
  1135 + $(item).removeAttr('lay-tips')
1178 } 1136 }
1179 - , id: 'lay_T3_IOP' //设定一个id，防止重复弹出  
1180 - , btn: ['清空', '保存']  
1181 - , yes: function (index, layero) {  
1182 - layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {  
1183 - layer.load(2);  
1184 - admin.req({  
1185 - //删除T3值  
1186 - url: common.domainName + url,  
1187 - data: {  
1188 - resId:resId,  
1189 - fieldValue:'',  
1190 - expandId:expandId,//扩展字段id  
1191 -  
1192 - },  
1193 - }).done(function (response) {  
1194 - layer.closeAll('loading');  
1195 - if (response.success) {  
1196 - layer.msg('删除成功!', {icon: 1, time: 3000});  
1197 - $T3Dom.text(''); 1137 + })
  1138 + }
  1139 + $('.edit-delete-tpl').unbind('click').on('click',function (){
  1140 + var $T3Dom = $(this);
  1141 + //判断是字段类型T3/IOP
  1142 + let tplType=$T3Dom.data('tpltype');
  1143 + //获取资源id
  1144 + var resId = $T3Dom.data('resid');
  1145 + //获取旧数据
  1146 + let old_T3Dom=$T3Dom.text();
  1147 + //获取扩展字段id
  1148 + let expandId=$T3Dom.data('expandid');
  1149 + //获取字段为输入框或者下拉选择 0 输入框 1下拉选择
  1150 + let fieldSourceType=$T3Dom.data('fieldsourcetype');
  1151 + if(fieldSourceType!='text'){
  1152 + //获取下拉选择值
  1153 + let fieldList=$T3Dom.data('list');
  1154 + let url='/api-web/resource/expand/saveOrUpdate';
  1155 + //判断类型是输入框还是下拉列表
  1156 + let titleName='';
  1157 + let promptHtml='';
  1158 + if(fieldSourceType == 'input'){
  1159 + titleName='请输入';
  1160 + promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
  1161 + }else if(fieldSourceType== 'select'){
  1162 + titleName='请选择';
  1163 + promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
  1164 + if(fieldList){
  1165 + let fieldListArr=fieldList.split(",")
  1166 + fieldListArr.map(item=>{
  1167 + promptHtml+=`<option value="`+item+`">`+item+`</option>`;
  1168 + })
  1169 + }
  1170 + promptHtml+=`</select>`;
  1171 + }else{
  1172 + titleName='请查看';
  1173 + promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
  1174 + }
  1175 + let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
  1176 + layer.open({
  1177 + title: [titleName+tplType, 'font-size:14px;'],
  1178 + type: 1,
  1179 + area: ['280px','170px'],
  1180 + content: html_tpl,
  1181 + success: function () {
  1182 + $('#promptInput').val(old_T3Dom)
  1183 + }
  1184 + , id: 'lay_T3_IOP' //设定一个id，防止重复弹出
  1185 + , btn: ['清空', '保存']
  1186 + , yes: function (index, layero) {
  1187 + layer.confirm('确认要删除吗？', {icon: 3, title: '提示'}, function (index1) {
  1188 + layer.load(2);
  1189 + admin.req({
  1190 + //删除T3值
  1191 + url: common.domainName + url,
  1192 + data: {
  1193 + resId:resId,
  1194 + fieldValue:'',
  1195 + expandId:expandId,//扩展字段id
  1196 +
  1197 + },
  1198 + }).done(function (response) {
  1199 + layer.closeAll('loading');
  1200 + if (response.success) {
  1201 + layer.msg('删除成功!', {icon: 1, time: 3000});
  1202 + $T3Dom.text('');
  1203 + } else {
  1204 + layer.msg('删除失败!', {icon: 2, time: 3000});
  1205 + }
  1206 + layer.close(index);
  1207 + });
  1208 + })
  1209 + }
  1210 + , btn2:function(index, layero){
  1211 + var value = $('#promptInput').val();
  1212 + if (value !== old_T3Dom) {
  1213 + layer.load(2);
  1214 +
  1215 + admin.req({
  1216 + //修改扩展字段T3/IOp值
  1217 + url: common.domainName + url,
  1218 + data: {
  1219 + resId:resId,
  1220 + fieldValue:value,
  1221 + expandId:expandId,//扩展字段id
  1222 +
  1223 + },
  1224 + success: function (response) {
  1225 + layer.closeAll('loading');
  1226 + if (response && response.success) {
  1227 + layer.msg('修改成功', {icon: 1});
  1228 + $T3Dom.text(value);
  1229 + } else {
  1230 + layer.msg('修改失败', {icon: 2});
  1231 + }
  1232 + layer.close(index);
  1233 +
  1234 + },
  1235 + error: function (err) {
  1236 + layer.closeAll('loading');
  1237 + layer.msg('修改失败', {icon: 2});
  1238 + }
  1239 + });
1198 } else { 1240 } else {
1199 - layer.msg('删除失败!', {icon: 2, time: 3000});  
1200 - }  
1201 - layer.close(index);  
1202 - });  
1203 - })  
1204 - }  
1205 - , btn2:function(index, layero){  
1206 - var value = $('#promptInput').val();  
1207 - if (value !== old_T3Dom) {  
1208 - layer.load(2);  
1209 -  
1210 - admin.req({  
1211 - //修改扩展字段T3/IOp值  
1212 - url: common.domainName + url,  
1213 - data: {  
1214 - resId:resId,  
1215 - fieldValue:value,  
1216 - expandId:expandId,//扩展字段id  
1217 -  
1218 - },  
1219 - success: function (response) {  
1220 - layer.closeAll('loading');  
1221 - if (response && response.success) {  
1222 - layer.msg('修改成功', {icon: 1});  
1223 - $T3Dom.text(value);  
1224 - } else {  
1225 - layer.msg('修改失败', {icon: 2});  
1226 - }  
1227 layer.close(index); 1241 layer.close(index);
1228 -  
1229 - },  
1230 - error: function (err) {  
1231 - layer.closeAll('loading');  
1232 - layer.msg('修改失败', {icon: 2});  
1233 } 1242 }
1234 - });  
1235 - } else {  
1236 - layer.close(index);  
1237 - }  
1238 - },  
1239 - });  
1240 - }) 1243 + },
  1244 + });
  1245 + }
  1246 + })
1241 //end lsq T3和IOP点击修改/删除 2022-08-04 1247 //end lsq T3和IOP点击修改/删除 2022-08-04
1242 } 1248 }
1243 }); 1249 });
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <template #content> 61 <template #content>
62 {{item.resTypeName}} 62 {{item.resTypeName}}
63 </template> 63 </template>
64 - <img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+item.health+'.png'"> 64 + <img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+(item.health?item.health:'no')+'.png'">
65 </el-tooltip> 65 </el-tooltip>
66 </el-col> 66 </el-col>
67 <el-col :span="16" style="color: #666666;"> 67 <el-col :span="16" style="color: #666666;">