潘钊 / bsth_control · Commits

Commit 25b537c84e6acb66fdfd9e17798e66a6fc8b45f6

Authored by ljq
1 parent 6a5b5b45
build: skipped

1

Inline Side-by-side
Showing 10 changed files with 426 additions and 51 deletions
src/main/resources/static/pages/base/timesmodel/add.html
  View file @25b537c
... ... @@ -19,9 +19,9 @@
19 19 <!-- 线路信息导航栏组件 START -->
20 20 <ul class="page-breadcrumb breadcrumb">
21 21 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
22   - <li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
  22 + <li><span class="active">时刻表辅助编排</span> <i class="fa fa-circle"></i></li>
23 23 <li>
24   - <a href="/#/ttInfoManage_two">智能时刻表</a>
  24 + <a href="/#/ttInfoManage_two">时刻表优化编制</a>
25 25 <i class="fa fa-circle"></i>
26 26 </li>
27 27 <li><span class="active">智能时刻表明细制作建模</span></li>
... ... @@ -37,9 +37,9 @@
37 37 </div>
38 38  
39 39 <div class="actions">
40   - <div class="btn-group btn-group-devided" data-toggle="buttons">
  40 + <!--<div class="btn-group btn-group-devided" data-toggle="buttons">
41 41 <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
42   - </div>
  42 + </div>-->
43 43 <div class="btn-group btn-group-devided" data-toggle="buttons">
44 44 <a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
45 45 </div>
... ...
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @25b537c
... ... @@ -12,9 +12,9 @@
12 12 <!-- 线路信息导航栏组件 START -->
13 13 <ul class="page-breadcrumb breadcrumb">
14 14 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
15   - <li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
  15 + <li><span class="active">时刻表辅助编排</span> <i class="fa fa-circle"></i></li>
16 16 <li>
17   - <a href="/#/ttInfoManage_two">智能时刻表</a>
  17 + <a href="/#/ttInfoManage_two">时刻表优化编制</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li><span class="active">智能时刻表明细模型</span></li>
