Skip to content

S
saasio
Commit aeeb6978 by yangfangfang
Options

公告

parent cc7b2756
Showing with 133 additions and 91 deletions
src/main/webapp/Gruntfile.js
...@@ -51,8 +51,8 @@ module.exports = function(grunt) { ...@@ -51,8 +51,8 @@ module.exports = function(grunt) {
connect: { connect: {
proxies: [{ proxies: [{
context: ['/api'], context: ['/api'],
// host: 'localhost', host: 'localhost',
host: '192.168.2.37', // host: '192.168.2.37',
port: 8091, port: 8091,
https: false, https: false,
xforward: true, xforward: true,
......
src/main/webapp/activation.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.3226349928881973"> <link rel="stylesheet" href="styles/login.css?r=0.41036946419626474">
<script src="scripts/change.js?r=0.7112433344591409"></script> <script src="scripts/change.js?r=0.5875886247958988"></script>
<script src="scripts/regcom1.js?r=0.8485788230318576"></script> <script src="scripts/regcom1.js?r=0.49364342424087226"></script>
<script src="scripts/regui.js?r=0.6336440013255924"></script> <script src="scripts/regui.js?r=0.5866878852248192"></script>
</head> </head>
<body ng-app="app" ng-controller="acvitationCtrl"> <body ng-app="app" ng-controller="acvitationCtrl">
......
src/main/webapp/demo.html
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<script src="scripts/change.js?r=0.8273717106785625"></script> <script src="scripts/change.js?r=0.16010478581301868"></script>
<script src="scripts/demo.js?r=0.6742043008562177"></script> <script src="scripts/demo.js?r=0.6772886510007083"></script>
<script type="text/javascript"> <script type="text/javascript">
$.get("/api/demo",function(data) { $.get("/api/demo",function(data) {
......
src/main/webapp/failure.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.004987573949620128"> <link rel="stylesheet" href="styles/login.css?r=0.9322576317936182">
<script src="scripts/change.js?r=0.7360319485887885"></script> <script src="scripts/change.js?r=0.41538010514341295"></script>
<script src="scripts/regcom2.js?r=0.9184650341048837"></script> <script src="scripts/regcom2.js?r=0.2466718212235719"></script>
<script src="scripts/failure.js?r=0.9326669548172504"></script> <script src="scripts/failure.js?r=0.16402682894840837"></script>
</head> </head>
<body ng-app="app" ng-controller="failureCtrl"> <body ng-app="app" ng-controller="failureCtrl">
......
src/main/webapp/forget.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.8714517550542951"> <link rel="stylesheet" href="styles/login.css?r=0.24020749446935952">
<script src="scripts/change.js?r=0.722045328002423"></script> <script src="scripts/change.js?r=0.9423119300045073"></script>
<script src="scripts/regcom3.js?r=0.9209529019426554"></script> <script src="scripts/regcom3.js?r=0.4566480740904808"></script>
<script src="scripts/forget.js?r=0.02848458243533969"></script> <script src="scripts/forget.js?r=0.7468544060830027"></script>
</head> </head>
<body ng-app="app" ng-controller="forgetCtrl"> <body ng-app="app" ng-controller="forgetCtrl">
......
src/main/webapp/home1.html
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/home.css?r=0.12386019225232303"> <link rel="stylesheet" href="styles/home.css?r=0.9637537989765406">
<script src="scripts/change.js?r=0.012064240872859955"></script> <script src="scripts/change.js?r=0.34539868822321296"></script>
<script src="scripts/home.js?r=0.8174812090583146"></script> <script src="scripts/home.js?r=0.26635574689134955"></script>
<script src="scripts/homectrl.js?r=0.19571213447488844"></script> <script src="scripts/homectrl.js?r=0.15901376772671938"></script>
<script> <script>
var _hmt = _hmt || []; var _hmt = _hmt || [];
......
src/main/webapp/index.html
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/index.css?r=0.37707017827779055"> <link rel="stylesheet" href="styles/index.css?r=0.48852341808378696">
<script src="scripts/change.js?r=0.820802059955895"></script> <script src="scripts/change.js?r=0.20058486447669566"></script>
<script src="scripts/com.js?r=0.2901791038457304"></script> <script src="scripts/com.js?r=0.8575117164291441"></script>
<script src="scripts/app.js?r=0.8841697168536484"></script> <script src="scripts/app.js?r=0.5790868964977562"></script>
<script src="scripts/ui.js?r=0.6637934029567987"></script> <script src="scripts/ui.js?r=0.03460360551252961"></script>
</head> </head>
<body ng-app="app" ng-controller="indexCtrl" ng-class="{'noreport':backReport}"> <body ng-app="app" ng-controller="indexCtrl" ng-class="{'noreport':backReport}">
......
src/main/webapp/login.html
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.09618336986750364"> <link rel="stylesheet" href="styles/login.css?r=0.11575359338894486">
<script src="scripts/change.js?r=0.05420921300537884"></script> <script src="scripts/change.js?r=0.6097557554021478"></script>
<script src="scripts/lgcom4.js?r=0.7121068546548486"></script> <script src="scripts/lgcom4.js?r=0.33344802912324667"></script>
<script src="scripts/lgui.js?r=0.24842062732204795"></script> <script src="scripts/lgui.js?r=0.2212034841068089"></script>
<script> <script>
var _hmt = _hmt || []; var _hmt = _hmt || [];
......
src/main/webapp/olduser.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.31149819074198604"> <link rel="stylesheet" href="styles/login.css?r=0.7841710445936769">
<script src="scripts/change.js?r=0.8929546170402318"></script> <script src="scripts/change.js?r=0.4421499124728143"></script>
<script src="scripts/regcom5.js?r=0.5510864944662899"></script> <script src="scripts/regcom5.js?r=0.2624261521268636"></script>
<script src="scripts/olduser.js?r=0.7056754943914711"></script> <script src="scripts/olduser.js?r=0.6676868912763894"></script>
</head> </head>
<body ng-app="app" ng-controller="olduserCtrl"> <body ng-app="app" ng-controller="olduserCtrl">
......
src/main/webapp/resetpwd.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.5230596014298499"> <link rel="stylesheet" href="styles/login.css?r=0.8538161558099091">
<script src="scripts/change.js?r=0.7893789829686284"></script> <script src="scripts/change.js?r=0.33458543848246336"></script>
<script src="scripts/regcom7.js?r=0.5114126577973366"></script> <script src="scripts/regcom7.js?r=0.6433788833674043"></script>
<script src="scripts/resetpwd.js?r=0.8044941681437194"></script> <script src="scripts/resetpwd.js?r=0.8525168120395392"></script>
</head> </head>
<body ng-app="app" ng-controller="resetpwdCtrl"> <body ng-app="app" ng-controller="resetpwdCtrl">
......
src/main/webapp/scripts/app.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/success.html
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport"> <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.055841729044914246"> <link rel="stylesheet" href="styles/login.css?r=0.760400326224044">
<script src="scripts/change.js?r=0.5346511888783425"></script> <script src="scripts/change.js?r=0.6985495439730585"></script>
<script src="scripts/regcom8.js?r=0.2486923444084823"></script> <script src="scripts/regcom8.js?r=0.22244378668256104"></script>
<script src="scripts/success.js?r=0.444347481476143"></script> <script src="scripts/success.js?r=0.7736186757683754"></script>
</head> </head>
<body ng-app="app" ng-controller="successCtrl"> <body ng-app="app" ng-controller="successCtrl">
......
src/main/websrc/index.html
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
</div> </div>
</div> </div>
<notice></notice>
</div> </div>
<div class="helpTipWrap winTips" id="winTC"></div> <div class="helpTipWrap winTips" id="winTC"></div>
</div> </div>
......
src/main/websrc/js/app/app.js
...@@ -244,55 +244,10 @@ ...@@ -244,55 +244,10 @@
}); });
} }
$scope.showNoticew = false;
$scope.queryNotice = function(){
var noticePM = HttpService.getInfo("notice/findDeploy", {});
noticePM.then(function(data){
$scope.noticeList = data;
var sortNotice = UtilService.cloneJSON(data);
if(sortNotice && angular.isArray(sortNotice)){
sortNotice.sort(function(a,b){
return new Date(a.deployDate) > new Date(b.deployDate) ? -1 : 1;
});
}
else{
sortNotice = [];
}
if(sortNotice.length>0){
$scope.newNoticeInfo = sortNotice[0];
}
});
$timeout($scope.queryNotice,1000*60*3);
}
$scope.showNoticeWin = function(){
$scope.showNoticew = true;
ToolService.showAlp();
}
$scope.hideNoticeWin = function(){
$scope.showNoticew = false;
ToolService.hideAlp();
}
$scope.clickNotice = function(news){
var id = news.id;
if($scope.curNoticeId == id){
$scope.curNoticeId = -1;
}
else{
$scope.curNoticeId = id;
if(!news.isRead){
news.isRead = true;
if($scope.newNoticeInfo && $scope.newNoticeInfo.id == id){
$scope.newNoticeInfo.isRead = true;
}
HttpService.postInfo("notice/saveReadLog/"+id, {});
}
}
}
$scope.initpage = function(){ $scope.initpage = function(){
$scope.queryLimit(); $scope.queryLimit();
$scope.queryApp(); $scope.queryApp();
$scope.queryNotice();
} }
var lpath = $location.path(); var lpath = $location.path();
......
src/main/websrc/js/app/directive.js
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
.directive("fileModel",["$parse",fileModel]) .directive("fileModel",["$parse",fileModel])
.directive("searchGroup",[searchGroup]) .directive("searchGroup",[searchGroup])
.directive("bigTable",["$timeout","$compile",bigTable]) .directive("bigTable",["$timeout","$compile",bigTable])
.directive("dragOrder",[dragOrder]); .directive("dragOrder",[dragOrder])
.directive("notice",["HttpService","$timeout",notice]);
function delTip(){ function delTip(){
return{ return{
...@@ -2017,11 +2018,63 @@ ...@@ -2017,11 +2018,63 @@
angular.element(element).on("drop",function(event){ angular.element(element).on("drop",function(event){
var replaceDom = $(this),info = JSON.parse(replaceDom.attr("drag-info")); var replaceDom = $(this),info = JSON.parse(replaceDom.attr("drag-info"));
event.preventDefault(); event.preventDefault();
if(sourceId != info.id){ if(sourceId != info.id){
$scope.$emit("dragorder",{id:sourceId,index:info.orderindex,flag:$scope.dragflag}); $scope.$emit("dragorder",{id:sourceId,index:info.orderindex,flag:$scope.dragflag});
} }
}); });
} }
}; };
} }
//消息
function notice(HttpService,$timeout){
return {
restrict: 'E',
replace:true,
scope:{
},
templateUrl : '/template/common/notice.html?r='+tempVersion,
link: function($scope, element, attrs) {
$scope.isLookList = false;
$scope.isDetail = false;
$scope.queryNotice = function(){
var noticePM = HttpService.getInfo("notice/findDeploy", {});
noticePM.then(function(data){
$scope.list = data;
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false;
})
});
$timeout($scope.queryNotice,1000*60*3);
}
$scope.queryNotice();
$scope.changeLook = function(){
$scope.isLookList = !$scope.isLookList;
$scope.isDetail = false;
}
$scope.curNoticeInfo = {};
$scope.clickNotice = function(news){
if(!news.isRead){
HttpService.postInfo("notice/saveReadLog/"+news.id, {});
}
news.isRead = true;
$scope.curNoticeInfo = news;
$scope.isDetail = true;
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false;
})
}
$scope.backList = function(){
$scope.isDetail = false;
}
}
};
}
})(); })();
src/main/websrc/template/common/notice.html 0 → 100644
<div class="noticeBox">
<div class="newInfo" ng-if="noreadList.length>0 && !isLookList" ng-click="changeLook()"><i></i>您有{{noreadList.length}}条新公告</div>
<div class="noNewInfo" ng-if="noreadList.length==0 && !isLookList" ng-click="changeLook()"></div>
<div class="noticeWin" ng-if="isLookList && !isDetail">
<div class="winTitle">公告</div>
<div class="winCont" ng-class="{'noInfo':list.length==0}">
<ul ng-if="list.length>0">
<li ng-repeat="info in list track by $index" ng-class="{'new':!info.isRead}" ng-click="clickNotice(info)">
<i></i>
<h6>{{info.title}}</h6>
<em>{{info.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}</em>
</li>
</ul>
<div class="noTips" ng-if="list.length==0"><p>暂无公告</p></div>
</div>
<div class="hideNotice" ng-click="changeLook()"></div>
</div>
<div class="noticeWin" ng-if="isLookList && isDetail">
<div class="winTitle small" ng-click="backList()">
<div class="noticeBack" ng-click="backList()"></div>
<div class="photo"></div>热云数据运营团队
</div>
<div class="winCont">
<div class="noticeDetail">
<h5>{{curNoticeInfo.title}}</h5>
<p>{{curNoticeInfo.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}</p>
<div class="noticeNews" ng-bind-html="curNoticeInfo.content | filterHtml"></div>
<div class="noticeLogo"></div>
</div>
</div>
<div class="hideNotice" ng-click="changeLook()"></div>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment