Commit ff12e2f8 authored by frank.xa.zhang's avatar frank.xa.zhang

add main page-- frank

parent 5d488827
......@@ -480,8 +480,14 @@ grunt.initConfig({
src: "app/cit/**/*.css",
dest: '<%= pkg.bundleDest %>/cit.css'
},
mainJs:{
src: "app/framework/app-main/*.js",
dest: '<%= pkg.bundleDest %>/appMain.js'
},
mainLess:{
src: "app/framework/app-main/*.less",
dest: '<%= pkg.bundleDest %>/less/appMain.less'
}
},
less: {
adminHomePage: {
......@@ -543,6 +549,16 @@ grunt.initConfig({
files: {
"<%= pkg.bundleDest %>/calendar.less": "<%= pkg.bundleDest %>/less/calendar.less"
}
},
framework:{
files: {
"<%= pkg.bundleDest %>/framework.less": "<%= pkg.bundleDest %>/less/framework.less"
}
},
main:{
files: {
"<%= pkg.bundleDest %>/appMain.less": "<%= pkg.bundleDest %>/less/appMain.less"
}
}
},
//压缩js
......@@ -657,7 +673,7 @@ grunt.registerTask('dev', '开发环境', function () {
'concat:scriptsLogin',
'concat:calendarJs','concat:calendarLess','concat:calendarCss',
'concat:appresourcesCss',
'concat:infrastructureJs',
'concat:infrastructureJs','concat:mainJs','concat:mainLess',
'less', 'copy', 'clean'
])
});
......@@ -60,10 +60,22 @@ var commonModule = angular.module('app.common', ['pascalprecht.translate', 'ngAn
type: 'text/css'
}];
this.summary = [{
this.framework = [{
url: '/bundles/framework.less?v=' + version,
type: 'text/css'
}]; this.summary = [
{
url: '/bundles/summary.css?v=' + version,
type: 'text/css'
}];
}];
this.main = [
{
url: '/bundles/appMain.less?v=' + version,
type: 'text/css'
}];
this.createDependenciesMap = function (dependencies) {
if (!angular.isArray(dependencies)) {
......@@ -100,6 +112,8 @@ var commonModule = angular.module('app.common', ['pascalprecht.translate', 'ngAn
vat: vat,
noPermissionPageModule: noPermissionPageModule,
calendar: calendar
main:main,
framework:framework
};
};
}]);
......@@ -156,6 +170,23 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'mainPage',
url: '/mainPage',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-main></app-main>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(_.flatten([scriptDependencyProvider.main])),
deepStateRedirect: true,
sticky: true
});
}
]);
......
......@@ -145,7 +145,7 @@
<!--}-->
//
<!--else {-->
window.location.href = '/#/calendar';
window.location.href = '/#/mainPage';
//
<!--}-->
// create the back to top button
......
frameworkModule.controller('AppMainController', ['$rootScope', '$scope', '$log', '$state',
function ($rootScope, $scope, $log, $state) {
'use strict';
$log.debug('AppMainController.ctor()...');
var initScope = function () {
$scope.gotoEntity = function () {
$state.go('organization');
};
$scope.gotoCompliance = function () {
// $state.go();
};
$scope.gotoCalendar = function () {
$state.go('taxCalendar');
};
$scope.gotoChart = function () {
// $state.go();
};
};
(function initialize() {
initScope();
})();
}]);
\ No newline at end of file
<div class="main-container">
<div id="u0" class="default">
<img id="u0_img" class="img " src="app-resources/images/entityDB/u0.png">
</div>
<div id="u1" class="default" style="cursor: pointer;" ng-click="gotoEntity()">
<!-- Unnamed (Rectangle) -->
<div id="u2" class="default box_1">
<img id="u2_img" class="img " src="app-resources/images/entityDB/u2.png" tabindex="0">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u3" class="default paragraph">
<img id="u3_img" class="img " src="app-resources/images/entityDB/u3.png">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u4" class="default box_1">
<img id="u4_img" class="img " src="app-resources/images/entityDB/u4.png">
<div id="u4_text" class="text ">
<p><span>Entity Information</span></p>
</div>
</div>
</div>
<div id="u5" class="default" style="cursor: pointer;" ng-click="gotoCompliance()">
<!-- Unnamed (Rectangle) -->
<div id="u6" class="default box_1">
<img id="u6_img" class="img " src="app-resources/images/entityDB/u6.png" tabindex="0">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u7" class="default paragraph">
<img id="u7_img" class="img " src="app-resources/images/entityDB/u3.png">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u8" class="default box_21">
<img id="u8_img" class="img " src="app-resources/images/entityDB/u4.png">
<div id="u8_text" class="text ">
<p><span>Compliance</span></p>
</div>
</div>
</div>
<div id="u13" class="default" style="cursor: pointer;" ng-click="gotoCalendar()">
<!-- Unnamed (Rectangle) -->
<div id="u14" class="default box_1">
<div id="u14_div" class="" tabindex="0"></div>
</div>
<!-- Unnamed (Rectangle) -->
<div id="u15" class="default paragraph">
<img id="u15_img" class="img " src="app-resources/images/entityDB/u3.png">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u16" class="default box_21">
<img id="u16_img" class="img " src="app-resources/images/entityDB/u4.png">
<div id="u16_text" class="text ">
<p><span>Structure Chart</span></p>
</div>
</div>
</div>
<div id="u9" class="default" style="cursor: pointer;" ng-click="gotoChart()">
<!-- Unnamed (Rectangle) -->
<div id="u10" class="ax_default box_1">
<div id="u10_div" class=""></div>
</div>
<!-- Unnamed (Rectangle) -->
<div id="u11" class="ax_default paragraph">
<img id="u11_img" class="img " src="app-resources/images/entityDB/u3.png">
</div>
<!-- Unnamed (Rectangle) -->
<div id="u12" class="ax_default box_21">
<img id="u12_img" class="img " src="app-resources/images/entityDB/u4.png">
<div id="u12_text" class="text ">
<p><span>Calendar</span></p>
</div>
</div>
</div>
<div id="u17" class="default image">
<img id="u17_img" class="img " src="app-resources/images/entityDB/u17.png">
</div>
<div id="u18" class="default image">
<img id="u18_img" class="img " src="app-resources/images/entityDB/u18.png">
</div>
<div id="u19" class="default image">
<img id="u19_img" class="img " src="app-resources/images/entityDB/u19.png">
</div>
<div id="u20" class="default image">
<img id="u20_img" class="img " src="app-resources/images/entityDB/u20.png">
</div>
</div>
\ No newline at end of file
frameworkModule.directive('appMain', ['$log',
function ($log) {
'use strict';
$log.debug('appMain.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/framework/app-main/app-main.html' + '?_=' + Math.random(),
replace: true,
scope: {},
controller: 'AppMainController',
link: function ($scope, $element, $attr) {
// $element.find('.nav-element-left a').click(function () {
// $('.nav-element-left a').removeClass('active');
// $(this).addClass('active');
// });
//
// $scope.callIframe = function () {
//
// $("#dfiframe").contents().find("a:first").click();
// };
}
};
}
]);
\ No newline at end of file
@left1: 180px;
@left2: 290px;
@left3: 300px;
@left4: 400px;
@width: 245px;
@height: 286px;
.main-container {
.default {
font-family: 'Arial';
font-weight: 400;
font-style: normal;
font-size: 13px;
color: #333333;
text-align: center;
line-height: normal;
}
#u0 {
border-width: 0px;
position: absolute;
left: 0px;
top: 51px;
width: 100%;
height: 100%;
opacity: 0.6;
#u0_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
}
#u1 {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 0px;
height: 0px;
#u2 {
border-width: 0px;
position: absolute;
left: 119px;
top: 169px;
width: @width;
height: @height;
color: #1E1E1E;
#u2_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u3 {
border-width: 0px;
position: absolute;
left: 119px;
top: 169px;
width: @width;
height: @height;
font-family: 'Times New Roman Bold Italic', 'Times New Roman';
font-weight: 700;
font-style: italic;
font-size: 180px;
color: #FFFFFF;
text-align: center;
#u3_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u4 {
border-width: 0px;
position: absolute;
left: 119px;
top: 455px;
width: 245px;
height: 107px;
font-family: 'Microsoft YaHei UI Bold', 'Microsoft YaHei UI Regular', 'Microsoft YaHei UI';
font-weight: 700;
font-style: normal;
font-size: 28px;
#u4_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 117px;
}
#u4_text {
border-width: 0px;
position: absolute;
left: 2px;
top: 18px;
width: 241px;
word-wrap: break-word;
text-align: center;
}
}
}
#u20 {
border-width: 0px;
position: absolute;
left: 180px;
top: 234px;
width: 155px;
height: 156px;
}
#u5 {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 0px;
height: 0px;
#u6 {
border-width: 0px;
position: absolute;
left: 422px;
top: 170px;
width: @width;
height: @height;
color: #1E1E1E;
#u6_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u7 {
border-width: 0px;
position: absolute;
left: 422px;
top: 170px;
width: @width;
height: @height;
font-family: 'Times New Roman Bold Italic', 'Times New Roman';
font-weight: 700;
font-style: italic;
font-size: 180px;
color: #FFFFFF;
text-align: center;
#u7_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u8 {
border-width: 0px;
position: absolute;
left: 422px;
top: 456px;
width: 245px;
height: 107px;
color: #333333;
font-family: 'Microsoft YaHei UI Bold', 'Microsoft YaHei UI Regular', 'Microsoft YaHei UI';
font-weight: 700;
font-style: normal;
font-size: 28px;
.box_21 {
font-family: 'Microsoft YaHei UI Bold', 'Microsoft YaHei UI Regular', 'Microsoft YaHei UI';
font-weight: 700;
font-style: normal;
font-size: 28px;
color: #666666;
}
#u8_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 117px;
}
#u8_text {
border-width: 0px;
position: absolute;
left: 2px;
top: 36px;
width: 241px;
word-wrap: break-word;
text-align: center;
}
}
}
#u9 {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 0px;
height: 0px;
#u10 {
border-width: 0px;
position: absolute;
left: 725px;
top: 170px;
width: @width;
height: @height;
color: #1E1E1E;
#u10_div {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: @width;
height: @height;
background: inherit;
background-color: inherit;
background-color: rgba(225, 48, 30, 1);
box-sizing: border-box;
border-width: 1px;
border-style: solid;
border-color: rgba(225, 48, 30, 1);
border-radius: 0px;
-moz-box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
-webkit-box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
color: #1E1E1E;
}
}
#u11 {
border-width: 0px;
position: absolute;
left: 725px;
top: 170px;
width: @width;
height: @height;
font-family: 'Times New Roman Bold Italic', 'Times New Roman';
font-weight: 700;
font-style: italic;
font-size: 180px;
color: #FFFFFF;
text-align: center;
#u11_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u12 {
border-width: 0px;
position: absolute;
left: 725px;
top: 456px;
width: 245px;
height: 107px;
color: #333333;
font-family: 'Microsoft YaHei UI Bold', 'Microsoft YaHei UI Regular', 'Microsoft YaHei UI';
font-weight: 700;
font-style: normal;
font-size: 28px;
#u12_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 117px;
}
#u12_text {
border-width: 0px;
position: absolute;
left: 2px;
top: 36px;
width: 241px;
word-wrap: break-word;
text-align: center;
}
}
}
#u13 {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 0px;
height: 0px;
#u14 {
border-width: 0px;
position: absolute;
left: 1037px;
top: 170px;
width: @width;
height: @height;
color: #1E1E1E;
#u14_div {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 245px;
height: 286px;
background: inherit;
background-color: inherit;
background-color: rgba(219, 83, 106, 1);
box-sizing: border-box;
border-width: 1px;
border-style: solid;
border-color: rgba(219, 83, 106, 1);
border-radius: 0px;
-moz-box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
-webkit-box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
box-shadow: 5px 5px 5px rgba(153, 153, 153, 0.349019607843137);
color: #1E1E1E;
}
}
#u15 {
border-width: 0px;
position: absolute;
left: 1037px;
top: 170px;
width: @width;
height: @height;
font-family: 'Times New Roman Bold Italic', 'Times New Roman';
font-weight: 700;
font-style: italic;
font-size: 180px;
color: #FFFFFF;
text-align: center;
#u15_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 296px;
}
}
#u16 {
border-width: 0px;
position: absolute;
left: 1037px;
top: 456px;
width: 245px;
height: 107px;
color: #333333;
font-family: 'Microsoft YaHei UI Bold', 'Microsoft YaHei UI Regular', 'Microsoft YaHei UI';
font-weight: 700;
font-style: normal;
font-size: 28px;
#u16_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 255px;
height: 117px;
}
#u16_text {
border-width: 0px;
position: absolute;
left: 2px;
top: 36px;
width: 241px;
word-wrap: break-word;
text-align: center;
}
}
}
#u17 {
border-width: 0px;
position: absolute;
left: 1081px;
top: 234px;
width: 157px;
height: 158px;
#u17_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 157px;
height: 158px;
}
}
#u18 {
border-width: 0px;
position: absolute;
left: 467px;
top: 235px;
width: 156px;
height: 156px;
#u18_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 156px;
height: 156px;
}
}
#u19 {
border-width: 0px;
position: absolute;
left: 781px;
top: 237px;
width: 134px;
height: 153px;
#u19_img {
border-width: 0px;
position: absolute;
left: 0px;
top: 0px;
width: 134px;
height: 153px;
}
}
}
\ No newline at end of file
......@@ -40,21 +40,4 @@
};
return TodoListDataModel;
}])
.factory('ChartConfigDataModel', ['WidgetDataModel', function (WidgetDataModel) {
function ChartConfigDataModel() {
}
ChartConfigDataModel.prototype = Object.create(WidgetDataModel.prototype);
ChartConfigDataModel.prototype.init = function () {
var dataModelOptions = this.dataModelOptions;
this.chartConfig = (dataModelOptions && dataModelOptions.chartConfig) ? dataModelOptions.chartConfig : {};
this.updateScope(this.chartConfig);
};
ChartConfigDataModel.prototype.destroy = function () {
WidgetDataModel.prototype.destroy.call(this);
};
return ChartConfigDataModel;
}]);
\ No newline at end of file
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