Merge branch 'master-v32-lushangqing' into 'master'
停机管理页面右键点击无数据时提示元素名称 See merge request !602
Showing
1 changed file
with
36 additions
and
48 deletions
| @@ -3005,20 +3005,12 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3005,20 +3005,12 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3005 | //start lsq 停机计划中的右键点击事件 2022-05-19 | 3005 | //start lsq 停机计划中的右键点击事件 2022-05-19 |
| 3006 | contextmenuEvent: function (){ | 3006 | contextmenuEvent: function (){ |
| 3007 | var contextmenuTips; | 3007 | var contextmenuTips; |
| 3008 | - let text=''; | ||
| 3009 | let urlHash=window.location.hash; | 3008 | let urlHash=window.location.hash; |
| 3010 | $('[type=button]').contextmenu(function (e) { | 3009 | $('[type=button]').contextmenu(function (e) { |
| 3011 | e.preventDefault(); | 3010 | e.preventDefault(); |
| 3012 | //按钮 | 3011 | //按钮 |
| 3013 | - let elementName=$(this).text(); | ||
| 3014 | - var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3015 | - contextmenuEl+='</ul>'; | ||
| 3016 | - contextmenuTips = layer.tips(contextmenuEl, $(this), { | ||
| 3017 | - time: 0, | ||
| 3018 | - tips: [3, '#1e9fff'], | ||
| 3019 | - success() { | ||
| 3020 | - } | ||
| 3021 | - }) | 3012 | + let that=$(this); |
| 3013 | + let elementName=that.text(); | ||
| 3022 | admin.req({ | 3014 | admin.req({ |
| 3023 | url: common.domainName + '/api-web/bHalt' | 3015 | url: common.domainName + '/api-web/bHalt' |
| 3024 | ,data:{ | 3016 | ,data:{ |
| @@ -3028,18 +3020,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3028,18 +3020,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3028 | , async: false | 3020 | , async: false |
| 3029 | , done: function (res) { | 3021 | , done: function (res) { |
| 3030 | let liEle='' | 3022 | let liEle='' |
| 3023 | + var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3031 | if(res.data && res.data.length>0){ | 3024 | if(res.data && res.data.length>0){ |
| 3032 | let tipData=res.data; | 3025 | let tipData=res.data; |
| 3033 | tipData.map(item=>{ | 3026 | tipData.map(item=>{ |
| 3034 | - liEle+='<li>'+item.elementExplain+'</li>'; | 3027 | + contextmenuEl+='<li>'+item.elementExplain+'</li>'; |
| 3035 | }) | 3028 | }) |
| 3036 | - | ||
| 3037 | }else{ | 3029 | }else{ |
| 3038 | - liEle+='<li>暂无</li>'; | 3030 | + contextmenuEl+='<li>'+elementName+'</li>'; |
| 3031 | + } | ||
| 3032 | + contextmenuEl+='</ul>'; | ||
| 3033 | + contextmenuTips = layer.tips(contextmenuEl, that, { | ||
| 3034 | + time: 0, | ||
| 3035 | + tips: [3, '#1e9fff'], | ||
| 3036 | + success() { | ||
| 3039 | } | 3037 | } |
| 3040 | - setTimeout(function(){ | ||
| 3041 | - $('#tipContextmenu').append(liEle) | ||
| 3042 | - },100) | 3038 | + }) |
| 3043 | } | 3039 | } |
| 3044 | }) | 3040 | }) |
| 3045 | 3041 | ||
| @@ -3048,15 +3044,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3048,15 +3044,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3048 | $('td .layui-table-link').contextmenu(function (e) { | 3044 | $('td .layui-table-link').contextmenu(function (e) { |
| 3049 | e.preventDefault(); | 3045 | e.preventDefault(); |
| 3050 | //超链接 | 3046 | //超链接 |
| 3051 | - let elementName=$(this).text(); | ||
| 3052 | - var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3053 | - contextmenuEl+='</ul>'; | ||
| 3054 | - contextmenuTips = layer.tips(contextmenuEl, $(this), { | ||
| 3055 | - time: 0, | ||
| 3056 | - tips: [3, '#1e9fff'], | ||
| 3057 | - success() { | ||
| 3058 | - } | ||
| 3059 | - }) | 3047 | + let that=$(this); |
| 3048 | + let elementName=that.text(); | ||
| 3060 | admin.req({ | 3049 | admin.req({ |
| 3061 | url: common.domainName + '/api-web/bHalt' | 3050 | url: common.domainName + '/api-web/bHalt' |
| 3062 | ,data:{ | 3051 | ,data:{ |
| @@ -3066,19 +3055,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3066,19 +3055,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3066 | , async: false | 3055 | , async: false |
| 3067 | , done: function (res) { | 3056 | , done: function (res) { |
| 3068 | let liEle='' | 3057 | let liEle='' |
| 3058 | + var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3069 | if(res.data && res.data.length>0){ | 3059 | if(res.data && res.data.length>0){ |
| 3070 | let tipData=res.data; | 3060 | let tipData=res.data; |
| 3071 | tipData.map(item=>{ | 3061 | tipData.map(item=>{ |
| 3072 | - liEle+='<li>'+item.elementExplain+'</li>'; | 3062 | + contextmenuEl+='<li>'+item.elementExplain+'</li>'; |
| 3073 | }) | 3063 | }) |
| 3074 | - | ||
| 3075 | }else{ | 3064 | }else{ |
| 3076 | - liEle+='<li>暂无</li>'; | 3065 | + contextmenuEl+='<li>'+elementName+'</li>'; |
| 3077 | } | 3066 | } |
| 3078 | - setTimeout(function(){ | ||
| 3079 | - $('#tipContextmenu').append(liEle) | ||
| 3080 | - },100) | ||
| 3081 | - | 3067 | + contextmenuEl+='</ul>'; |
| 3068 | + contextmenuTips = layer.tips(contextmenuEl, that, { | ||
| 3069 | + time: 0, | ||
| 3070 | + tips: [3, '#1e9fff'], | ||
| 3071 | + success() { | ||
| 3072 | + } | ||
| 3073 | + }) | ||
| 3082 | } | 3074 | } |
| 3083 | }) | 3075 | }) |
| 3084 | }) | 3076 | }) |
| @@ -3086,15 +3078,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3086,15 +3078,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3086 | $('table thead tr th span').contextmenu(function (e) { | 3078 | $('table thead tr th span').contextmenu(function (e) { |
| 3087 | e.preventDefault(); | 3079 | e.preventDefault(); |
| 3088 | //表头 | 3080 | //表头 |
| 3089 | - let elementName=$(this).text(); | ||
| 3090 | - var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3091 | - contextmenuEl+='</ul>'; | ||
| 3092 | - contextmenuTips = layer.tips(contextmenuEl, $(this), { | ||
| 3093 | - time: 0, | ||
| 3094 | - tips: [3, '#1e9fff'], | ||
| 3095 | - success() { | ||
| 3096 | - } | ||
| 3097 | - }) | 3081 | + let that=$(this); |
| 3082 | + let elementName=that.text(); | ||
| 3098 | admin.req({ | 3083 | admin.req({ |
| 3099 | url: common.domainName + '/api-web/bHalt' | 3084 | url: common.domainName + '/api-web/bHalt' |
| 3100 | ,data:{ | 3085 | ,data:{ |
| @@ -3104,19 +3089,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -3104,19 +3089,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
| 3104 | , async: false | 3089 | , async: false |
| 3105 | , done: function (res) { | 3090 | , done: function (res) { |
| 3106 | let liEle='' | 3091 | let liEle='' |
| 3092 | + var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">'; | ||
| 3107 | if(res.data && res.data.length>0){ | 3093 | if(res.data && res.data.length>0){ |
| 3108 | let tipData=res.data; | 3094 | let tipData=res.data; |
| 3109 | tipData.map(item=>{ | 3095 | tipData.map(item=>{ |
| 3110 | - liEle+='<li>'+item.elementExplain+'</li>'; | 3096 | + contextmenuEl+='<li>'+item.elementExplain+'</li>'; |
| 3111 | }) | 3097 | }) |
| 3112 | - | ||
| 3113 | }else{ | 3098 | }else{ |
| 3114 | - liEle+='<li>暂无</li>'; | 3099 | + contextmenuEl+='<li>'+elementName+'</li>'; |
| 3115 | } | 3100 | } |
| 3116 | - setTimeout(function(){ | ||
| 3117 | - $('#tipContextmenu').append(liEle) | ||
| 3118 | - },100) | ||
| 3119 | - | 3101 | + contextmenuEl+='</ul>'; |
| 3102 | + contextmenuTips = layer.tips(contextmenuEl, that, { | ||
| 3103 | + time: 0, | ||
| 3104 | + tips: [3, '#1e9fff'], | ||
| 3105 | + success() { | ||
| 3106 | + } | ||
| 3107 | + }) | ||
| 3120 | } | 3108 | } |
| 3121 | }) | 3109 | }) |
| 3122 | }) | 3110 | }) |
-
Please register or login to post a comment