Skip to content

Commit

Permalink
添加V7数据库，修复回顶部bug，修复火狐不显示登陆框bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@NiccoloTang
NiccoloTang committed Oct 25, 2016
1 parent 6eb2e72 commit 819256a
Show file tree
Hide file tree
Showing 9 changed files with 466 additions and 100 deletions.
33 changes: 0 additions & 33 deletions api/CrapApi.V7-2.sql
View file

This file was deleted.

455 changes: 428 additions & 27 deletions api/CrapApi.V7.sql
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/src/main/webapp/resources/css/crapApi.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ blockquote{
}

.input-wrapper input {
padding: 26px 8px;
padding: 10px 8px;
height: 48px;
width: 100%;
font-size: 16px;
Expand Down
6 changes: 2 additions & 4 deletions api/src/main/webapp/resources/html/backHtml/login.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
<form class="form-horizontal p15 mt10" ng-submit="submitForm('login.do','','FLOAT')" ng-controller="preLoginCtrl">
<button type="button" class="ndis" id="refresh" ng-click="getData();"></button>
<div class="input-wrapper">
<input type="text" ng-model="model.userName" placeholder="用户名（6-20位）"
autocomplete="off" required>
<input type="text" ng-model="model.userName" placeholder="用户名（6-20位）" autocomplete="off" required/>
</div>
<div class="input-wrapper">
<input type="password" ng-model="model.password"
placeholder="密码（不少于6位）" autocomplete="off" required>
<input type="password" ng-model="model.password" placeholder="密码（不少于6位）" autocomplete="off" required/>
</div>
<div class="input-wrapper"
ng-if="settings.VERIFICATIONCODE=='true'">
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webapp/resources/html/backHtml/loginOrRegister.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div ng-include="'resources/html/subTpl/css.tpl.html'"></div>
<div class="trans"></div>
<!-- Top Nav -->
<div ng-include="'resources/html/subTpl/frontTopNav.tpl.html'"></div>
<div ng-include="'resources/html/subTpl/frontTopNav.tpl.html'"></div>
<!-- Top Nav End -->

<div class="container">
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webapp/resources/html/subTpl/footer.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>
</div>

<div id="go_top" style="padding-top: 9px; padding-left: 13px;"
<div id="go_top" onclick="goTop()" style="padding-top: 9px; padding-left: 13px;"
class="cursor">
<i class="iconfont f20" style="color: #FFF;">&#xe617;</i>
</div>
Expand Down
38 changes: 19 additions & 19 deletions api/src/main/webapp/resources/js/backControllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ mainModule.filter('cut', function () {
};
});

mainModule.controller('detailCtrl', function($scope, $http, $state, $stateParams,$http ,httpService) {});
mainModule.controller('detailCtrl', function($scope, $http, $state, $stateParams,httpService) {});

