Skip to content

T
traffic-front
Commit db1e59fc authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

basicData module test and correct

See merge request root/atms!131
parents 7243be85 7985afa7
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 96 deletions
atms-web/src/main/webapp/app/adminApp.js
View file @ db1e59fc
......@@ -258,6 +258,7 @@ var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.t
// part names for modules
// AppPart is for the translation of application level, not for a module for a business logic.
appPart: 'app',
vat:'vat',
// other parts for business logic
//worklist: 'worklist',
//registration: 'registration',
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ db1e59fc
<nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0">
<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:250px;text-align:left;font-size:17px;">
<i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i>
<span style="font-weight:bold;">TAX PLATFORM</span>
</div>
<div class="nav-element-left">
<!--<div class="nav-element-left">
<a ui-sref="summary">
<span id="overview" class="nav-icon-color">{{'MenuOverview' | translate}}</span>
</a>
</div>
<!--<div class="nav-element-left">-->
<div class="nav-element-left">-->
<!--&lt;!&ndash; ng-if="hasQuerySummaryDashboardCode" &ndash;&gt;-->
<!--<a href="app/df/knowlegeBasedSystem/code/pages/taxInforListNew.html" target="_blank">-->
<!--<span class="nav-icon-color">{{'MenuTaxPolicyManagement' | translate}}</span>-->
......@@ -17,7 +17,7 @@
<!--</div>-->
<div class="nav-element-left">
<a ui-sref="overviewVat" hover-show="first">
<span class="nav-icon-color">{{'MenuTaxOperationManagement' | translate}}</span>
<span class="nav-icon-color">{{'MenuVAT' | translate}}</span>
</a>
</div>
<!--<div class="nav-element-left">-->
......@@ -35,7 +35,7 @@
<div class="nav-element-right">
<div class="user-info" ng-click="toggleUserMenu($event)">
<i class="fa fa-user"></i>
<span style="margin-left: 0 2px; font-size: 15px;cursor:pointer;">{{loginUserName | limitString:10}}</span>
<span style="margin-left: 02px; font-size: 15px;cursor:pointer;">{{loginUserName | limitString:10}}</span>
<i class="fa fa-sort-down"></i>
</div>
<div class="user-menu">
......@@ -75,7 +75,7 @@
<div class="clear"></div>
</div>
<div class="nav-sub-container first">
<!--<div class="nav-sub-container first">-->
<!--<div class="element-left">-->
<!--<a ui-sref-active="active" ui-sref="invoiceManagement.main" ng-if="specialUser!=='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuInvoiceManagement' | translate}}</span>-->
......@@ -95,14 +95,14 @@
<!--<span class="nav-sub-icon-color">{{'OutMenuInvoiceManagement' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
<div class="element-left">
<a ui-sref-active="active" ui-sref="overviewVat" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuVAT' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuVAT' | translate}}</span>
</a>
</div>
<!--<div class="element-left">-->
<!--<a ui-sref-active="active" ui-sref="overviewVat" ng-if="specialUser!=='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuVAT' | translate}}</span>-->
<!--</a>-->
<!--<a ng-if="specialUser==='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuVAT' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
<!--<div class="element-left">-->
<!--<a ui-sref-active="active" ui-sref="overviewAssetsManage">-->
<!--<span class="nav-sub-icon-color">{{'MenuAMVAT' | translate}}</span>-->
......@@ -147,33 +147,30 @@
<!--</a>-->
<!--<a ng-if="specialUser==='simon'">-->
<!--<span class="nav-sub-icon-color">{{'TpRpt' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
</div>
<!--</div>-->
<div class="nav-sub-container second">
<!--<div class="nav-sub-container second">-->
<div class="element-left">
<a ui-sref-active="active" ui-sref="summaryDashboard" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuIndexAnalytics' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuIndexAnalytics' | translate}}</span>
</a>
</div>
<div class="element-left">
<a ui-sref-active="active" ui-sref="RiskPanel">
<span class="nav-sub-icon-color">{{'MenuRiskAlert' | translate}}</span>
</a>
</div>
<div class="element-left">
<!-- ng-if="hasQuerySummaryDashboardCode" -->
<a ui-sref-active="active" ui-sref="DataSummary" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuStatistics' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuStatistics' | translate}}</span>
</a>
</div>
</div>
<!--<div class="element-left">-->
<!--<a ui-sref-active="active" ui-sref="summaryDashboard" ng-if="specialUser!=='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuIndexAnalytics' | translate}}</span>-->
<!--</a>-->
<!--<a ng-if="specialUser==='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuIndexAnalytics' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
<!--<div class="element-left">-->
<!--<a ui-sref-active="active" ui-sref="RiskPanel">-->
<!--<span class="nav-sub-icon-color">{{'MenuRiskAlert' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
<!--<div class="element-left">-->
<!--&lt;!&ndash; ng-if="hasQuerySummaryDashboardCode" &ndash;&gt;-->
<!--</a>-->
<!--<a ng-if="specialUser==='simon'">-->
<!--<span class="nav-sub-icon-color">{{'MenuStatistics' | translate}}</span>-->
<!--</a>-->
<!--</div>-->
<!--</div>-->
</nav>
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ db1e59fc
......@@ -1039,9 +1039,9 @@
$scope.dateFormat = $translate.instant('dateFormat4Year');
}
if ($scope.serviceTypeId === enums.serviceType.VAT) {
$scope.systemTitle = $translate.instant('VATTitle');
$scope.systemTitle = $translate.instant('增值税申报');
$scope.viewMode = 1;
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
$scope.dateFormat = $translate.instant(' yyyy 年 mm 月');
}
if ($scope.serviceTypeId === enums.serviceType.AssetsManage) {
$scope.systemTitle = $translate.instant('AssetTitle');
......
atms-web/src/main/webapp/app/module-part1.js
View file @ db1e59fc
......@@ -141,7 +141,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
// this is required to add controller/directive/filter/service after angular bootstrap
bindModule(frameworkModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
$stateProvider.state({
$stateProvider.state({
name: 'overview',
url: '/overview',
views: {
......@@ -180,63 +180,64 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
appTranslation.load([appTranslation.vat,appTranslation.appPart]);
}],
template: '<app-overview servicetypeid="2"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'overviewAssetsManage',
url: '/overview/assetsManage',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-overview servicetypeid="12"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'overviewCit',
url: '/overview/cit',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-overview servicetypeid="6"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'summary',
url: '/summary',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-summary></app-summary>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.summary),
deepStateRedirect: true,
sticky: true
});
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
sticky: true
});
/*$stateProvider.state({
name: 'overviewAssetsManage',
url: '/overview/assetsManage',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-overview servicetypeid="12"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'overviewCit',
url: '/overview/cit',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-overview servicetypeid="6"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'summary',
url: '/summary',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
template: '<app-summary></app-summary>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.summary),
deepStateRedirect: true,
sticky: true
});*/
}
]);
......
atms-web/src/main/webapp/bundles/adminApp.js
View file @ db1e59fc
......@@ -258,6 +258,7 @@ var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.t
// part names for modules
// AppPart is for the translation of application level, not for a module for a business logic.
appPart: 'app',
vat:'vat',
// other parts for business logic
//worklist: 'worklist',
//registration: 'registration',
......
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