若依开源1.1.3发布

This commit is contained in:
RuoYi
2018-05-13 15:10:15 +08:00
parent 20070163c2
commit 784c020fbd
154 changed files with 2243 additions and 2155 deletions

View File

@ -0,0 +1,128 @@
@charset "utf-8";
.container {
margin: 10px auto 0 auto;
position: relative;
font-family: ;
font-size: 12px;
}
.container p {
line-height: 12px;
line-height: 0px;
height: 0px;
margin: 10px;
color: #bbb
}
.action {
width: 400px;
height: 30px;
margin: 10px 0;
}
.cropped {
position: absolute;
left: 500px;
top: 0;
width: 200px;
border: 1px #ddd solid;
height: 440px;
padding: 4px;
box-shadow: 0px 0px 12px #ddd;
text-align: center;
}
.imageBox {
position: relative;
height: 400px;
width: 400px;
border: 1px solid #aaa;
background: #fff;
overflow: hidden;
background-repeat: no-repeat;
cursor: move;
box-shadow: 4px 4px 12px #B0B0B0;
}
.imageBox .thumbBox {
position: absolute;
top: 50%;
left: 50%;
width: 200px;
height: 200px;
margin-top: -100px;
margin-left: -100px;
box-sizing: border-box;
border: 1px solid rgb(102, 102, 102);
box-shadow: 0 0 0 1000px rgba(0, 0, 0, 0.5);
background: none repeat scroll 0% 0% transparent;
}
.imageBox .spinner {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
text-align: center;
line-height: 400px;
background: rgba(0,0,0,0.7);
}
.Btnsty_peyton{ float: right;
width: 46px;
display: inline-block;
margin-bottom: 10px;
height: 37px;
line-height: 37px;
font-size: 14px;
color: #FFFFFF;
margin:0px 2px;
background-color: #f38e81;
border-radius: 3px;
text-decoration: none;
cursor: pointer;
box-shadow: 0px 0px 5px #B0B0B0;
border: 0px #fff solid;}
/*选择文件上传*/
.new-contentarea {
width: 165px;
overflow:hidden;
margin: 0 auto;
position:relative;float:left;
}
.new-contentarea label {
width:100%;
height:100%;
display:block;
}
.new-contentarea input[type=file] {
width:188px;
height:60px;
background:#333;
margin: 0 auto;
position:absolute;
right:50%;
margin-right:-94px;
top:0;
right/*\**/:0px\9;
margin-right/*\**/:0px\9;
width/*\**/:10px\9;
opacity:0;
filter:alpha(opacity=0);
z-index:2;
}
a.upload-img{
width:165px;
display: inline-block;
margin-bottom: 10px;
height:37px;
line-height: 37px;
font-size: 14px;
color: #FFFFFF;
background-color: #f38e81;
border-radius: 3px;
text-decoration:none;
cursor:pointer;
border: 0px #fff solid;
box-shadow: 0px 0px 5px #B0B0B0;
}
a.upload-img:hover{
background-color: #ec7e70;
}
.tc{text-align:center;}
/*www.jq22.com*/

View File

@ -0,0 +1,141 @@
/**
* Created by ezgoing on 14/9/2014.
*/
"use strict";
(function (factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], factory);
} else {
factory(jQuery);
}
}(function ($) {
var cropbox = function(options, el){
var el = el || $(options.imageBox),
obj =
{
state : {},
ratio : 1,
options : options,
imageBox : el,
thumbBox : el.find(options.thumbBox),
spinner : el.find(options.spinner),
image : new Image(),
getDataURL: function ()
{
var width = this.thumbBox.width(),
height = this.thumbBox.height(),
canvas = document.createElement("canvas"),
dim = el.css('background-position').split(' '),
size = el.css('background-size').split(' '),
dx = parseInt(dim[0]) - el.width()/2 + width/2,
dy = parseInt(dim[1]) - el.height()/2 + height/2,
dw = parseInt(size[0]),
dh = parseInt(size[1]),
sh = parseInt(this.image.height),
sw = parseInt(this.image.width);
canvas.width = width;
canvas.height = height;
var context = canvas.getContext("2d");
context.drawImage(this.image, 0, 0, sw, sh, dx, dy, dw, dh);
var imageData = canvas.toDataURL('image/png');
return imageData;
},
getBlob: function()
{
var imageData = this.getDataURL();
var b64 = imageData.replace('data:image/png;base64,','');
var binary = atob(b64);
var array = [];
for (var i = 0; i < binary.length; i++) {
array.push(binary.charCodeAt(i));
}
return new Blob([new Uint8Array(array)], {type: 'image/png'});
},
zoomIn: function ()
{
this.ratio*=1.1;
setBackground();
},
zoomOut: function ()
{
this.ratio*=0.9;
setBackground();
}
},
setBackground = function()
{
var w = parseInt(obj.image.width)*obj.ratio;
var h = parseInt(obj.image.height)*obj.ratio;
var pw = (el.width() - w) / 2;
var ph = (el.height() - h) / 2;
el.css({
'background-image': 'url(' + obj.image.src + ')',
'background-size': w +'px ' + h + 'px',
'background-position': pw + 'px ' + ph + 'px',
'background-repeat': 'no-repeat'});
},
imgMouseDown = function(e)
{
e.stopImmediatePropagation();
obj.state.dragable = true;
obj.state.mouseX = e.clientX;
obj.state.mouseY = e.clientY;
},
imgMouseMove = function(e)
{
e.stopImmediatePropagation();
if (obj.state.dragable)
{
var x = e.clientX - obj.state.mouseX;
var y = e.clientY - obj.state.mouseY;
var bg = el.css('background-position').split(' ');
var bgX = x + parseInt(bg[0]);
var bgY = y + parseInt(bg[1]);
el.css('background-position', bgX +'px ' + bgY + 'px');
obj.state.mouseX = e.clientX;
obj.state.mouseY = e.clientY;
}
},
imgMouseUp = function(e)
{
e.stopImmediatePropagation();
obj.state.dragable = false;
},
zoomImage = function(e)
{
e.originalEvent.wheelDelta > 0 || e.originalEvent.detail < 0 ? obj.ratio*=1.1 : obj.ratio*=0.9;
setBackground();
}
obj.spinner.show();
obj.image.onload = function() {
obj.spinner.hide();
setBackground();
el.bind('mousedown', imgMouseDown);
el.bind('mousemove', imgMouseMove);
$(window).bind('mouseup', imgMouseUp);
el.bind('mousewheel DOMMouseScroll', zoomImage);
};
obj.image.src = options.imgSrc;
el.on('remove', function(){$(window).unbind('mouseup', imgMouseUp)});
return obj;
};
jQuery.fn.cropbox = function(options){
return new cropbox(options, this);
};
}));
/*www.jq22.com*/