/***
* 后台初始化，加载系统设置，菜单等
*/
mainModule.controller('backInit', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('backInit', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page,setPwd) {
var params = "iUrl=back/init.do|iLoading=fase"; // 表示查询所有
httpService.callHttpMethod($http,params).success(function(result) {
Expand Down Expand Up @@ -131,7 +131,7 @@ mainModule.controller('backInit', function($rootScope,$scope, $http, $state, $st
$scope.getData();
});
/**************************后端接口列表****************************/
mainModule.controller('preLoginCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('preLoginCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function() {
if($rootScope.model && $rootScope.model.sessionAdminName){
window.location.href="admin.do";
Expand Down Expand Up @@ -160,7 +160,7 @@ mainModule.controller('preLoginCtrl', function($rootScope,$scope, $http, $state,
$scope.getData();
});

mainModule.controller('preRegisterCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('preRegisterCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function() {
if($rootScope.model && $rootScope.model.id){
$rootScope.model.tipMessage = "注册成功，请登录";
Expand All @@ -184,7 +184,7 @@ mainModule.controller('preRegisterCtrl', function($rootScope,$scope, $http, $sta
});

/**************************菜单列表****************************/
mainModule.controller('menuCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('menuCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
if($("#searchType").val()!=null&&$("#searchType").val()!=''){
$stateParams.type = $("#searchType").val();
Expand All @@ -200,23 +200,23 @@ mainModule.controller('menuCtrl', function($rootScope,$scope, $http, $state, $st
$scope.getData();
});
/**************************用户列表****************************/
mainModule.controller('userCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/list.do|iLoading=FLOAT|iParams=&trueName=" + $("#trueName").val();
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
/**************************项目成员**************************/
mainModule.controller('userProjectUserCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userProjectUserCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/projectUser/list.do|iLoading=FLOAT|iParams=&projectId=" +$stateParams.projectId;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
/**************************article列表****************************/
mainModule.controller('userArticleCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userArticleCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/article/list.do|iLoading=FLOAT|iPost=POST|iParams=&type="
+ $stateParams.type+"&moduleId="+$stateParams.moduleId+
Expand All @@ -225,7 +225,7 @@ mainModule.controller('userArticleCtrl', function($rootScope,$scope, $http, $sta
};
$scope.getData();
});
mainModule.controller('userCommentCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userCommentCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/comment/list.do|iLoading=FLOAT|iPost=POST|iParams=&articleId="+$stateParams.articleId;
$rootScope.getBaseData($scope,$http,params,page);
Expand All @@ -234,14 +234,14 @@ mainModule.controller('userCommentCtrl', function($rootScope,$scope, $http, $sta
});

/**************************系统设置列表****************************/
mainModule.controller('settingCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('settingCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=setting/list.do|iLoading=FLOAT|iParams=&remark=" + $("#searchRemark").val()+"&key="+$stateParams.key;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
mainModule.controller('settingDetailCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('settingDetailCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function() {
var params = "iLoading=FLOAT|iUrl=setting/detail.do?id="+$stateParams.id+"&key="+$stateParams.key+"&type="+$stateParams.type;
httpService.callHttpMethod($http,params).success(function(result) {
Expand All @@ -258,23 +258,23 @@ mainModule.controller('settingDetailCtrl', function($rootScope,$scope, $http, $s
$scope.getData();
});
/**************************角色列表****************************/
mainModule.controller('roleCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('roleCtrl', function($rootScope,$scope, $http, $state, $stateParams ,httpService) {
$scope.getData = function(page) {
var params = "iUrl=role/list.do|iLoading=FLOAT|iParams=&roleName=" + $("#roleName").val();;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});

mainModule.controller('sourceCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('sourceCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/source/list.do|iLoading=FLOAT|iParams=&name="+$stateParams.name+"&moduleId="+$stateParams.moduleId;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});

mainModule.controller('backInterfaceDetailCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('backInterfaceDetailCtrl', function($rootScope,$scope, $http, $state, $stateParams ,httpService) {
$scope.getRequestExam = function(editerId,targetId,item,tableId) {
var params = "iUrl=user/interface/getRequestExam.do|iLoading=FLOAT|iPost=true|iParams=&"+$.param($rootScope.model);
httpService.callHttpMethod($http,params).success(function(result) {
Expand Down Expand Up @@ -370,31 +370,31 @@ mainModule.controller('backInterfaceDetailCtrl', function($rootScope,$scope, $ht
};
});
/**************************日志列表****************************/
mainModule.controller('logCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('logCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=log/list.do|iLoading=FLOAT|iParams=&modelName="+$stateParams.modelName;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
/*************************项目列表************************/
mainModule.controller('userProjectListCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userProjectListCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/project/list.do|iLoading=FLOAT|iParams=&name="+$stateParams.name+"&type="+$stateParams.type+"&myself="+$stateParams.myself;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
/*************************模块列表**********************/
mainModule.controller('userModuleListCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userModuleListCtrl', function($rootScope,$scope, $http, $state, $stateParams ,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/module/list.do|iLoading=FLOAT|iParams=&projectId="+$stateParams.projectId;
$rootScope.getBaseData($scope,$http,params,page);
};
$scope.getData();
});
/**************************后端接口列表****************************/
mainModule.controller('userInterfaceCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userInterfaceCtrl', function($rootScope,$scope, $http, $state, $stateParams ,httpService) {
$scope.getData = function(page) {
var params = "";
if($("#interfaceName").val()!=null&&$("#interfaceName").val()!=''){
Expand All @@ -412,7 +412,7 @@ mainModule.controller('userInterfaceCtrl', function($rootScope,$scope, $http, $s
$scope.getData();
});
/**************************错误码列表****************************/
mainModule.controller('userErrorCtrl', function($rootScope,$scope, $http, $state, $stateParams,$http ,httpService) {
mainModule.controller('userErrorCtrl', function($rootScope,$scope, $http, $state, $stateParams,httpService) {
$scope.getData = function(page) {
var params = "iUrl=user/error/list.do|iLoading=FLOAT|iParams=";
params += "&projectId=" + $stateParams.projectId;
Expand Down
Loading

0 comments on commit 819256a

Please sign in to comment.