... ...
src/main/resources/static/pages/base/timesmodel/gantt_sut.html 0 → 100644
  View file @25b537c
  1 +<link type="text/css" href="/pages/base/timesmodel/js/ContextJS/css/context.standalone.css" rel="stylesheet"/>
  2 +<link type="text/css" href="/pages/base/timesmodel/css/d3.relationshipgraph.min.css" rel="stylesheet"/>
  3 +<link type="text/css" href="/pages/base/timesmodel/css/index.css" rel="stylesheet"/>
  4 +<!-- 片段标题 START -->
  5 +<div class="page-head">
  6 + <div class="page-title">
  7 + <h1>时刻表明细模型</h1>
  8 + </div>
  9 +</div>
  10 +<!-- 片段标题 END -->
  11 +
  12 +<!-- 线路信息导航栏组件 START -->
  13 +<ul class="page-breadcrumb breadcrumb">
  14 + <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  15 + <li><span class="active">时刻表辅助编排</span> <i class="fa fa-circle"></i></li>
  16 + <li>
  17 + <a href="/#/ttInfoManage_sut_two">时刻表诊断评估</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li><span class="active">智能时刻表明细模型</span></li>
  21 +</ul>
  22 +<!-- 线路信息导航栏组件 END -->
  23 +
  24 +<!-- row 组件START -->
  25 +<div class="row">
  26 + <!-- col-md-12 组件START -->
  27 + <div class="col-md-12">
  28 + <!-- portlet 组件START -->
  29 + <div class="portlet light porttlet-fit bordered" >
  30 + <!-- portlet-title组件START -->
  31 + <div class="portlet-title">
  32 + <!-- caption 组件START -->
  33 + <div class="caption offset">
  34 + <i class="fa fa-bar-chart font-dark"></i>
  35 + <span class="caption-subject font-dark sbold uppercase skmxTitle"></span>
  36 + <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);float: right;margin-left: 2px;"></i>
  37 + </div>
  38 + <!-- caption 组件END -->
  39 + <div class="tools" style="margin-left: 20px;margin-top: -10px;">
  40 + <a href="" class="fullscreen" data-original-title="" title="" style="text-decoration: none;"> </a>
  41 + </div>
  42 +
  43 + <!-- 班次调整输入框 -->
  44 + <div class="bc-adjust-list hidden">
  45 + <input type="hidden" id="bcAdjustName" />
  46 + <select class="js-example-placeholder-multiple js-states form-control bc-adjust-list-input" multiple="multiple" id="bcAdjustList"></select>
  47 + <a class="btn" href="javascript:;" data-pjax style="background:#c2c8d2;color: #fff;position: absolute; top: 4px; right: 55px;" id="bcAdjustListCancel"> 取消</a>
  48 + <a class="btn blue" href="javascript:;" data-pjax style="position: absolute; top: 4px; right: 1px;" id="bcAdjustListSubmit"> 提交</a>
  49 + </div>
  50 + <!-- actions 组件START -->
  51 + <div class="actions">
  52 + <div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
  53 + <a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 时刻表诊断评估</a>
  54 + </div>
  55 + <div class="btn-group btn-group-devided parambtn" data-toggle="buttons">
  56 + <a class="btn btn-circle blue paramAdd" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 重新生成</a>
  57 + </div>
  58 + <!--<div class="btn-group btn-group-devided checkbtn" data-toggle="buttons">-->
  59 + <!--<a class="btn btn-circle blue checkAdd" href="javascript:;" data-pjax><i class="fa fa-check"></i> 保存数据</a>-->
  60 + <!--</div>-->
  61 +
  62 + <div class="btn-group exportbtn">
  63 + <a href="javascript:" class="btn red btn-outline btn-circle exportAdd" data-toggle="dropdown">
  64 + <i class="fa fa-file-excel-o"></i>
  65 + <span class="exportAddSpan">导出数据</span>
  66 + <i class="fa fa-angle-down"></i>
  67 + </a>
  68 + <ul class="dropdown-menu pull-right">
  69 + <li>
  70 + <a href="javascript:" class="tool-action exportAddXls">
  71 + <i class="fa fa-file-excel-o"></i>
  72 + Excel97 xls
  73 + </a>
  74 + </li>
  75 + <li>
  76 + <a href="javascript:" class="tool-action exportAddXlsx">
  77 + <i class="fa fa-file-excel-o"></i>
  78 + Excel2007 xlsx
  79 + </a>
  80 + </li>
  81 + </ul>
  82 + </div>
  83 +
  84 +
  85 +
  86 + <div class="btn-group checkbtn">
  87 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown" aria-expanded="false">
  88 + <i class="fa fa-cog"></i>
  89 + <span>系统工具</span>
  90 + <i class="fa fa-angle-down"></i>
  91 + </a>
  92 + <ul class="dropdown-menu pull-right">
  93 + <li>
  94 + <a href="javascript:;" class="tool-action revoke">
  95 + <i class="fa fa-reply"></i>&nbsp;撤&nbsp;&nbsp;销
  96 + </a>
  97 + </li>
  98 + <li>
  99 + <a href="javascript:" class="tool-action recover">
  100 + <i class="fa fa-share"></i>&nbsp;恢&nbsp;&nbsp;复
  101 + </a>
  102 + </li>
  103 + <!--<li>
  104 + <a href="javascript:" class="tool-action reladelete">
  105 + <i class="fa fa-close"></i>&nbsp;批量删除
  106 + </a>
  107 + </li>-->
  108 + <li>
  109 + <a href="javascript:" class="tool-action addBc">
  110 + <i class="fa fa-plus"></i>&nbsp;添加班次
  111 + </a>
  112 + </li>
  113 + <li>
  114 + <a href="javascript:" class="tool-action addLp">
  115 + <i class="fa fa-plus"></i>&nbsp;添加路牌
  116 + </a>
  117 + </li>
  118 + <!--<li>
  119 + <a href="javascript:" class="tool-action editLp">
  120 + <i class="fa fa-pencil"></i>&nbsp;修改路牌
  121 + </a>
  122 + </li>-->
  123 + <li>
  124 + <a href="javascript:" class="tool-action deleteLp">
  125 + <i class="fa fa-close"></i>&nbsp;删除路牌
  126 + </a>
  127 + </li>
  128 + <li>
  129 + <a href="javascript:" class="tool-action balanceBc">
  130 + <i class="fa fa-arrows-h"></i>&nbsp;均匀发车
  131 + </a>
  132 + </li>
  133 + <li>
  134 + <a href="javascript:" class="tool-action bcAdjust">
  135 + <i class="fa fa-arrows-v"></i>&nbsp;班次调整
  136 + </a>
  137 + </li>
  138 + </ul>
  139 + </div>
  140 + </div>
  141 + <!-- actions 组件END -->
  142 + </div>
  143 + <!-- portlet-title组件END -->
  144 +
  145 + <!-- portlet-body组件START -->
  146 + <div class="portlet-body" id="scrllmouseEvent">
  147 + <!-- ganttSvgContainer SVG组件START -->
  148 + <!--<div class="ganttSvgContainer">
  149 + <div id="ganttSvg"></div>
  150 + </div>-->
  151 + <div class="gtt">
  152 + <div id="upDownContainer"></div>
  153 + <div id="bcContainer"></div>
  154 + </div>
  155 + <!-- ganttSvgContainer SVG组件END -->
  156 + </div>
  157 + <!-- portlet-body组件END -->
  158 + </div>
  159 + <!-- portlet 组件END -->
  160 + </div>
  161 + <!-- col-md-12 组件END -->
  162 +</div>
  163 +
  164 +
  165 +<!-- echarts4 -->
  166 +<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
  167 +
  168 +<!-- row 组件END -->
  169 +<script src="/pages/base/timesmodel/js/raty/lib/jquery.raty.js"></script>
  170 +<script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
  171 +<script src="/pages/base/timesmodel/js/dateTimeTool.js"></script>
  172 +<script src="/pages/base/timesmodel/js/base-fun.js"></script>
  173 +<script src="/pages/base/timesmodel/js/v1/bcFun.js"></script>
  174 +<script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>
  175 +<script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>
  176 +<script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>
  177 +<script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
  178 +<script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
  179 +<script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
  180 +<script src="/pages/base/timesmodel/js/v2/core/InternalLpObj.js"></script>
  181 +<script src="/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js"></script>
  182 +<script src="/pages/base/timesmodel/js/v2/strategy/adjust/AdjustTripS1.js"></script>
  183 +<script src="/pages/base/timesmodel/js/v2/strategy/adjust/AdjustTripS2.js"></script>
  184 +<script src="/pages/base/timesmodel/js/v2/strategy/adjust/AdjustTripS3.js"></script>
  185 +<script src="/pages/base/timesmodel/js/v2/strategy/adjust/AdjustTripS4.js"></script>
  186 +<script src="/pages/base/timesmodel/js/v2/main_v2.js"></script>
  187 +
  188 +<!--
  189 +使用新的echart画图，暂时不用d3，之后会吧d3的放到新的文件里
  190 +<script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
  191 +-->
  192 +
  193 +<script src="/pages/base/timesmodel/js/v2_2/InternalScheduleObj.js"></script>
  194 +<script src="/pages/base/timesmodel/js/v2_2/main_v2_2.js"></script>
  195 +<script src="/pages/base/timesmodel/js/v2_2/Main_v2_2_ExcelObj.js"></script>
  196 +<script src="/pages/base/timesmodel/js/v2_2/strategy/workhours/ModifyBcTripWHS1.js"></script>
  197 +<script src="/pages/base/timesmodel/js/v2_2/strategy/headway/CalcuHeadwayS1.js"></script>
  198 +<script src="/pages/base/timesmodel/js/v2_2/strategy/headway/CalcuHeadwayS2.js"></script>
  199 +<script src="/pages/base/timesmodel/js/v2_2/strategy/headway/AdjustHeadwayS1.js"></script>
  200 +<script src="/pages/base/timesmodel/js/v2_2/strategy/headway/AdjustHeadwayS2.js"></script>
  201 +<script src="/pages/base/timesmodel/js/v2_2/strategy/headway/AdjustHeadwayS3_eat.js"></script>
  202 +<script src="/pages/base/timesmodel/js/v2_2/strategy/runtime/LinearRuntimeS1.js"></script>
  203 +<script src="/pages/base/timesmodel/js/v2_2/strategy/layovertime/LayoverTimeS1.js"></script>
  204 +<script src="/pages/base/timesmodel/js/v2/strategy/StrategyUtils.js"></script>
  205 +<script src="/pages/base/timesmodel/js/v2_2/strategy/StrategyUtils.js"></script>
  206 +
  207 +<script src="/pages/base/timesmodel/js/errorinfo.js"></script>
  208 +<script src="/pages/base/timesmodel/js/parameters.js"></script>
  209 +<script src="/pages/base/timesmodel/js/systemTools.js"></script>
  210 +<script src="/pages/base/timesmodel/js/echartsDrawGanTT.js"></script>
  211 +<script src="/pages/base/timesmodel/js/gantt.js"></script>
  212 +
  213 +<script id="rightClick_dropdown_menu" type="text/html">
  214 + <ul class="dropdown-menu dropdown-context" id="dropdown_menu"
  215 + style="{{style}}">
  216 + <input type="hidden" value="{{dataIndex}}" name="dataIndex" id="dataIndex">
  217 + <li><a href="javascript:dropdownMenuUpdate('{{dataIndex}}');" id="update">修改</a></li>
  218 + <li><a href="javascript:dropdownMenuDelete('{{dataIndex}}');" id="delete" >删除</a></li>
  219 + <li><a href="javascript:dropdownMenuSwitchUpDown('{{dataIndex}}');" id="switchUpDown">班次切换上下行</a></li>
  220 + <li><a href="javascript:dropdownMenuLpSwitchUpDown('{{dataIndex}}');" id="lpSwitchUpDown">路牌切换上下行</a></li>
  221 + <li><a href="javascript:dropdownMenuSetNormal('{{dataIndex}}');" id="setNormal">设为正常</a></li>
  222 + <li><a href="javascript:dropdownMenuSetRegion('{{dataIndex}}');" id="setRegion">设为区间</a></li>
  223 + <li><a href="javascript:dropdownMenuSetFb('{{dataIndex}}');" id="setFb">设为分班</a></li>
  224 + <li><a href="javascript:dropdownMenuSetNoFb('{{dataIndex}}');" id="SetNoFb">取消分班</a></li>
  225 + <li><a href="javascript:dropdownMenuSetVenting('{{dataIndex}}');" id="setVenting">设为直放</a></li>
  226 + <li><a href="javascript:dropdownMenuSetMajor('{{dataIndex}}');" id="setMajor">设为放站</a></li>
  227 + </ul>
  228 +</script>
