diff --git a/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css b/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css index 6d6f0aa5e..18d304cab 100644 --- a/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css +++ b/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css @@ -6,5 +6,5 @@ .bootstrap-tree-table .treetable-table thead, .treetable-table tbody tr {display:table;width:100%;table-layout:fixed;} .bootstrap-tree-table .treetable-thead th{line-height:24px;border: 0 !important;border-radius: 4px;border-left:0px solid #e7eaec !important;border-bottom:1px solid #ccc!important;text-align: center;} .bootstrap-tree-table .treetable-thead tr :first-child{border-left:0 !important} -.bootstrap-tree-table .treetable-tbody td{border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #ccc!important;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} +.bootstrap-tree-table .treetable-tbody td{border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #e7eaec!important;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} .bootstrap-tree-table .treetable-tbody tr :first-child{border-left:0 !important} \ No newline at end of file diff --git a/src/main/resources/static/ajax/libs/layer/layim/layim.css b/src/main/resources/static/ajax/libs/layer/layim/layim.css deleted file mode 100644 index a568a0358..000000000 --- a/src/main/resources/static/ajax/libs/layer/layim/layim.css +++ /dev/null @@ -1,158 +0,0 @@ -/* - - @Name: layim WebIM 1.0.0 - @Author：贤心（子涵修改） - @Date: 2014-04-25 - @Blog: http://sentsin.com - - */ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,input,button,textarea,p,blockquote,th,td,form{margin:0; padding:0;} -input,button,textarea,select,optgroup,option{font-family:inherit; font-size:inherit; font-style:inherit; font-weight:inherit; outline: 0;} -li{list-style:none;} -.xxim_icon, .xxim_main i, .layim_chatbox i{position:absolute;} -.loading{background:url(loading.gif) no-repeat center center;} -.layim_chatbox a, .layim_chatbox a:hover{color:#343434; text-decoration:none; } -.layim_zero{position:absolute; width:0; height:0; border-style:dashed; border-color:transparent; overflow:hidden;} - -.xxim_main{position:fixed; right:1px; bottom:1px; width:230px; border:1px solid #BEBEBE; background-color:#fff; font-size:12px; box-shadow: 0 0 10px rgba(0,0,0,.2); z-index:99999999} -.layim_chatbox textarea{resize:none;} -.xxim_main em, .xxim_main i, .layim_chatbox em, .layim_chatbox i{font-style:normal; font-weight:400;} -.xxim_main h5{font-size:100%; font-weight:400;} - -/* 搜索栏 */ -.xxim_search{position:relative; padding-left:40px; height:40px; border-bottom:1px solid #DCDCDC; background-color:#fff;} -.xxim_search i{left:10px; top:12px; width:16px; height:16px;font-size: 16px;color:#999;} -.xxim_search input{border:none; background:none; width: 180px; margin-top:10px; line-height:20px;} -.xxim_search span{display:none; position:absolute; right:10px; top:10px; height:18px; line-height:18px;width:18px;text-align: center;background-color:#AFAFAF; color:#fff; cursor:pointer; border-radius:2px; font-size:12px; font-weight:900;} -.xxim_search span:hover{background-color:#FCBE00;} - -/* 主面板tab */ -.xxim_tabs{height:45px; border-bottom:1px solid #DBDBDB; background-color:#F4F4F4; font-size:0;} -.xxim_tabs span{position:relative; display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:76px; height:45px; border-right:1px solid #DBDBDB; cursor:pointer; font-size:12px;} -.xxim_tabs span i{top:12px; left:50%; width:20px; margin-left:-10px; height:20px;font-size:20px;color:#ccc;} -.xxim_tabs .xxim_tabnow{height:46px; background-color:#fff;} -.xxim_tabs .xxim_tabnow i{color:#1ab394;} -.xxim_tabs .xxim_latechat{border-right:none;} -.xxim_tabs .xxim_tabfriend i{width:14px; margin-left:-7px;} - -/* 主面板列表 */ -.xxim_list{display:none; height:350px; padding:5px 0; overflow:hidden;} -.xxim_list:hover{ overflow-y:auto;} -.xxim_list h5{position:relative; padding-left:32px; height:26px; line-height:26px; cursor:pointer; color:#000; font-size:0;} -.xxim_list h5 span{display:inline-block; *display:inline; *zoom:1; vertical-align:top; max-width:140px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; font-size:12px;} -.xxim_list h5 i{left:15px; top:8px; width:10px; height:10px;font-size:10px;color:#666;} -.xxim_list h5 *{font-size:12px;} -.xxim_list .xxim_chatlist{display:none;} -.xxim_list .xxim_liston h5 i{width:8px; height:7px;} -.xxim_list .xxim_liston .xxim_chatlist{display:block;} -.xxim_chatlist {} -.xxim_chatlist li{position:relative; height:40px; line-height:30px; padding:5px 10px; font-size:0; cursor:pointer;} -.xxim_chatlist li:hover{background-color:#F2F4F8} -.xxim_chatlist li *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;} -.xxim_chatlist li span{padding-left:10px; max-width:120px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;} -.xxim_chatlist li img{width:30px; height:30px;} -.xxim_chatlist li .xxim_time{position:absolute; right:10px; color:#999;} -.xxim_list .xxim_errormsg{text-align:center; margin:50px 0; color:#999;} -.xxim_searchmain{position:absolute; width:230px; height:491px; left:0; top:41px; z-index:10; background-color:#fff;} - -/* 主面板底部 */ -.xxim_bottom{height:34px; border-top:1px solid #D0DCF3; background-color:#F2F4F8;} -.xxim_expend{border-left:1px solid #D0DCF3; border-bottom:1px solid #D0DCF3;} -.xxim_bottom li{position:relative; width:50px; height:32px; line-height:32px; float:left; border-right:1px solid #D0DCF3; cursor:pointer;} -.xxim_bottom li i{ top:9px;} -.xxim_bottom .xxim_hide{border-right:none;} -.xxim_bottom .xxim_online{width:72px; padding-left:35px;} -.xxim_online i{left:13px; width:14px; height:14px;font-size:14px;color:#FFA00A;} -.xxim_setonline{display:none; position:absolute; left:-79px; bottom:-1px; border:1px solid #DCDCDC; background-color:#fff;} -.xxim_setonline span{position:relative; display:block; width:32px;width: 77px; padding:0 10px 0 35px;} -.xxim_setonline span:hover{background-color:#F2F4F8;} -.xxim_offline .xxim_nowstate, .xxim_setoffline i{color:#999;} -.xxim_mymsg i{left:18px; width:14px; height:14px;font-size: 14px;} -.xxim_mymsg a{position:absolute; left:0; top:0; width:50px; height:32px;} -.xxim_seter i{left:18px; width:14px; height:14px;font-size: 14px;} -.xxim_hide i{left:18px; width:14px; height:14px;font-size: 14px;} -.xxim_show i{} -.xxim_bottom .xxim_on{position:absolute; left:-17px; top:50%; width:16px;text-align: center;color:#999;line-height: 97px; height:97px; margin-top:-49px;border:solid 1px #BEBEBE;border-right: none; background:#F2F4F8;} -.xxim_bottom .xxim_off{} - -/* 聊天窗口 */ -.layim_chatbox{width:620px; border:1px solid #BEBEBE; background-color:#fff; font-size:12px; box-shadow: 0 0 10px rgba(0,0,0,.2);} -.layim_chatbox h6{position:relative; height:40px; border-bottom:1px solid #D9D9D9; background-color:#FCFDFA} -.layim_move{position:absolute; height:40px; width: 620px; z-index:0;} -.layim_face{position:absolute; bottom:-1px; left:10px; width:64px; height:64px;padding:1px;background: #fff; border:1px solid #ccc;} -.layim_face img{width:60px; height:60px;} -.layim_names{position:absolute; left:90px; max-width:300px; line-height:40px; color:#000; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; font-size:14px;} -.layim_rightbtn{position:absolute; right:15px; top:12px; font-size:20px;} -.layim_rightbtn i{position:relative; width:16px; height:16px; display:inline-block; *display:inline; *zoom:1; vertical-align:top; cursor:pointer; transition: all .3s;text-align: center;line-height: 16px;} -.layim_rightbtn .layim_close{background: #FFA00A;color:#fff;} -.layim_rightbtn .layim_close:hover{-webkit-transform: rotate(180deg); -moz-transform: rotate(180deg);} -.layim_rightbtn .layer_setmin{margin-right:5px;color:#999;font-size:14px;font-weight: 700;} -.layim_chat, .layim_chatmore,.layim_groups{height:450px; overflow:hidden;} -.layim_chatmore{display:none; float:left; width:135px; border-right:1px solid #BEBEBE; background-color:#F2F2F2} -.layim_chatlist li, .layim_groups li{position:relative; height:30px; line-height:30px; padding:0 10px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; cursor:pointer;} -.layim_chatlist li{padding:0 20px 0 10px;} -.layim_chatlist li:hover{background-color:#E3E3E3;} -.layim_chatlist li span{display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:90px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;} -.layim_chatlist li em{display:none; position:absolute; top:6px; right:10px; height:18px; line-height:18px;width:18px;text-align: center;font-size:14px;font-weight:900; border-radius:3px;} -.layim_chatlist li em:hover{background-color: #FCBE00; color:#fff;} -.layim_chatlist .layim_chatnow,.layim_chatlist .layim_chatnow:hover{/*border-top:1px solid #D9D9D9; border-bottom:1px solid #D9D9D9;*/ background-color:#fff;} -.layim_chat{} -.layim_chatarea{height:280px;} -.layim_chatview{display:none; height:280px; overflow:hidden;} -.layim_chatmore:hover, .layim_groups:hover, .layim_chatview:hover{overflow-y:auto;} -.layim_chatview li{margin-bottom:10px; clear:both; *zoom:1;} -.layim_chatview li:after{content:'\20'; clear:both; *zoom:1; display:block; height:0;} - -.layim_chatthis{display:block;} -.layim_chatuser{float:left; padding:15px; font-size:0;} -.layim_chatuser *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; line-height:30px; font-size:12px; padding-right:10px;} -.layim_chatuser img{width:30px; height:30px;padding-right: 0;margin-right: 15px;} -.layim_chatuser .layim_chatname{max-width:230px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;} -.layim_chatuser .layim_chattime{color:#999; padding-left:10px;} -.layim_chatsay{position:relative; float:left; margin:0 15px; padding:10px; line-height:20px; background-color:#F3F3F3; border-radius:3px; clear:both;} -.layim_chatsay .layim_zero{left:5px; top:-8px; border-width:8px; border-right-style:solid; border-right-color:#F3F3F3;} -.layim_chateme .layim_chatuser{float:right;} -.layim_chateme .layim_chatuser *{padding-right:0; padding-left:10px;} -.layim_chateme .layim_chatuser img{margin-left:15px;padding-left: 0;} -.layim_chateme .layim_chatsay .layim_zero{left:auto; right:10px;} -.layim_chateme .layim_chatuser .layim_chattime{padding-left:0; padding-right:10px;} -.layim_chateme .layim_chatsay{float:right; background-color:#EBFBE3} -.layim_chateme .layim_zero{border-right-color:#EBFBE3;} -.layim_groups{display:none; float:right; width:130px; border-left:1px solid #D9D9D9; background-color:#fff;} -.layim_groups ul{display:none;} -.layim_groups ul.layim_groupthis{display:block;} -.layim_groups li *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; margin-right:10px;} -.layim_groups li img{width:20px; height:20px; margin-top:5px;} -.layim_groups li span{max-width:80px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;} -.layim_groups li:hover{background-color:#F3F3F3;} -.layim_groups .layim_errors{text-align:center; color:#999;} -.layim_tool{position:relative; height:35px; line-height:35px; padding-left:10px; background-color:#F3F3F3;} -.layim_tool i{position:relative; top:10px; display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:16px; height:16px; margin-right:10px; cursor:pointer;font-size:16px;color:#999;font-weight: 700;} -.layim_tool i:hover{color:#FFA00A;} -.layim_tool .layim_seechatlog{position:absolute; right:15px;} -.layim_tool .layim_seechatlog i{} -.layim_write{display:block; border:none; width:98%; height:90px; line-height:20px; margin:5px auto 0;} -.layim_send{position:relative; height:40px; background-color:#F3F3F3;} -.layim_sendbtn{position:absolute; height:26px; line-height:26px; right:10px; top:8px; padding:0 40px 0 20px; background-color:#FFA00A; color:#fff; border-radius:3px; cursor:pointer;} -.layim_enter{position:absolute; right:0; border-left:1px solid #FFB94F; width:24px; height:26px;} -.layim_enter:hover{background-color:#E68A00; border-radius:0 3px 3px 0;} -.layim_enter .layim_zero{left:7px; top:11px; border-width:5px; border-top-style:solid; border-top-color:#FFE0B3;} -.layim_sendtype{display:none; position:absolute; right:10px; bottom:37px; border:1px solid #D9D9D9; background-color:#fff; text-align:left;} -.layim_sendtype span{display:block; line-height:24px; padding:0 10px 0 25px; cursor:pointer;} -.layim_sendtype span:hover{background-color:#F3F3F3;} -.layim_sendtype span i{left:5px;} - -.layim_min{display:none; position:absolute; left:-190px; bottom:-1px; width:160px; height:32px; line-height:32px; padding:0 10px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; border:1px solid #ccc; box-shadow: 0 0 5px rgba(0,0,75,.2); background-color:#FCFDFA; cursor:pointer;} - - - - - - - - - - - - - diff --git a/src/main/resources/static/ajax/libs/layer/layim/layim.js b/src/main/resources/static/ajax/libs/layer/layim/layim.js deleted file mode 100644 index 52f0083f2..000000000 --- a/src/main/resources/static/ajax/libs/layer/layim/layim.js +++ /dev/null @@ -1,630 +0,0 @@ -/* - - @Name: layui WebIM 1.0.0 - @Author：贤心 - @Date: 2014-04-25 - @Blog: http://sentsin.com - - */ - -;!function(win, undefined){ - -var config = { - msgurl: 'mailbox.html?msg=', - chatlogurl: 'mailbox.html?user=', - aniTime: 200, - right: -232, - api: { - friend: 'js/plugins/layer/layim/data/friend.json', //好友列表接口 - group: 'js/plugins/layer/layim/data/group.json', //群组列表接口 - chatlog: 'js/plugins/layer/layim/data/chatlog.json', //聊天记录接口 - groups: 'js/plugins/layer/layim/data/groups.json', //群组成员接口 - sendurl: '' //发送消息接口 - }, - user: { //当前用户信息 - name: '游客', - face: 'img/a1.jpg' - }, - - //自动回复内置文案，也可动态读取数据库配置 - autoReplay: [ - '您好，我现在有事不在，一会再和您联系。', - '你没发错吧？', - '洗澡中，请勿打扰，偷窥请购票，个体四十，团体八折，订票电话：一般人我不告诉他！', - '你好，我是主人的美女秘书，有什么事就跟我说吧，等他回来我会转告他的。', - '我正在拉磨，没法招呼您，因为我们家毛驴去动物保护协会把我告了，说我剥夺它休产假的权利。', - '<（@￣︶￣@）>', - '你要和我说话？你真的要和我说话？你确定自己想说吗？你一定非说不可吗？那你说吧，这是自动回复。', - '主人正在开机自检，键盘鼠标看好机会出去凉快去了，我是他的电冰箱，我打字比较慢，你慢慢说，别急……', - '(*^__^*) 嘻嘻，是贤心吗？' - ], - - - chating: {}, - hosts: (function(){ - var dk = location.href.match(/\:\d+/); - dk = dk ? dk[0] : ''; - return 'http://' + document.domain + dk + '/'; - })(), - json: function(url, data, callback, error){ - return $.ajax({ - type: 'POST', - url: url, - data: data, - dataType: 'json', - success: callback, - error: error - }); - }, - stopMP: function(e){ - e ? e.stopPropagation() : e.cancelBubble = true; - } -}, dom = [$(window), $(document), $('html'), $('body')], xxim = {}; - -//主界面tab -xxim.tabs = function(index){ - var node = xxim.node; - node.tabs.eq(index).addClass('xxim_tabnow').siblings().removeClass('xxim_tabnow'); - node.list.eq(index).show().siblings('.xxim_list').hide(); - if(node.list.eq(index).find('li').length === 0){ - xxim.getDates(index); - } -}; - -//节点 -xxim.renode = function(){ - var node = xxim.node = { - tabs: $('#xxim_tabs>span'), - list: $('.xxim_list'), - online: $('.xxim_online'), - setonline: $('.xxim_setonline'), - onlinetex: $('#xxim_onlinetex'), - xximon: $('#xxim_on'), - layimFooter: $('#xxim_bottom'), - xximHide: $('#xxim_hide'), - xximSearch: $('#xxim_searchkey'), - searchMian: $('#xxim_searchmain'), - closeSearch: $('#xxim_closesearch'), - layimMin: $('#layim_min') - }; -}; - -//主界面缩放 -xxim.expend = function(){ - var node = xxim.node; - if(xxim.layimNode.attr('state') !== '1'){ - xxim.layimNode.stop().animate({right: config.right}, config.aniTime, function(){ - node.xximon.addClass('xxim_off'); - try{ - localStorage.layimState = 1; - }catch(e){} - xxim.layimNode.attr({state: 1}); - node.layimFooter.addClass('xxim_expend').stop().animate({marginLeft: config.right}, config.aniTime/2); - node.xximHide.addClass('xxim_show'); - }); - } else { - xxim.layimNode.stop().animate({right: 1}, config.aniTime, function(){ - node.xximon.removeClass('xxim_off'); - try{ - localStorage.layimState = 2; - }catch(e){} - xxim.layimNode.removeAttr('state'); - node.layimFooter.removeClass('xxim_expend'); - node.xximHide.removeClass('xxim_show'); - }); - node.layimFooter.stop().animate({marginLeft: 0}, config.aniTime); - } -}; - -//初始化窗口格局 -xxim.layinit = function(){ - var node = xxim.node; - - //主界面 - try{ - /* - if(!localStorage.layimState){ - config.aniTime = 0; - localStorage.layimState = 1; - } - */ - if(localStorage.layimState === '1'){ - xxim.layimNode.attr({state: 1}).css({right: config.right}); - node.xximon.addClass('xxim_off'); - node.layimFooter.addClass('xxim_expend').css({marginLeft: config.right}); - node.xximHide.addClass('xxim_show'); - } - }catch(e){ - //layer.msg(e.message, 5, -1); - } -}; - -//聊天窗口 -xxim.popchat = function(param){ - var node = xxim.node, log = {}; - - log.success = function(layero){ - layer.setMove(); - - xxim.chatbox = layero.find('#layim_chatbox'); - log.chatlist = xxim.chatbox.find('.layim_chatmore>ul'); - - log.chatlist.html('
  • '+ param.name +'×
    • ') - xxim.tabchat(param, xxim.chatbox); - - //最小化聊天窗 - xxim.chatbox.find('.layer_setmin').on('click', function(){ - var indexs = layero.attr('times'); - layero.hide(); - node.layimMin.text(xxim.nowchat.name).show(); - }); - - //关闭窗口 - xxim.chatbox.find('.layim_close').on('click', function(){ - var indexs = layero.attr('times'); - layer.close(indexs); - xxim.chatbox = null; - config.chating = {}; - config.chatings = 0; - }); - - //关闭某个聊天 - log.chatlist.on('mouseenter', 'li', function(){ - $(this).find('em').show(); - }).on('mouseleave', 'li', function(){ - $(this).find('em').hide(); - }); - log.chatlist.on('click', 'li em', function(e){ - var parents = $(this).parent(), dataType = parents.attr('type'); - var dataId = parents.attr('data-id'), index = parents.index(); - var chatlist = log.chatlist.find('li'), indexs; - - config.stopMP(e); - - delete config.chating[dataType + dataId]; - config.chatings--; - - parents.remove(); - $('#layim_area'+ dataType + dataId).remove(); - if(dataType === 'group'){ - $('#layim_group'+ dataType + dataId).remove(); - } - - if(parents.hasClass('layim_chatnow')){ - if(index === config.chatings){ - indexs = index - 1; - } else { - indexs = index + 1; - } - xxim.tabchat(config.chating[chatlist.eq(indexs).attr('type') + chatlist.eq(indexs).attr('data-id')]); - } - - if(log.chatlist.find('li').length === 1){ - log.chatlist.parent().hide(); - } - }); - - //聊天选项卡 - log.chatlist.on('click', 'li', function(){ - var othis = $(this), dataType = othis.attr('type'), dataId = othis.attr('data-id'); - xxim.tabchat(config.chating[dataType + dataId]); - }); - - //发送热键切换 - log.sendType = $('#layim_sendtype'), log.sendTypes = log.sendType.find('span'); - $('#layim_enter').on('click', function(e){ - config.stopMP(e); - log.sendType.show(); - }); - log.sendTypes.on('click', function(){ - log.sendTypes.find('i').text('') - $(this).find('i').text('√'); - }); - - xxim.transmit(); - }; - - log.html = '
    ' - +'
    ' - +'' - +' ' - +' '+ param.name +'' - +' ' - +' —' - +' ×' - +' ' - +'
    ' - +'
    ' - +' ' - +'
    ' - +'
    ' - +'
    ' - +'
    ' - +'
      ' - +'
      ' - +'
      ' - +' ' - +' ' - +' ' - +' 聊天记录' - +'
      ' - +' ' - +'
      ' - +'
      发送
      ' - +'
      ' - +' √按Enter键发送' - +' 按Ctrl+Enter键发送' - +'
      ' - +'
      ' - +'
      ' - +'
      '; - - if(config.chatings < 1){ - $.layer({ - type: 1, - border: [0], - title: false, - shade: [0], - area: ['620px', '493px'], - move: '.layim_chatbox .layim_move', - moveType: 1, - closeBtn: false, - offset: [(($(window).height() - 493)/2)+'px', ''], - page: { - html: log.html - }, success: function(layero){ - log.success(layero); - } - }) - } else { - log.chatmore = xxim.chatbox.find('#layim_chatmore'); - log.chatarea = xxim.chatbox.find('#layim_chatarea'); - - log.chatmore.show(); - - log.chatmore.find('ul>li').removeClass('layim_chatnow'); - log.chatmore.find('ul').append('
    • '+ param.name +'×
      • '); - - log.chatarea.find('.layim_chatview').removeClass('layim_chatthis'); - log.chatarea.append(''); - - xxim.tabchat(param); - } - - //群组 - log.chatgroup = xxim.chatbox.find('#layim_groups'); - if(param.type === 'group'){ - log.chatgroup.find('ul').removeClass('layim_groupthis'); - log.chatgroup.append(''); - xxim.getGroups(param); - } - //点击群员切换聊天窗 - log.chatgroup.on('click', 'ul>li', function(){ - xxim.popchatbox($(this)); - }); -}; - -//定位到某个聊天队列 -xxim.tabchat = function(param){ - var node = xxim.node, log = {}, keys = param.type + param.id; - xxim.nowchat = param; - - xxim.chatbox.find('#layim_user'+ keys).addClass('layim_chatnow').siblings().removeClass('layim_chatnow'); - xxim.chatbox.find('#layim_area'+ keys).addClass('layim_chatthis').siblings().removeClass('layim_chatthis'); - xxim.chatbox.find('#layim_group'+ keys).addClass('layim_groupthis').siblings().removeClass('layim_groupthis'); - - xxim.chatbox.find('.layim_face>img').attr('src', param.face); - xxim.chatbox.find('.layim_face, .layim_names').attr('href', param.href); - xxim.chatbox.find('.layim_names').text(param.name); - - xxim.chatbox.find('.layim_seechatlog').attr('href', config.chatlogurl + param.id); - - log.groups = xxim.chatbox.find('.layim_groups'); - if(param.type === 'group'){ - log.groups.show(); - } else { - log.groups.hide(); - } - - $('#layim_write').focus(); - -}; - -//弹出聊天窗 -xxim.popchatbox = function(othis){ - var node = xxim.node, dataId = othis.attr('data-id'), param = { - id: dataId, //用户ID - type: othis.attr('type'), - name: othis.find('.xxim_onename').text(), //用户名 - face: othis.find('.xxim_oneface').attr('src'), //用户头像 - href: 'profile.html?user=' + dataId //用户主页 - }, key = param.type + dataId; - if(!config.chating[key]){ - xxim.popchat(param); - config.chatings++; - } else { - xxim.tabchat(param); - } - config.chating[key] = param; - - var chatbox = $('#layim_chatbox'); - if(chatbox[0]){ - node.layimMin.hide(); - chatbox.parents('.xubox_layer').show(); - } -}; - -//请求群员 -xxim.getGroups = function(param){ - var keys = param.type + param.id, str = '', - groupss = xxim.chatbox.find('#layim_group'+ keys); - groupss.addClass('loading'); - config.json(config.api.groups, {}, function(datas){ - if(datas.status === 1){ - var ii = 0, lens = datas.data.length; - if(lens > 0){ - for(; ii < lens; ii++){ - str += '
    • '+ datas.data[ii].name +'
      • '; - } - } else { - str = '
    • 没有群员
      • '; - } - - } else { - str = '
    • '+ datas.msg +'
      • '; - } - groupss.removeClass('loading'); - groupss.html(str); - }, function(){ - groupss.removeClass('loading'); - groupss.html('
    • 请求异常
      • '); - }); -}; - -//消息传输 -xxim.transmit = function(){ - var node = xxim.node, log = {}; - node.sendbtn = $('#layim_sendbtn'); - node.imwrite = $('#layim_write'); - - //发送 - log.send = function(){ - var data = { - content: node.imwrite.val(), - id: xxim.nowchat.id, - sign_key: '', //密匙 - _: +new Date - }; - - if(data.content.replace(/\s/g, '') === ''){ - layer.tips('说点啥呗！', '#layim_write', 2); - node.imwrite.focus(); - } else { - //此处皆为模拟 - var keys = xxim.nowchat.type + xxim.nowchat.id; - - //聊天模版 - log.html = function(param, type){ - return '
    • ' - +'
      ' - + function(){ - if(type === 'me'){ - return ''+ param.time +'' - +''+ param.name +'' - +''; - } else { - return '' - +''+ param.name +'' - +''+ param.time +''; - } - }() - +'
      ' - +'
      '+ param.content +'
      ' - +'
      • '; - }; - - log.imarea = xxim.chatbox.find('#layim_area'+ keys); - - log.imarea.append(log.html({ - time: '2014-04-26 0:37', - name: config.user.name, - face: config.user.face, - content: data.content - }, 'me')); - node.imwrite.val('').focus(); - log.imarea.scrollTop(log.imarea[0].scrollHeight); - - setTimeout(function(){ - log.imarea.append(log.html({ - time: '2014-04-26 0:38', - name: xxim.nowchat.name, - face: xxim.nowchat.face, - content: config.autoReplay[(Math.random()*config.autoReplay.length) | 0] - })); - log.imarea.scrollTop(log.imarea[0].scrollHeight); - }, 500); - - /* - that.json(config.api.sendurl, data, function(datas){ - - }); - */ - } - - }; - node.sendbtn.on('click', log.send); - - node.imwrite.keyup(function(e){ - if(e.keyCode === 13){ - log.send(); - } - }); -}; - -//事件 -xxim.event = function(){ - var node = xxim.node; - - //主界面tab - node.tabs.eq(0).addClass('xxim_tabnow'); - node.tabs.on('click', function(){ - var othis = $(this), index = othis.index(); - xxim.tabs(index); - }); - - //列表展收 - node.list.on('click', 'h5', function(){ - var othis = $(this), chat = othis.siblings('.xxim_chatlist'), parentss = othis.find("i"); - if(parentss.hasClass('fa-caret-down')){ - chat.hide(); - parentss.attr('class','fa fa-caret-right'); - } else { - chat.show(); - parentss.attr('class','fa fa-caret-down'); - } - }); - - //设置在线隐身 - node.online.on('click', function(e){ - config.stopMP(e); - node.setonline.show(); - }); - node.setonline.find('span').on('click', function(e){ - var index = $(this).index(); - config.stopMP(e); - if(index === 0){ - node.onlinetex.html('在线'); - node.online.removeClass('xxim_offline'); - } else if(index === 1) { - node.onlinetex.html('隐身'); - node.online.addClass('xxim_offline'); - } - node.setonline.hide(); - }); - - node.xximon.on('click', xxim.expend); - node.xximHide.on('click', xxim.expend); - - //搜索 - node.xximSearch.keyup(function(){ - var val = $(this).val().replace(/\s/g, ''); - if(val !== ''){ - node.searchMian.show(); - node.closeSearch.show(); - //此处的搜索ajax参考xxim.getDates - node.list.eq(3).html('
    • 没有符合条件的结果
      • '); - } else { - node.searchMian.hide(); - node.closeSearch.hide(); - } - }); - node.closeSearch.on('click', function(){ - $(this).hide(); - node.searchMian.hide(); - node.xximSearch.val('').focus(); - }); - - //弹出聊天窗 - config.chatings = 0; - node.list.on('click', '.xxim_childnode', function(){ - var othis = $(this); - xxim.popchatbox(othis); - }); - - //点击最小化栏 - node.layimMin.on('click', function(){ - $(this).hide(); - $('#layim_chatbox').parents('.xubox_layer').show(); - }); - - - //document事件 - dom[1].on('click', function(){ - node.setonline.hide(); - $('#layim_sendtype').hide(); - }); -}; - -//请求列表数据 -xxim.getDates = function(index){ - var api = [config.api.friend, config.api.group, config.api.chatlog], - node = xxim.node, myf = node.list.eq(index); - myf.addClass('loading'); - config.json(api[index], {}, function(datas){ - if(datas.status === 1){ - var i = 0, myflen = datas.data.length, str = '', item; - if(myflen > 1){ - if(index !== 2){ - for(; i < myflen; i++){ - str += '
    • ' - +'
      '+ datas.data[i].name +'（'+ datas.data[i].nums +'）
      ' - +'
      • '; - } - } else { - str += '
    • ' - +'
      • '; - } - myf.html(str); - } else { - myf.html('
    • 没有任何数据
      • '); - } - myf.removeClass('loading'); - } else { - myf.html('
    • '+ datas.msg +'
      • '); - } - }, function(){ - myf.html('
    • 请求失败
      • '); - myf.removeClass('loading'); - }); -}; - -//渲染骨架 -xxim.view = (function(){ - var xximNode = xxim.layimNode = $('
      ' - +'
      ' - +'
      ×
      ' - +'
      ' - +' ' - +' ' - +' ' - +' ' - +'
      ' - +'' - +'
      '); - dom[3].append(xximNode); - - xxim.renode(); - xxim.getDates(0); - xxim.event(); - xxim.layinit(); -}()); - -}(window); - diff --git a/src/main/resources/static/ajax/libs/layer/layim/loading.gif b/src/main/resources/static/ajax/libs/layer/layim/loading.gif deleted file mode 100644 index 059b1ac3f..000000000 Binary files a/src/main/resources/static/ajax/libs/layer/layim/loading.gif and /dev/null differ diff --git a/src/main/resources/static/ruoyi/css/ry-ui.css b/src/main/resources/static/ruoyi/css/ry-ui.css index 507b0d349..b10a2b723 100644 --- a/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/src/main/resources/static/ruoyi/css/ry-ui.css @@ -342,9 +342,8 @@ label { .table-striped .bootstrap-table{ border:0px!important; } - .table-striped .table, .fixed-table-container, table, .table-striped .table, .table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td{ - border-bottom: 1px solid #ccc!important; + border-bottom: 1px solid #e7eaec!important; background-color: transparent!important; border: 0px; } diff --git a/src/main/resources/static/ruoyi/css/ry-ui.min.css b/src/main/resources/static/ruoyi/css/ry-ui.min.css index cbbf39452..254961984 100644 --- a/src/main/resources/static/ruoyi/css/ry-ui.min.css +++ b/src/main/resources/static/ruoyi/css/ry-ui.min.css @@ -2,4 +2,4 @@ * ruoyi.css * Author: Ruoyi */ -.box{position:relative;border-radius:3px;background:#fff;border-top:3px solid #d2d6de;margin-bottom:20px;width:100%;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.box-header:before,.box-body:before,.box-footer:before,.box-header:after,.box-body:after,.box-footer:after{content:" ";display:table}.box-header:after,.box-body:after,.box-footer:after{clear:both}.btn-box-tool{padding:5px;font-size:12px;background:transparent;color:#97a0b3}.open .btn-box-tool,.btn-box-tool:hover{color:#606c84}.box-main{margin:0;border:0;padding-top:2px;border-radius:0;box-shadow:none}.box-main>.box-header{border-bottom:1px solid #eee;padding:12px 10px 2px 15px}.box-header .box-title{display:inline-block;font-size:18px;margin:0;line-height:1}.box-main>.box-header .box-title{font-size:16px;margin-bottom:13px;float:left}.box-main>.box-header .box-title .fa{font-size:14px;padding-right:3px;margin-top:-2px}.box-main>.box-header .box-tools{position:relative;top:-5px;right:0}.box-main>.box-header .box-tools .btn{padding:3px 10px 5px 10px;font-size:14px;margin-bottom:2px}.box-main>.box-header .box-tools .btn-box-tool{padding:4px 2px}.box-main form>.box-footer,.nav-main form>.box-footer{background:#fafafa}.box-main form>.box-footer .row,.nav-main form>.box-footer .row{margin:5px 0 5px -25px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#1ab394;border-color:#1ab394;padding:1px 10px;color:#fff}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{margin-right:5px;color:rgba(255,255,255,0.7)}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#fff}.select2-container .select2-selection--single .select2-selection__rendered{padding-right:10px}label.error{position:absolute;right:18px;top:7px;color:#ef392b;font-size:12px}.Validform_error,input.error,select.error{background-color:#fbe2e2;border-color:#c66161;color:#c00}.Validform_wrong,.Validform_right,.Validform_warning{display:inline-block;height:20px;font-size:12px;vertical-align:middle;padding-left:25px}.i-checks label.error,.check-box label.error,.radio-box label.error{right:auto;width:150px;left:210px;top:1px;max-width:none}.check-box,.radio-box{display:inline-block;box-sizing:border-box;cursor:pointer;position:relative;padding-right:20px;padding-top:7px}.loaderbox{display:inline-block;min-width:125px;padding:10px;margin:0 auto;color:#000!important;font-size:13px;font-weight:400;text-align:center;vertical-align:middle;border:1px solid #ddd;background-color:#eee;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 1px 8px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 8px rgba(0,0,0,0.1);box-shadow:0 1px 8px rgba(0,0,0,0.1)}.loaderbox .loading-activity{float:left;width:18px;height:18px;border:solid 2px transparent;border-top-color:#000;border-left-color:#000;border-radius:10px;-webkit-animation:pace-spinner 400ms linear infinite;-moz-animation:pace-spinner 400ms linear infinite;-ms-animation:pace-spinner 400ms linear infinite;-o-animation:pace-spinner 400ms linear infinite;animation:pace-spinner 400ms linear infinite}@media(max-width:767px){.loading-activity{width:18px;height:18px}}@-ms-keyframes pace-spinner{0%{-ms-transform:rotate(0deg);transform:rotate(0deg)}100%{-ms-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes pace-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}li{list-style:none}.time-input{display:block;width:100%;padding-left:10px}label{font-weight:normal}.container-div{padding:10px 35px;height:100%}.container-div .row{height:100%}.select-info,.select-table{width:100%;background:#fff;border-radius:6px;margin-top:10px;padding-top:5px;padding-bottom:13px;box-shadow:1px 1px 3px rgba(0,0,0,.2)}.select-info{position:relative}.select-info .col-sm-6 .control-label{color:#333}@media(max-width :768px){.select-info{display:none}}.select-list li{float:left;color:#333;margin:5px 15px 5px 0}.select-list li input{border:1px solid #ddd;border-radius:4px;background:transparent;outline:0;height:30px;width:280px;padding-left:5px}.select-list li .submit-btn{border:0;border-radius:4px;background:transparent;outline:0;width:40px;height:23px}.select-list li select{border:1px solid #ddd;border-radius:4px;background:transparent;outline:0;height:30px;width:280px}.select-list .select-time input{width:133px}.select-time label,.select-time span,.select-time input{float:left}.select-time label{margin-top:5px}.select-time span{display:block;margin:5px 5px}.search-btn{background-color:#1ab394;border-color:#1ab394;color:#FFF;margin-bottom:5px;display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;border-radius:3px;vertical-align:middle;cursor:pointer}.table-striped{min-height:75%}.table-striped .bootstrap-table{border:0!important}.table-striped .table,.fixed-table-container,table,.table-striped .table,.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{border-bottom:1px solid #ccc!important;background-color:transparent!important;border:0}.table-striped .table>thead>tr>th,.table-striped .table>tbody>tr>th{border-bottom:1px solid #ccc!important;border-top:0!important}.table-striped .table>thead:first-child>tr:first-child>th{color:#333}.table-bordered td,.table-bordered th{border:1px solid #ddd!important} \ No newline at end of file +.box{position:relative;border-radius:3px;background:#fff;border-top:3px solid #d2d6de;margin-bottom:20px;width:100%;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.box-header:before,.box-body:before,.box-footer:before,.box-header:after,.box-body:after,.box-footer:after{content:" ";display:table}.box-header:after,.box-body:after,.box-footer:after{clear:both}.btn-box-tool{padding:5px;font-size:12px;background:transparent;color:#97a0b3}.open .btn-box-tool,.btn-box-tool:hover{color:#606c84}.box-main{margin:0;border:0;padding-top:2px;border-radius:0;box-shadow:none}.box-main>.box-header{border-bottom:1px solid #eee;padding:12px 10px 2px 15px}.box-header .box-title{display:inline-block;font-size:18px;margin:0;line-height:1}.box-main>.box-header .box-title{font-size:16px;margin-bottom:13px;float:left}.box-main>.box-header .box-title .fa{font-size:14px;padding-right:3px;margin-top:-2px}.box-main>.box-header .box-tools{position:relative;top:-5px;right:0}.box-main>.box-header .box-tools .btn{padding:3px 10px 5px 10px;font-size:14px;margin-bottom:2px}.box-main>.box-header .box-tools .btn-box-tool{padding:4px 2px}.box-main form>.box-footer,.nav-main form>.box-footer{background:#fafafa}.box-main form>.box-footer .row,.nav-main form>.box-footer .row{margin:5px 0 5px -25px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#1ab394;border-color:#1ab394;padding:1px 10px;color:#fff}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{margin-right:5px;color:rgba(255,255,255,0.7)}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#fff}.select2-container .select2-selection--single .select2-selection__rendered{padding-right:10px}label.error{position:absolute;right:18px;top:7px;color:#ef392b;font-size:12px}.Validform_error,input.error,select.error{background-color:#fbe2e2;border-color:#c66161;color:#c00}.Validform_wrong,.Validform_right,.Validform_warning{display:inline-block;height:20px;font-size:12px;vertical-align:middle;padding-left:25px}.i-checks label.error,.check-box label.error,.radio-box label.error{right:auto;width:150px;left:210px;top:1px;max-width:none}.check-box,.radio-box{display:inline-block;box-sizing:border-box;cursor:pointer;position:relative;padding-right:20px;padding-top:7px}.loaderbox{display:inline-block;min-width:125px;padding:10px;margin:0 auto;color:#000!important;font-size:13px;font-weight:400;text-align:center;vertical-align:middle;border:1px solid #ddd;background-color:#eee;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 1px 8px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 8px rgba(0,0,0,0.1);box-shadow:0 1px 8px rgba(0,0,0,0.1)}.loaderbox .loading-activity{float:left;width:18px;height:18px;border:solid 2px transparent;border-top-color:#000;border-left-color:#000;border-radius:10px;-webkit-animation:pace-spinner 400ms linear infinite;-moz-animation:pace-spinner 400ms linear infinite;-ms-animation:pace-spinner 400ms linear infinite;-o-animation:pace-spinner 400ms linear infinite;animation:pace-spinner 400ms linear infinite}@media(max-width:767px){.loading-activity{width:18px;height:18px}}@-ms-keyframes pace-spinner{0%{-ms-transform:rotate(0deg);transform:rotate(0deg)}100%{-ms-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes pace-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}li{list-style:none}.time-input{display:block;width:100%;padding-left:10px}label{font-weight:normal}.container-div{padding:10px 35px;height:100%}.container-div .row{height:100%}.select-info,.select-table{width:100%;background:#fff;border-radius:6px;margin-top:10px;padding-top:5px;padding-bottom:13px;box-shadow:1px 1px 3px rgba(0,0,0,.2)}.select-info{position:relative}.select-info .col-sm-6 .control-label{color:#333}@media(max-width :768px){.select-info{display:none}}.select-list li{float:left;color:#333;margin:5px 15px 5px 0}.select-list li input{border:1px solid #ddd;border-radius:4px;background:transparent;outline:0;height:30px;width:280px;padding-left:5px}.select-list li .submit-btn{border:0;border-radius:4px;background:transparent;outline:0;width:40px;height:23px}.select-list li select{border:1px solid #ddd;border-radius:4px;background:transparent;outline:0;height:30px;width:280px}.select-list .select-time input{width:133px}.select-time label,.select-time span,.select-time input{float:left}.select-time label{margin-top:5px}.select-time span{display:block;margin:5px 5px}.search-btn{background-color:#1ab394;border-color:#1ab394;color:#FFF;margin-bottom:5px;display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;border-radius:3px;vertical-align:middle;cursor:pointer}.table-striped{min-height:75%}.table-striped .bootstrap-table{border:0!important}.table-striped .table,.fixed-table-container,table,.table-striped .table,.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{border-bottom:1px solid #e7eaec!important;background-color:transparent!important;border:0}.table-striped .table>thead>tr>th,.table-striped .table>tbody>tr>th{border-bottom:1px solid #ccc!important;border-top:0!important}.table-striped .table>thead:first-child>tr:first-child>th{color:#333}.table-bordered td,.table-bordered th{border:1px solid #ddd!important} \ No newline at end of file diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html index d4678391e..70fd03d01 100644 --- a/src/main/resources/templates/system/dept/dept.html +++ b/src/main/resources/templates/system/dept/dept.html @@ -102,10 +102,10 @@ url: prefix + "/remove/" + id, success : function(result) { if (result.code == web_status.SUCCESS) { - $.modal.alertSuccess(result.msg); + $.modal.msgSuccess(result.msg); $.treeTable.refresh(); } else { - $.modal.alertError(result.msg); + $.modal.msgError(result.msg); } } }); diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html index c516f3a4c..7e5663f9f 100644 --- a/src/main/resources/templates/system/menu/menu.html +++ b/src/main/resources/templates/system/menu/menu.html @@ -135,10 +135,10 @@ url: prefix + "/remove/" + id, success : function(result) { if (result.code == web_status.SUCCESS) { - $.modal.alertSuccess(result.msg); + $.modal.msgSuccess(result.msg); $.treeTable.refresh(); } else { - $.modal.alertError(result.msg); + $.modal.msgError(result.msg); } } });