Skip to content

T
traffic-front
Commit 8c1d5183 authored by Mccoy Z Xia's avatar Mccoy Z Xia
Browse files
Options

calendar样式调整

parent f3a7aa52
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 12 deletions
atms-web/src/main/webapp/app-resources/css/nav.css
View file @ 8c1d5183
......@@ -59,7 +59,7 @@
float: left;
height: 55px;
line-height: 55px;
width: 160px;
width: 180px;
text-align: center;
}
......
atms-web/src/main/webapp/app/calendar/display/calendar-display.ctrl.js
View file @ 8c1d5183
......@@ -10,6 +10,51 @@
$scope.vatPermission = constant.vatPermission;
$scope.agendaFlag = false;
$scope.agendas = [
{
name: "Hong Kong 1 Limited",
desc: "Renewal of business License/Fee payment",
date: "01/01/2019",
week: "Tuesday",
isUrgent: true,
color: "#d93954"
},
{
name: "Hong Kong 1 Limited",
desc: "Renewal of business License/Fee payment",
date: "01/01/2019",
week: "Tuesday",
isUrgent: false,
color: "#d93954"
},
{
name: "Hong Kong 1 Limited",
desc: "Renewal of business License/Fee payment",
date: "01/01/2019",
week: "Tuesday",
isUrgent: true,
color: "#ffbf1f"
},
{
name: "Hong Kong 1 Limited",
desc: "Renewal of business License/Fee payment",
date: "01/01/2019",
week: "Tuesday",
isUrgent: false,
color: "#fd6412"
},
{
name: "Hong Kong 1 Limited",
desc: "Renewal of business License/Fee payment",
date: "01/01/2019",
week: "Tuesday",
isUrgent: true,
color: "#ffbf1f"
}
];
//全局变量初始化放顶上
var CompanyList = [];
var CalendarList = [];
......@@ -890,6 +935,10 @@
});
}
$scope.changeAgendaFlag = function (flag) {
$scope.agendaFlag = flag;
};
//根据ScheduleList更新界面显示
......@@ -898,7 +947,7 @@
//generateSchedule(cal.getViewName(), cal.getDateRangeStart(), cal.getDateRangeEnd());
cal.createSchedules(ScheduleList);
refreshScheduleVisibility();
};
}
function renderFilter() {
var calendarList = document.getElementById('calendarList');
......@@ -927,6 +976,7 @@
var elementList = document.getElementById(elementId);
var html = [];
List.forEach(function (item) {
//style="border: 1px #aaa solid;"
html.push('<div class="lnb-calendars-item"><label>' +
'<input type="checkbox" class="tui-full-calendar-checkbox-round" eleType=' + elementId + ' value="' + item.value + '" checked>' +
'<span class="fa fa-check" style="border-color: ' + color + ';border-size: 1px; margin-top:4px;display:inline-block;vertical-align:top;color:#aaa;line-height:9px;padding-left: 2px;font-size: 11px;"></span>' +
......
atms-web/src/main/webapp/app/calendar/display/calendar-display.html
View file @ 8c1d5183
......@@ -73,19 +73,37 @@
</ul>
</span>
<span id="menu-navi">
<button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">Agenda</button>
<button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">Month</button>
<button type="button" class="btn btn-default btn-sm move-today" data-action="move-today">今天</button>
<button type="button" class="btn btn-default btn-sm move-day" data-action="move-prev">
<i class="calendar-icon ic-arrow-line-left" data-action="move-prev"></i>
</button>
<button type="button" class="btn btn-default btn-sm move-day" data-action="move-next">
<button ng-show="agendaFlag" type="button" class="btn btn-default btn-sm move-today" style="font-size: 18px" data-action="move-today" ng-click="changeAgendaFlag(false)">Agenda</button>
<button ng-show="!agendaFlag" type="button" class="btn btn-default btn-sm move-today" style="font-size: 18px" ng-click="changeAgendaFlag(true)">Month</button>
<button type="button" class="btn btn-default btn-sm move-today" style="font-size: 18px" data-action="move-today">Today</button>
<button ng-show="!agendaFlag" type="button" class="btn btn-default btn-sm move-day" style="float: right" data-action="move-next">
<i class="calendar-icon ic-arrow-line-right" data-action="move-next"></i>
</button>
<button ng-show="!agendaFlag" type="button" class="btn btn-default btn-sm move-day" style="float: right" data-action="move-prev">
<i class="calendar-icon ic-arrow-line-left" data-action="move-prev"></i>
</button>
</span>
<span id="renderRange" class="render-range"></span>
<span ng-show="!agendaFlag" id="renderRange" class="render-range" style="font-weight: bolder;"></span>
<span ng-show="agendaFlag" class="render-range" style="font-weight: bolder;margin: 0 15px;font-size: 20px;">Total task: 11</span>
</div>
<div id="calendar" style="height: 85%;" ng-show="!agendaFlag"></div>
<div id="agenda-list" class="agenda-list-container" ng-show="agendaFlag">
<div class="agenda-info" ng-click="editAgenda(id)" ng-repeat="agenda in agendas track by $index">
<div class="agenda-color" style="background: {{agenda.color}}"></div>
<div class="agenda-detail">
<div>
<span style="float: left;font-weight: bolder;">{{agenda.week}}</span>
<span style="float: right;">{{agenda.date}}</span>
</div>
<div>
<span style="float: left;">{{agenda.desc}}</span>
<span style="float: right;width: 20%;text-align: right;">{{agenda.name}}</span>
<span style="float: right;padding: 0px 50px;font-weight: bolder;color: red;" ng-if="agenda.isUrgent">!Urgent</span>
</div>
</div>
</div>
</div>
<div id="calendar" style="height: 90%;"></div>
</div>
<!--编辑任务Popup-->
......
atms-web/src/main/webapp/app/calendar/display/calendar-display.less
View file @ 8c1d5183
......@@ -227,6 +227,7 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
border-radius: 25px;
height: 30px;
min-width: 30px !important;
margin: 0 5px;
}
#renderRange {
......@@ -273,6 +274,43 @@ input[type=checkbox].tui-full-calendar-checkbox-round+span {
margin-right: 2px;
}
.agenda-list-container {
border: solid 1px #bbb;
left: 5px;
right: 5px;
bottom: 5px;
top: 64px;
overflow-y: auto;
font-size: 18px;
margin-left: 1px;
height: 85%;
}
.agenda-info {
height: 100px;
border-bottom: solid 1px #aaa;
}
.agenda-color {
background: red;
float: left;
width:15px;
height: 100%;
border: solid 1px #bbb;
}
.agenda-detail {
padding: 0 10px;
float: left;
width: calc(100% - 15px);
height: 100%;
}
.agenda-detail div {
padding-top: 10px;
height: 50%;
}
}
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ 8c1d5183
<nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0">
<div class="nav-container" style="min-width:1435px">
<div class="nav-element-left" style="width: 3%;" ng-click="gotoMainPage()"><img src="app-resources/images/entityDB/u40.png"></div>
<div class="nav-element-left" style="width: 3%;outline:none;" ng-click="gotoMainPage()"><img src="app-resources/images/entityDB/u40.png"></div>
<div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;outline:none;" ng-click="gotoMainPage()">
<span style="font-weight:bold;">Entity Info Database</span>
</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