0 229 \ No newline at end of file
... ...
src/main/resources/static/pages/permission/authorize_all/user_auth.html
  View file @25b537c
... ... @@ -151,7 +151,7 @@
151 151 '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
152 152 '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（南汇六分）',
153 153 '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
154   - '77_78': '闵行公司','300_301': '金球公交','302_303': '露虹公交','310_311': '江南旅游', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
  154 + '77_78': '闵行公司','77_79': '其他','300_301': '金球公交','302_303': '露虹公交','310_311': '江南旅游', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
155 155 };
156 156  
157 157 var defauleConfig;
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @25b537c
... ... @@ -1923,8 +1923,8 @@ ScheduleApp.config([
1923 1923 "": {
1924 1924 templateUrl: 'pages/scheduleApp/module/core/ttInfoManage_sut/index.html'
1925 1925 },
1926   - "ttInfoManage_list_sut@ttInfoManage_sut": {
1927   - templateUrl: 'pages/scheduleApp/module/core/ttInfoManage_sut/list.html'
  1926 + "ttInfoManage_list_sut@ttInfoManage_sut": {
  1927 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage_sut/list.html'
1928 1928 }
1929 1929 },
1930 1930  
... ... @@ -1942,6 +1942,31 @@ ScheduleApp.config([
1942 1942 }]
1943 1943 }
1944 1944 })
  1945 + .state("ttInfoManage_sut_two", { // index页面
  1946 + url: '/ttInfoManage_sut_two',
  1947 + views: {
  1948 + "": {
  1949 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage_sut/index_two.html'
  1950 + },
  1951 + "ttInfoManage_list_sut_two@ttInfoManage_sut_two": {
  1952 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage_sut/list_two.html'
  1953 + }
  1954 + },
  1955 +
  1956 + resolve: {
  1957 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1958 + return $ocLazyLoad.load({
  1959 + name: 'ttInfoManage_module',
  1960 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1961 + files: [
  1962 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1963 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1964 + "pages/scheduleApp/module/core/ttInfoManage_sut/module.js"
  1965 + ]
  1966 + });
  1967 + }]
  1968 + }
  1969 + })