View File

@ -14,20 +14,33 @@
cursor: pointer;
}
.icheckbox_square-green {
.icheckbox_square-green-login{
display: inline-block;
*display: inline;
vertical-align: middle;
margin: 0;
padding: 0;
width: 22px;
height: 22px;
background: url(green-login.png) no-repeat;
border: none;
cursor: pointer;
}
.icheckbox_square-green,.icheckbox_square-green-login {
background-position: 0 0;
}
.icheckbox_square-green.hover {
.icheckbox_square-green.hover,.icheckbox_square-green-login.hover {
background-position: -24px 0;
}
.icheckbox_square-green.checked {
.icheckbox_square-green.checked,.icheckbox_square-green-login.checked {
background-position: -48px 0;
}
.icheckbox_square-green.disabled {
.icheckbox_square-green.disabled,.icheckbox_square-green.disabled-login {
background-position: -72px 0;
cursor: default;
}
.icheckbox_square-green.checked.disabled {
.icheckbox_square-green.checked.disabled,.icheckbox_square-green-login.checked.disabled {
background-position: -96px 0;
}
@ -50,7 +63,7 @@
/* HiDPI support */
@media (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) {
.icheckbox_square-green,
.icheckbox_square-green,.icheckbox_square-green-login,
.iradio_square-green {
background-image: url(green%402x.png);
-webkit-background-size: 240px 24px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -1,205 +1,86 @@
html{
height: 100%;
font-family: PingFangSC-Light,'helvetica neue','hiragino sans gb',arial,'microsoft yahei ui','microsoft yahei',simsun,sans-serif;
font-size: 14px;
html {
height:100%
}
body.signin {
background: #18c8f6;
height: auto;
background:url("../img/backg02.jpg") no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
color: rgba(255,255,255,.95);
height:auto;
background:url(../img/login-background.jpg) no-repeat center fixed;
-webkit-background-size:cover;
-moz-background-size:cover;
-o-background-size:cover;
background-size:cover;
color:rgba(255,255,255,.95)
}
.logopanel h1{
font-size: 40px;
}
.signin-info h3{
font-size: 24px;
}
.signinpanel {
width: 912px;
margin: 7% auto 0 auto;
}
.btn-login{
border: 1px solid #00a3ff;
background-color: #00A3FF;
color: #fff;
border-radius: 2px;
}
.btn-login:hover{
color: #fff;
background-color: #0097ee;
border: 1px solid #0097ee;
width:750px;
margin:10% auto 0
}
.signinpanel .logopanel {
float: none;
width: auto;
padding: 0;
background: none;
float:none;
width:auto;
padding:0;
background:0 0
}
.signinpanel .signin-info ul {
list-style: none;
padding: 0;
margin: 20px 0;
font-size: 20px;
list-style:none;
padding:0;
margin:20px 0
}
.signinpanel .form-control {
display: block;
margin-top: 15px;
display:block;
margin-top:15px
}
.signinpanel .uname {
background: #fff url(../img/user.png) no-repeat 95% center;color:#333;
background:#fff url(../img/user.png) no-repeat 95% center;
color:#333
}
.signinpanel .pword {
background: #fff url(../img/locked.png) no-repeat 95% center;color:#333;
background:#fff url(../img/locked.png) no-repeat 95% center;
color:#333
}
.signinpanel .code {
background: #fff no-repeat 95% center;color:#333; margin:0 0 15px 0;
}
.signinpanel .btn {
margin-top: 15px;
margin-top:15px
}
.signinpanel form {
background: #fff;
border: 1px solid rgba(255,255,255,.3);
-moz-box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
-webkit-box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
padding: 30px;
color:#666;
background:rgba(255,255,255,.2);
border:1px solid rgba(255,255,255,.3);
-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);
-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);
box-shadow:0 3px 0 rgba(12,12,12,.03);
-moz-border-radius:3px;
-webkit-border-radius:3px;
border-radius:3px;
padding:30px
}
.signinpanel form >h3{
color: #333333;
font-size: 24px;
font-family: "microsoft yahei";
font-weight: 400;
.signup-footer {
border-top:solid 1px rgba(255,255,255,.3);
margin:20px 0;
padding-top:15px
}
.signup-footer{border-top: solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top: 15px;}
.outside-login{
border-top: #dcdee3 1px solid;
padding: 7% 0 0;
text-align: center;
position: relative;
margin: 9% 0% 0;
border-radius: 0 0 1% 1%;
@media screen and (max-width:768px) {
.signinpanel,.signuppanel {
margin:0 auto;
width:420px!important;
padding:20px
}
.outside-login-tit{
position: absolute;
top: -8px;
left: 50%;
margin: 0 0 0 -50px;
text-align: center;
width: 100px;
height: 14px;
line-height: 1;
color: #999;
.signinpanel form {
margin-top:20px
}
.outside-login-tit span{
position: relative;
z-index: 2;
.signup-footer,.signuppanel .form-control {
margin-bottom:10px
}
.outside-login-tit:before {
top: 0;
left: 0;
background-color: #fff;
.signup-footer .pull-left,.signup-footer .pull-right {
float:none!important;
text-align:center
}
.outside-login-tit:after {
top: 7px;
left: 0;
background-color: #fff;
.signinpanel .signin-info ul {
display:none
}
.outside-login-tit:after, .outside-login-tit:before {
content: '';
display: block;
width: 100%;
height: 7px;
position: absolute;
z-index: 1;
}@media screen and (max-width:320px) {
.signinpanel,.signuppanel {
margin:0 20px;
width:auto
}
.outside-login-con {
font-size: 0;
padding-top: 10px;
}
.outside-login-list {
width: 116%;
margin-left: -8%;
}
.outside-login-btn {
display: inline-block;
vertical-align: middle;
text-align: center;
width: 33.3333%;
}
.outside-login-list .actived {
display: inline-block;
}
.outside-login-btn em {
display: block;
width: 50px;
height: 50px;
line-height: 50px;
border-radius: 50%;
margin: 0 auto 5px;
white-space: normal;
font-size: 20px;
color: #fff;
}
.outside-login-btn:first-child, .outside-login-btn:last-child {
width: 30.3333%;
}
.outside-login-btn span {
font-size: 14px;
color: #333;
}
.oschina em{
background-color: #4ec34d;
}
.git em{
background-color: #211b1b;
}
.my em{
background-color: #ff4700
}
@media screen and (max-width: 768px) {
.signinpanel,
.signuppanel {
margin: 0 auto;
width: 413px!important;
padding: 20px;
}
.signinpanel form {
margin-top: 20px;
}
.signup-footer {
margin-bottom: 10px;
}
.signuppanel .form-control {
margin-bottom: 10px;
}
.signup-footer .pull-left,
.signup-footer .pull-right {
float: none !important;
text-align: center;
}
.signinpanel .signin-info ul {
display: none;
}
}
@media screen and (max-width: 320px) {
.signinpanel,
.signuppanel {
margin:0 20px;
width:auto;
}
}

View File

@ -1 +0,0 @@
html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0 0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@ -106,6 +106,30 @@ $(function(){
columns: _columns
});
}
// 初始bootstrap table 自定义参数
$.initTableParams = function (_columns, _url, _queryParams) {
$('.bootstrap-table').bootstrapTable({
method: 'get', // 请求方式(*
dataType: "json", // 返回格式(*
url: _url, // 请求后台的URL*
pagination: true, // 是否显示分页(*
pageSize: 10, // 每页的记录行数(*
pageNumber: 1, // 初始化加载第一页,默认第一页
pageList: [10, 25, 50], // 可供选择的每页的行数(*
search: true, // 是否显示搜索框功能
singleSelect: false, // 是否禁止多选
iconSize: 'outline', // 图标大小undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮
toolbar: '#tableToolbar', // 指定工作栏
sidePagination: "server", // 启用服务端分页
showRefresh: true, // 是否显示刷新按钮
showColumns: true, // 是否显示隐藏某列下拉框
showToggle: true, // 是否显示详细视图和列表视图的切换按钮
cache: false, // 是否使用缓存
showExport: true, // 是否支持导出文件
queryParams: _queryParams,
columns: _columns
});
}
//初始化表格树,并展开树
$.initTreeTable = function (_id, _parentId, _columns, _url) {
$.initTreeTable(_id, _parentId, _columns, _url, true);

View File

@ -0,0 +1,61 @@
$(function() {
validateRule();
$(".i-checks").iCheck({checkboxClass:"icheckbox_square-green-login"});
$('.imgcode').click(function() {
var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random();
$(".imgcode").attr("src", url);
});
});
$.validator.setDefaults({
submitHandler: function() {
login();
}
});
function login() {
var username = $("input[name='username']").val().trim();
var password = $("input[name='password']").val().trim();
var validateCode = $("input[name='validateCode']").val().trim();
var rememberMe = $("input[name='rememberme']").is(':checked');
$.ajax({
type: "POST",
url: ctx + "login",
data: {
"username": username,
"password": password,
"validateCode" : validateCode,
"rememberMe": rememberMe
},
success: function(r) {
if (r.code == 0) {
parent.location.href = ctx + 'index';
} else {
layer.msg(r.msg);
}
}
});
}
function validateRule() {
var icon = "<i class='fa fa-times-circle'></i> ";
$("#signupForm").validate({
rules: {
username: {
required: true
},
password: {
required: true
}
},
messages: {
username: {
required: icon + "请输入您的用户名",
},
password: {
required: icon + "请输入您的密码",
}
}
})
}

View File

@ -41,7 +41,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -41,7 +41,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -25,10 +25,8 @@ function loading() {
}
},
{
title : '创建时间',
formatter : function(row, index) {
return formatDate(row.createTime,"yyyy-MM-dd");
}
field: 'createTimeStr',
title : '创建时间'
},
{
title : '操作',

View File

@ -37,7 +37,7 @@ $(function() {
title: '备注'
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -33,7 +33,7 @@ $(function() {
title: '备注'
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -32,7 +32,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -33,7 +33,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -44,7 +44,7 @@ function queryUserList() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{
@ -63,7 +63,20 @@ function queryUserList() {
}
}];
var url = prefix + "/list";
$.initTable(columns, url);
$.initTableParams(columns, url, queryParams);
}
function queryParams(params) {
return {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
searchValue: params.search,
orderByColumn: params.sort,
isAsc: params.order,
deptId: $("#deptId").val(),
parentId: $("#parentId").val()
};
}
function queryDeptTreeDaTa()
@ -72,8 +85,9 @@ function queryDeptTreeDaTa()
var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
callback:{onClick:function(event, treeId, treeNode){
tree.expandNode(treeNode);
var opt = { query : { deptId : treeNode.id, parentId : treeNode.pId, } };
$('.bootstrap-table').bootstrapTable('refresh', opt);
$("#deptId").val(treeNode.id);
$("#parentId").val(treeNode.pId);
$('.bootstrap-table').bootstrapTable('refresh', queryParams);
}}
}, tree, loadTree = function(){
$.get(ctx + "system/dept/treeData", function(data) {

View File

@ -13,11 +13,11 @@ $(function() {
title: '表描述'
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{
field: 'updateTime',
field: 'updateDateTimeStr',
title: '更新时间'
},
{