潘钊 / bsth_control · Commits

Commit 62fb68a55d6c92ca4a1d9e78b89f10839885cdc6

Authored by 徐烜
1 parent c0636525
build: skipped

update

Inline Side-by-side
Showing 26 changed files with 443 additions and 1 deletions
src/main/resources/static/assets/js/angular-pjax.js 0 → 100644
  View file @62fb68a
  1 +(function() {
  2 +
  3 + var angularPJAXModule = angular.module('ngPJAX', []);
  4 +
  5 + var pjaxOptions = {
  6 + container: '[data-pjax-container]'
  7 + };
  8 +
  9 + angularPJAXModule.provider('pjax', function() {
  10 + this.config = function(options) {
  11 + angular.extend(pjaxOptions, options);
  12 + };
  13 +
  14 + this.$get = function() {
  15 + return {
  16 + navigateTo: function(url) {
  17 + $.pjax({
  18 + url: url,
  19 + container: pjaxOptions.container
  20 + });
  21 + }
  22 + };
  23 + };
  24 + });
  25 +
  26 + angularPJAXModule.directive('pjaxContainer', function() {
  27 + return {
  28 + controller: ['$rootScope', '$scope', '$window', '$timeout', '$compile', '$element', function($rootScope, $scope, $window, $timeout, $compile, $element) {
  29 + var content, contentScope = null;
  30 +
  31 + var updateCurrentPath = function() {
  32 + $rootScope.currentPath = $window.location.pathname;
  33 + };
  34 +
  35 + //$element.attr('data-pjax-container', true);
  36 + //
  37 + //$(document).pjax('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])', pjaxOptions);
  38 +
  39 + $(document).on('pjax:start', function() {
  40 + $timeout(function() {
  41 + $rootScope.contentLoading = true;
  42 + });
  43 + });
  44 +
  45 + $(document).on('pjax:beforeReplace', function() {
  46 + $timeout(function() {
  47 + if (contentScope) {
  48 + contentScope.$destroy();
  49 + }
  50 + });
  51 + });
  52 +
  53 + $(document).on('pjax:end', function() {
  54 + $timeout(function() {
  55 + updateCurrentPath();
  56 +
  57 + contentScope = $scope.$new(false, $scope);
  58 +
  59 + //alert($element.html());
  60 +
  61 + $element.html($compile($element.html())(contentScope));
  62 +
  63 + $rootScope.contentLoading = false;
  64 + });
  65 + });
  66 +
  67 + updateCurrentPath();
  68 + }]
  69 + };
  70 + });
  71 +
  72 +}).call(this);
0 \ No newline at end of file 73 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/Gruntfile.js
  View file @62fb68a
@@ -11,6 +11,42 @@ module.exports = function (grunt) { @@ -11,6 +11,42 @@ module.exports = function (grunt) {
11 clean: { 11 clean: {
12 demo: { // demo模块 12 demo: { // demo模块
13 src: ['app/demo/tmp/', 'app/demo/dist/'] 13 src: ['app/demo/tmp/', 'app/demo/dist/']
  14 + },
  15 + busInfoManage: { // 车辆信息管理模块
  16 + src: ['app/basicInfo/busInfoManage/tmp/', 'app/basicInfo/busInfoManage/dist/']
  17 + },
  18 + deviceInfoManage: { // 设备信息管理模块
  19 + src: ['app/basicInfo/deviceInfoManage/tmp/', 'app/basicInfo/deviceInfoManage/dist/']
  20 + },
  21 + employeeInfoManage: { // 人员信息管理模块
  22 + src: ['app/basicInfo/employeeInfoManage/tmp/', 'app/basicInfo/employeeInfoManage/dist/']
  23 + },
  24 + busConfig: { // 车辆配置模块
  25 + src: ['app/core/busConfig/tmp/', 'app/core/busConfig/dist/']
  26 + },
  27 + busLineInfoOverview: { // 线路运营概览模块
  28 + src: ['app/core/busLineInfoOverview/tmp/', 'app/core/busLineInfoOverview/dist/']
  29 + },
  30 + dispatchManage: { // 调派管理模块
  31 + src: ['app/core/dispatchManage/tmp/', 'app/core/dispatchManage/dist/']
  32 + },
  33 + employeeConfig: { // 人员配置模块
  34 + src: ['app/core/employeeConfig/tmp/', 'app/core/employeeConfig/dist/']
  35 + },
  36 + guideboardManage: { // 路牌管理模块
  37 + src: ['app/core/guideboardManage/tmp/', 'app/core/guideboardManage/dist/']
  38 + },
  39 + rerunManage: { // 套跑管理模块
  40 + src: ['app/core/rerunManage/tmp/', 'app/core/rerunManage/dist/']
  41 + },
  42 + schedulePlanManage: { // 排班计划管理模块
  43 + src: ['app/core/schedulePlanManage/tmp/', 'app/core/schedulePlanManage/dist/']
  44 + },
  45 + scheduleRuleManage: { // 排班规则管理模块
  46 + src: ['app/core/scheduleRuleManage/tmp/', 'app/core/scheduleRuleManage/dist/']
  47 + },
  48 + timeTableManage: { // 时刻表管理模块
  49 + src: ['app/core/timeTableManage/tmp/', 'app/core/timeTableManage/dist/']
14 } 50 }
15 }, 51 },
16 52
@@ -20,6 +56,66 @@ module.exports = function (grunt) { @@ -20,6 +56,66 @@ module.exports = function (grunt) {
20 files: { 56 files: {
21 'app/demo/dist/demo1.min.js': ['app/demo/demo1.js'] 57 'app/demo/dist/demo1.min.js': ['app/demo/demo1.js']
22 } 58 }
  59 + },
  60 + busInfoManage: { // 车辆信息管理模块
  61 + files: {
  62 + // TODO：
  63 + }
  64 + },
  65 + deviceInfoManage: { // 设备信息管理模块
  66 + files: {
  67 + // TODO：
  68 + }
  69 + },
  70 + employeeInfoManage: { // 人员信息管理模块
  71 + files: {
  72 + // TODO：
  73 + }
  74 + },
  75 + busConfig: { // 车辆配置模块
  76 + files: {
  77 + // TODO：
  78 + }
  79 + },
  80 + busLineInfoOverview: { // 线路运营概览模块
  81 + files: {
  82 + // TODO：
  83 + }
  84 + },
  85 + dispatchManage: { // 调派管理模块
  86 + files: {
  87 + // TODO：
  88 + }
  89 + },
  90 + employeeConfig: { // 人员配置模块
  91 + files: {
  92 + // TODO：
  93 + }
  94 + },
  95 + guideboardManage: { // 路牌管理模块
  96 + files: {
  97 + // TODO：
  98 + }
  99 + },
  100 + rerunManage: { // 套跑管理模块
  101 + files: {
  102 + // TODO：
  103 + }
  104 + },
  105 + schedulePlanManage: { // 排班计划管理模块
  106 + files: {
  107 + // TODO：
  108 + }
  109 + },
  110 + scheduleRuleManage: { // 排班规则管理模块
  111 + files: {
  112 + // TODO：
  113 + }
  114 + },
  115 + timeTableManage: { // 时刻表管理模块
  116 + files: {
  117 + // TODO：
  118 + }
23 } 119 }
24 }, 120 },
25 121
@@ -32,18 +128,210 @@ module.exports = function (grunt) { @@ -32,18 +128,210 @@ module.exports = function (grunt) {
32 from: /(<script src=\")([^\"]*?)(.js\")/mg, 128 from: /(<script src=\")([^\"]*?)(.js\")/mg,
33 to: '$1dist/$2.min$3' 129 to: '$1dist/$2.min$3'
34 }] 130 }]
  131 + },
  132 + busInfoManage: { // 车辆信息管理模块
  133 + src: ["app/basicInfo/busInfoManage/busInfoManage.html"],
  134 + dest: "app/basicInfo/busInfoManage/tmp/",
  135 + "replacements": [{
  136 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  137 + to: '$1dist/$2.min$3'
  138 + }]
  139 + },
  140 + deviceInfoManage: { // 设备信息管理模块
  141 + src: ["app/basicInfo/deviceInfoManage/deviceInfoManage.html"],
  142 + dest: "app/basicInfo/deviceInfoManage/tmp/",
  143 + "replacements": [{
  144 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  145 + to: '$1dist/$2.min$3'
  146 + }]
  147 + },
  148 + employeeInfoManage: { // 人员信息管理
  149 + src: ["app/basicInfo/employeeInfoManage/employeeInfoManage.html"],
  150 + dest: "app/basicInfo/employeeInfoManage/tmp/",
  151 + "replacements": [{
  152 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  153 + to: '$1dist/$2.min$3'
  154 + }]
  155 + },
  156 + busConfig: { // 车辆配置模块
  157 + src: ["app/core/busConfig/busConfig.html"],
  158 + dest: "app/core/busConfig/tmp/",
  159 + "replacements": [{
  160 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  161 + to: '$1dist/$2.min$3'
  162 + }]
  163 + },
  164 + busLineInfoOverview: { // 线路运营概览模块
  165 + src: ["app/core/busLineInfoOverview/busLineInfoOverview.html"],
  166 + dest: "app/core/busLineInfoOverview/tmp/",
  167 + "replacements": [{
  168 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  169 + to: '$1dist/$2.min$3'
  170 + }]
  171 + },
  172 + dispatchManage: { // 调派管理模块
  173 + src: ["app/core/dispatchManage/dispatchManage.html"],
  174 + dest: "app/core/dispatchManage/tmp/",
  175 + "replacements": [{
  176 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  177 + to: '$1dist/$2.min$3'
  178 + }]
  179 + },
  180 + employeeConfig: { // 人员配置模块
  181 + src: ["app/core/employeeConfig/employeeConfig.html"],
  182 + dest: "app/core/employeeConfig/tmp/",
  183 + "replacements": [{
  184 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  185 + to: '$1dist/$2.min$3'
  186 + }]
  187 + },
  188 + guideboardManage: { // 路牌管理模块
  189 + src: ["app/core/guideboardManage/guideboardManage.html"],
  190 + dest: "app/core/guideboardManage/tmp/",
  191 + "replacements": [{
  192 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  193 + to: '$1dist/$2.min$3'
  194 + }]
  195 + },
  196 + rerunManage: { // 套跑管理模块
  197 + src: ["app/core/rerunManage/rerunManage.html"],
  198 + dest: "app/core/rerunManage/tmp/",
  199 + "replacements": [{
  200 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  201 + to: '$1dist/$2.min$3'
  202 + }]
  203 + },
  204 + schedulePlanManage: { // 排班计划管理模块
  205 + src: ["app/core/schedulePlanManage/schedulePlanManage.html"],
  206 + dest: "app/core/schedulePlanManage/tmp/",
  207 + "replacements": [{
  208 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  209 + to: '$1dist/$2.min$3'
  210 + }]
  211 + },
  212 + scheduleRuleManage: { // 排班规则管理模块
  213 + src: ["app/core/scheduleRuleManage/scheduleRuleManage.html"],
  214 + dest: "app/core/scheduleRuleManage/tmp/",
  215 + "replacements": [{
  216 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  217 + to: '$1dist/$2.min$3'
  218 + }]
  219 + },
  220 + timeTableManage: { // 时刻表管理模块
  221 + src: ["app/core/timeTableManage/timeTableManage.html"],
  222 + dest: "app/core/timeTableManage/tmp/",
  223 + "replacements": [{
  224 + from: /(<script src=\")([^\"]*?)(.js\")/mg,
  225 + to: '$1dist/$2.min$3'
  226 + }]
35 } 227 }
36 }, 228 },
37 229
38 // static-inline静态文件插入替换插件配置 230 // static-inline静态文件插入替换插件配置
39 staticinline: { 231 staticinline: {
40 - demoo: { // demo模块 232 + demo: { // demo模块
41 options: { 233 options: {
42 basepath: 'app/demo/' // 查找路径 234 basepath: 'app/demo/' // 查找路径
43 }, 235 },
44 files: { 236 files: {
45 'app/demo/dist/demo1.dist.html': 'app/demo/tmp/demo1.html' 237 'app/demo/dist/demo1.dist.html': 'app/demo/tmp/demo1.html'
46 } 238 }
  239 + },
  240 + busInfoManage: { // 车辆信息管理模块
  241 + options: {
  242 + basepath: 'app/basicInfo/busInfoManage'
  243 + },
  244 + files: {
  245 + 'app/basicInfo/busInfoManage/dist/busInfoManage.dist.html': 'app/basicInfo/busInfoManage/tmp/busInfoManage.html'
  246 + }
  247 + },
  248 + deviceInfoManage: { // 设备信息管理模块
  249 + options: {
  250 + basepath: 'app/basicInfo/deviceInfoManage'
  251 + },
  252 + files: {
  253 + 'app/basicInfo/deviceInfoManage/dist/deviceInfoManage.dist.html': 'app/basicInfo/deviceInfoManage/tmp/deviceInfoManage.html'
  254 + }
  255 + },
  256 + employeeInfoManage: { // 人员信息管理
  257 + options: {
  258 + basepath: 'app/basicInfo/employeeInfoManage'
  259 + },
  260 + files: {
  261 + 'app/basicInfo/employeeInfoManage/dist/employeeInfoManage.dist.html': 'app/basicInfo/employeeInfoManage/tmp/employeeInfoManage.html'
  262 + }
  263 + },
  264 + busConfig: { // 车辆配置模块
  265 + options: {
  266 + basepath: 'app/core/busConfig'
  267 + },
  268 + files: {
  269 + 'app/core/busConfig/dist/busConfig.dist.html': 'app/core/busConfig/tmp/busConfig.html'
  270 + }
  271 + },
  272 + busLineInfoOverview: { // 线路运营概览模块
  273 + options: {
  274 + basepath: 'app/core/busLineInfoOverview'
  275 + },
  276 + files: {
  277 + 'app/core/busLineInfoOverview/dist/busLineInfoOverview.dist.html': 'app/core/busLineInfoOverview/tmp/busLineInfoOverview.html'
  278 + }
  279 + },
  280 + dispatchManage: { // 调派管理模块
  281 + options: {
  282 + basepath: 'app/core/dispatchManage'
  283 + },
  284 + files: {
  285 + 'app/core/dispatchManage/dist/dispatchManage.dist.html': 'app/core/dispatchManage/tmp/dispatchManage.html'
  286 + }
  287 + },
  288 + employeeConfig: { // 人员配置模块
  289 + options: {
  290 + basepath: 'app/core/employeeConfig'
  291 + },
  292 + files: {
  293 + 'app/core/employeeConfig/dist/employeeConfig.dist.html': 'app/core/employeeConfig/tmp/employeeConfig.html'
  294 + }
  295 + },
  296 + guideboardManage: { // 路牌管理模块
  297 + options: {
  298 + basepath: 'app/core/guideboardManage'
  299 + },
  300 + files: {
  301 + 'app/core/guideboardManage/dist/guideboardManage.dist.html': 'app/core/guideboardManage/tmp/guideboardManage.html'
  302 + }
  303 + },
  304 + rerunManage: { // 套跑管理模块
  305 + options: {
  306 + basepath: 'app/core/rerunManage'
  307 + },
  308 + files: {
  309 + 'app/core/rerunManage/dist/rerunManage.dist.html': 'app/core/rerunManage/tmp/rerunManage.html'
  310 + }
  311 + },
  312 + schedulePlanManage: { // 排版计划管理模块
  313 + options: {
  314 + basepath: 'app/core/schedulePlanManage'
  315 + },
  316 + files: {
  317 + 'app/core/schedulePlanManage/dist/schedulePlanManage.dist.html': 'app/core/schedulePlanManage/tmp/schedulePlanManage.html'
  318 + }
  319 + },
  320 + scheduleRuleManage: { // 排班规则管理模块
  321 + options: {
  322 + basepath: 'app/core/scheduleRuleManage'
  323 + },
  324 + files: {
  325 + 'app/core/scheduleRuleManage/dist/scheduleRuleManage.dist.html': 'app/core/scheduleRuleManage/tmp/scheduleRuleManage.html'
  326 + }
  327 + },
  328 + timeTableManage: { // 时刻表管理模块
  329 + options: {
  330 + basepath: 'app/core/timeTableManage'
  331 + },
  332 + files: {
  333 + 'app/core/timeTableManage/dist/timeTableManage.dist.html': 'app/core/timeTableManage/tmp/timeTableManage.html'
  334 + }
47 } 335 }
48 } 336 }
49 337
src/main/resources/static/pages/schedulePlan/app/basicInfo/busInfoManage/busInfoManage.html 0 → 100644
  View file @62fb68a
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>车辆信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">车辆信息管理</span>
  18 + </li>
  19 +
  20 +</ul>
  21 +
  22 +<div class="row">
  23 + <div class="col-md-12">
  24 + dfdfdfdfdf
  25 + </div>
  26 +</div>