1945 1970 .state("ttInfoManage_form_sut", { // 添加时刻表信息form
1946 1971 url: '/ttInfoManage_form_sut',
1947 1972 views: {
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/index_two.html
  View file @25b537c
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>时刻表管理</h1>
  3 + <h1>时刻表优化编制</h1>
4 4 </div>
5 5 </div>
6 6  
... ... @@ -14,7 +14,7 @@
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <span class="active">时刻表管理</span>
  17 + <span class="active">时刻表优化编制</span>
18 18 </li>
19 19 </ul>
20 20  
... ... @@ -36,15 +36,6 @@
36 36 <span class="caption-subject bold uppercase">时刻表</span>
37 37 </div>
38 38 <div class="actions">
39   - <!--<a ui-sref="ttInfoManage_test" class="btn btn-circle blue">-->
40   - <!--<i class="fa fa-plus"></i>-->
41   - <!--测试-->
42   - <!--</a>-->
43   - <a href="javascript:" class="btn blue" ng-click="ctrl.toTtInfoManageForm()">
44   - <i class="fa fa-plus"></i>
45   - 添加时刻表
46   - </a>
47   -
48 39 </div>
49 40 </div>
50 41  
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list_two.html
  View file @25b537c
... ... @@ -190,8 +190,8 @@
190 190 class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 动态生成 </a>
191 191 </td>
192 192 <td>
193   - <a ui-sref="ttInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
194   - <a ui-sref="ttInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
  193 + <a ui-sref="ttInfoManage_detail_sut({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
  194 + <a ui-sref="ttInfoManage_edit_sut({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
195 195  
196 196 </td>
197 197 </tr>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage_sut/index_two.html
  View file @25b537c
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>时刻表管理</h1>
  3 + <h1>时刻表诊断评估</h1>
4 4 </div>
5 5 </div>
6 6  
... ... @@ -14,7 +14,7 @@
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <span class="active">时刻表管理</span>
  17 + <span class="active">时刻表诊断评估</span>
18 18 </li>
19 19 </ul>
20 20  
... ... @@ -36,20 +36,11 @@
36 36 <span class="caption-subject bold uppercase">时刻表</span>
37 37 </div>
38 38 <div class="actions">
39   - <!--<a ui-sref="ttInfoManage_test" class="btn btn-circle blue">-->
40   - <!--<i class="fa fa-plus"></i>-->
41   - <!--测试-->
42   - <!--</a>-->
43   - <a href="javascript:" class="btn blue" ng-click="ctrl.toTtInfoManageForm()">
44   - <i class="fa fa-plus"></i>
45   - 添加时刻表
46   - </a>
47   -
48 39 </div>
49 40 </div>
50 41  
51 42 <div class="portlet-body">
52   - <div ui-view="ttInfoManage_list_two"></div>
  43 + <div ui-view="ttInfoManage_list_sut_two"></div>
53 44 </div>
54 45 </div>
55 46 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage_sut/list_two.html
  View file @25b537c
... ... @@ -5,14 +5,13 @@
5 5 <thead>
6 6 <tr role="row" class="heading">
7 7 <th style="width: 70px;">序号</th>
8   - <th style="width: 150px;">线路</th>
9   - <th style="width: 180px;">时刻表名称</th>
10   - <th style="width: 80px">上下行</th>
11   - <th style="width: 50px;">启用</th>
12   - <th style="width: 130px">操作日期</th>
  8 + <th style="width: 220px;">线路</th>
  9 + <th style="width: 320px;">时刻表名称</th>
  10 + <th style="width: 100px">上下行</th>
  11 + <th style="width: 80px;">启用</th>
  12 + <th style="width: 200px">操作日期</th>
13 13 <th style="width: 80px">状态</th>
14   - <th style="width: 60%">时刻表明细</th>
15   - <th style="width: 40%">操作</th>
  14 + <th>操作</th>
16 15 </tr>
17 16 <tr role="row" class="filter">
18 17 <td></td>
... ... @@ -45,7 +44,6 @@
45 44 <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废
46 45 </label>
47 46 </td>
48   - <td></td>
49 47 <td>
50 48 <div class="btn-group">
51 49 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
... ... @@ -187,13 +185,11 @@
187 185 <td>
188 186  
189 187 <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
190   - class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 动态生成 </a>
191   - </td>
192   - <td>
193   - <a ui-sref="ttInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
194   - <a ui-sref="ttInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
195   -
  188 + class="btn btn-info btn-sm" href="javascript:;"> 时刻表诊断评估 </a>
  189 +
  190 +
196 191 </td>
  192 +
197 193 </tr>
198 194 </tbody>
199 195 </table>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage_sut/module.js
  View file @25b537c
... ... @@ -213,10 +213,151 @@ angular.module(&#39;ScheduleApp&#39;).controller(
213 213  
214 214 // TODO：跳转到自动生成时刻表页面（jquery页面），之后会替换为Angularjs版本
215 215 self.toTtInfoDetailAuto = function(ttinfoid) {
216   - showPjax();
217   - $.pjax({url: 'pages/base/timesmodel/add.html?no=' + ttinfoid, container: pjaxContainer});
  216 +
  217 + var skbId = ttinfoid;
  218 + var argus = {
  219 + baseRes:"0",czarPark:"FFFFFF68",downInMileage:"0",
  220 + downInTimer:"0",downMileage:"3.5",downOutMileage:"0",
  221 + downOutTimer:"0",downStopTime:"10",downTravelTime:"7",
  222 + down_s:"26922_26928",earlyDownTime:"7",earlyEndTime:"08:30",
  223 + earlyStartTime:"06:31",earlyUpTime:"10",endStationEndTime:"22:30",
  224 + endStationFirstTime:"05:50",gfzjpcs:"7",istidc:1,kfsj:"",krl:"50",
  225 + lateDownTime:"7",lateEndTime:"18:30",lateStartTime:"16:31",
  226 + lateUpTime:"10",lb:"15",lineName:"801702_801702_1109路",
  227 + linePlayType:"0",maxstopTime:"20",mixstopTime:"8",qjDownTime:"",
  228 + qjUpTime:"",skbName:skbId,skbmc:"2016.4.6双时刻表",
  229 + startStationEndTime:"23:00",startStationFirstTime:"06:15",tcc_id:45,troughDownTime:"7",troughUpTime:"10",upInMileage:"0",
  230 + upInTimer:"10",upMileage:"3.5",upOutMileage:"0",upOutTimer:"10",upStopTime:"10",upTravelTime:"10",
  231 + up_s:"26912_26921",wgfafterpcs:"5",wgfpcs:"10",workeDinner:"20",workeLunch:"20",xlmc:"1109路",zgfbeforepcs:"3",zgfpcs:"10",}
  232 + // 获取时刻表明细.
  233 + $get('/tidc/all',{'ttinfo.id_eq':parseInt(argus.skbName)},function(data) {
  234 + var p = formatData(data.data,argus);
  235 + argus.istidc = 1;
  236 + var storage = window.localStorage;
  237 + storage.setItem("Gantt_AgursData",JSON.stringify(argus));
  238 + storage.setItem('isDoDate',JSON.stringify({'rsD':p.rsD,'rsLP':p.rsLp}));
  239 + loadPage('/pages/base/timesmodel/gantt_sut.html');
  240 + location.reload()
  241 + });
218 242 };
219   -
  243 + function formatData(d) {
  244 + // 定义返回值.
  245 + var resultD = new Array(),lpA = new Array(),rsLpA = new Array();
  246 + for(var i =0;i<d.length;i++) {
  247 + var obj = {};
  248 + var ddsj = getddsj(d[i].fcsj,d[i].bcsj);// 到达时间.
  249 + obj.bcType = d[i].bcType;// 班次类型
  250 + obj.bcs = d[i].bcs;// 班次数
  251 + obj.bcsj = d[i].bcsj;// 班次时间
  252 + obj.fcno = d[i].fcno;// 发车序号
  253 + obj.fcsj = d[i].fcsj;// 发车时间
  254 + obj.ARRIVALTIME = ddsj// 到达时间
  255 + obj.jhlc = d[i].jhlc;// 计划里程
  256 + obj.lp = d[i].lp==null ? null : d[i].lp.id;// 路牌id
  257 + obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;// 路牌类型
  258 + obj.parent = d[i].lp.lpNo;// 路牌名称
  259 + obj.lpName = d[i].lp.lpName;
  260 + obj.lpNo = d[i].lp.lpNo;// 路牌编码
  261 + obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;// 停车场id
  262 + obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;// 时刻表id
  263 + obj.xl = d[i].xl==null ? null : d[i].xl.id;// 线路id
  264 + obj.xlDir = dmToDh(d[i].xlDir);// 方向【0：relationshipGraph-up 上行；1：relationshipGraph-down 下行】
  265 + obj.qdz = d[i].qdz==null ? null : d[i].qdz.id;// 起点站id
  266 + obj.zdz = d[i].zdz==null ? null : d[i].zdz.id;//终点站id
  267 + obj.isfb = isfbTodm(d[i].isFB);// 是否分班【0:false；1:true】
  268 + obj.isSwitchXl = isSwitchXlTodm(d[i].isSwitchXl);// 是否切换线路【0:false；1:true】
  269 + obj.STOPTIME = gettzsj(d[i],d,ddsj);// 停站时间.
  270 + resultD.push(obj);
  271 + if(lpA.indexOf(obj.lpNo)<0) {
  272 + lpA.push(obj.lpNo);
  273 + rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.lpName,'lpType':obj.lpType});
  274 + }
  275 + }
  276 + // 返回渲染图形的数据格式.
  277 + return {'rsD':resultD,'rsLp':rsLpA};
  278 + }
  279 + function getddsj(tStr,bcsj) {
  280 + // 定义当前时间对象.
  281 + var date = new Date();
  282 + // 分割字符串.
  283 + var _str = tStr.split(':');
  284 + // 设值小时.
  285 + date.setHours(parseInt(_str[0]));
  286 + // 设值分钟.
  287 + date.setMinutes(parseInt(_str[1]) + bcsj);
  288 + // 返回到达时间字符串.
  289 + return getTimeStr(date);
  290 + }
  291 + function getTimeStr(t) {
  292 + // 定义返回值.
  293 + var _str = '';
  294 + // 判断是否为空.
  295 + if(t) {
  296 + // 重新赋值.
  297 + _str = ((t.getHours()<10? '0' + t.getHours() : t.getHours()) == '00' ? '24' :(t.getHours()<10? '0' + t.getHours() : t.getHours()))
  298 + +':'
  299 + +(t.getMinutes()<10? '0' + t.getMinutes() : t.getMinutes());
  300 + }
  301 + // 返回时间对象转时间点格式字符串.
  302 + return _str;
  303 + }
  304 + function dmToDh(t) {
  305 + // 定义返回值.
  306 + var reslStr = '';
  307 + // 上行.
  308 + if(t=='0')
  309 + reslStr = 'relationshipGraph-up';
  310 + // 下行.
  311 + else if(t=='1')
  312 + reslStr = 'relationshipGraph-down';
  313 + // 返回一个方向值转换.
  314 + return reslStr;
  315 + }
  316 + function isSwitchXlTodm(d) {
  317 + var rstr = 0;
  318 + if(d)
  319 + rstr = 1;
  320 + return rstr;
  321 + }
  322 + function isfbTodm(b) {
  323 + var rstr = 0;
  324 + if(b)
  325 + rstr = 1;
  326 + return rstr;
  327 + }
  328 + function gettzsj(o,d,sj) {
  329 + // 定义停站时间.
  330 + var tzsj = 0;
  331 + // 变量班次数组对象.
  332 + for(var i = 0 ;i<d.length;i++) {
  333 + // 判断是否为同一个路牌.
  334 + if(o.lp.lpNo == d[i].lp.lpNo && o.lp.id == d[i].lp.id) {
  335 + // 判断是否为当前班次的下一个班次.
  336 + if(d[i].fcno - o.fcno ==1){
  337 + // 计算停站时间.
  338 + tzsj = (strToTime(d[i].fcsj) -strToTime(sj)) / 60000;
  339 + continue;
  340 + }
  341 + }
  342 + }
  343 + // 返回停站时间.
  344 + return tzsj;
  345 + }
  346 + var strToTime = function(t) {
  347 + // 定义当前时间对象.
  348 + var d = new Date;
  349 + // 判断是否为空.
  350 + if(t) {
  351 + // 分割字符串.
  352 + var _str = t.split(':');
  353 + // 设值小时.
  354 + d.setHours(parseInt(_str[0]));
  355 + // 设值分钟.
  356 + d.setMinutes(parseInt(_str[1]));
  357 + }
  358 + // 返回一个时间点格式字符串转时间对象.
  359 + return d;
  360 + }
220 361 self.lineVersionTip = "载入中...";
221 362 var currentTTInfoForLineVersion;
222 363 self.getLineVersionTip = function(info) {
... ... @@ -258,6 +399,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
258 399 ]
259 400 );
260 401  
  402 +
  403 +
  404 +
261 405 angular.module('ScheduleApp').controller(
262 406 "TtInfoManageListOrderOptionModalInstanceCtrl",
263 407 [
... ...