0 \ No newline at end of file 27 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/basicInfo/busInfoManage/dist/busInfoManage.dist.html 0 → 100644
  View file @62fb68a
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>车辆信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">车辆信息管理</span>
  18 + </li>
  19 +
  20 +</ul>
  21 +
  22 +<div class="row">
  23 + <div class="col-md-12">
  24 + dfdfdfdfdf
  25 + </div>
  26 +</div>
0 \ No newline at end of file 27 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/basicInfo/deviceInfoManage/deviceInfoManage.html 0 → 100644
  View file @62fb68a
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>设备信息管理</h1>
  4 + </div>
  5 +</div>
0 \ No newline at end of file 6 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/basicInfo/deviceInfoManage/dist/deviceInfoManage.dist.html 0 → 100644
  View file @62fb68a
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>设备信息管理</h1>
  4 + </div>
  5 +</div>
0 \ No newline at end of file 6 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/basicInfo/employeeInfoManage/dist/employeeInfoManage.dist.html 0 → 100644
  View file @62fb68a
  1 +人员信息管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/basicInfo/employeeInfoManage/employeeInfoManage.html 0 → 100644
  View file @62fb68a
  1 +人员信息管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/busConfig/busConfig.html 0 → 100644
  View file @62fb68a
  1 +车辆配置
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/busConfig/dist/busConfig.dist.html 0 → 100644
  View file @62fb68a
  1 +车辆配置
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/busLineInfoOverview.html 0 → 100644
  View file @62fb68a
  1 +线路运营概览
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/dist/busLineInfoOverview.dist.html 0 → 100644
  View file @62fb68a
  1 +线路运营概览
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/dispatchManage/dispatchManage.html 0 → 100644
  View file @62fb68a
  1 +调派管理-TODO
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/dispatchManage/dist/dispatchManage.dist.html 0 → 100644
  View file @62fb68a
  1 +调派管理-TODO
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/employeeConfig/dist/employeeConfig.dist.html 0 → 100644
  View file @62fb68a
  1 +人员配置
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/employeeConfig/employeeConfig.html 0 → 100644
  View file @62fb68a
  1 +人员配置
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/guideboardManage/dist/guideboardManage.dist.html 0 → 100644
  View file @62fb68a
  1 +路牌管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/guideboardManage/guideboardManage.html 0 → 100644
  View file @62fb68a
  1 +路牌管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/rerunManage/dist/rerunManage.dist.html 0 → 100644
  View file @62fb68a
  1 +套跑管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/rerunManage/rerunManage.html 0 → 100644
  View file @62fb68a
  1 +套跑管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/schedulePlanManage/dist/schedulePlanManage.dist.html 0 → 100644
  View file @62fb68a
  1 +排班计划管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/schedulePlanManage/schedulePlanManage.html 0 → 100644
  View file @62fb68a
  1 +排班计划管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/scheduleRuleManage/dist/scheduleRuleManage.dist.html 0 → 100644
  View file @62fb68a
  1 +排班规则管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/scheduleRuleManage/scheduleRuleManage.html 0 → 100644
  View file @62fb68a
  1 +排班规则管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/timeTableManage/dist/timeTableManage.dist.html 0 → 100644
  View file @62fb68a
  1 +时刻表管理
0 \ No newline at end of file 2 \ No newline at end of file
src/main/resources/static/pages/schedulePlan/app/core/timeTableManage/timeTableManage.html 0 → 100644
  View file @62fb68a
  1 +时刻表管理
0 \ No newline at end of file 2 \ No newline at end of file