Commit 27efa7254c43ad09358966c004641ca1dbdf0189
1 parent
7c05a1dd
智能时刻表模块修正
Showing
11 changed files
with
6 additions
and
208 deletions
src/main/resources/static/pages/base/timesmodel/add.html
| @@ -21,10 +21,10 @@ | @@ -21,10 +21,10 @@ | ||
| 21 | <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li> | 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 | <li> | 23 | <li> |
| 24 | - <a href="/#/ttInfoManage">时刻表管理</a> | 24 | + <a href="/#/ttInfoManage2">智能时刻表管理</a> |
| 25 | <i class="fa fa-circle"></i> | 25 | <i class="fa fa-circle"></i> |
| 26 | </li> | 26 | </li> |
| 27 | - <li><span class="active">时刻表明细制作建模</span></li> | 27 | + <li><span class="active">智能时刻表明细制作建模</span></li> |
| 28 | </ul> | 28 | </ul> |
| 29 | <!-- 线路信息导航栏组件 END --> | 29 | <!-- 线路信息导航栏组件 END --> |
| 30 | <div class="portlet light bordered" id="form-wizard-info"> | 30 | <div class="portlet light bordered" id="form-wizard-info"> |
src/main/resources/static/pages/base/timesmodel/add2.html deleted
100644 → 0
| 1 | -<style> | ||
| 2 | -.form-control:focus { | ||
| 3 | - border-color: #53ced9; | ||
| 4 | -} | ||
| 5 | -.tagsDiv { | ||
| 6 | - border: 1px solid #c2cad8; | ||
| 7 | - margin-left: 15px; | ||
| 8 | - padding: 4px 15px 4px 15px; | ||
| 9 | - width: 50%; | ||
| 10 | -} | ||
| 11 | -</style> | ||
| 12 | -<!-- 片段标题 START --> | ||
| 13 | -<div class="page-head"> | ||
| 14 | - <div class="page-title"> | ||
| 15 | - <h1>智能时刻表明细制作建模</h1> | ||
| 16 | - </div> | ||
| 17 | -</div> | ||
| 18 | -<!-- 片段标题 END --> | ||
| 19 | -<!-- 线路信息导航栏组件 START --> | ||
| 20 | -<ul class="page-breadcrumb breadcrumb"> | ||
| 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> | ||
| 23 | - <li> | ||
| 24 | - <a href="/#/ttInfoManage2">智能时刻表管理</a> | ||
| 25 | - <i class="fa fa-circle"></i> | ||
| 26 | - </li> | ||
| 27 | - <li><span class="active">智能时刻表明细制作建模</span></li> | ||
| 28 | -</ul> | ||
| 29 | -<!-- 线路信息导航栏组件 END --> | ||
| 30 | -<div class="portlet light bordered" id="form-wizard-info"> | ||
| 31 | - <div class="portlet-title"> | ||
| 32 | - <div class="caption"> | ||
| 33 | - <i class="icon-equalizer font-red-sunglo"></i> | ||
| 34 | - <span class="caption-subject font-red-sunglo bold uppercase">添加参数 | ||
| 35 | - <span class="step-title"> 1 - 4 </span> | ||
| 36 | - </span> | ||
| 37 | - </div> | ||
| 38 | - | ||
| 39 | - <div class="actions"> | ||
| 40 | - <div class="btn-group btn-group-devided" data-toggle="buttons"> | ||
| 41 | - <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a> | ||
| 42 | - </div> | ||
| 43 | - <div class="btn-group btn-group-devided" data-toggle="buttons"> | ||
| 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 | - </div> | ||
| 46 | - </div> | ||
| 47 | - </div> | ||
| 48 | - <div class="portlet-body form"> | ||
| 49 | - <!-- START FORM 表单容器 --> | ||
| 50 | - <form class="form-horizontal" id="submit_argus_form" action="/" method="POST" novalidate="novalidate"> | ||
| 51 | - <div class="form-wizard"> | ||
| 52 | - <div class="form-body"> | ||
| 53 | - <ul class="nav nav-pills nav-justified steps"> | ||
| 54 | - <li class="active"> | ||
| 55 | - <a href="#tab1" data-toggle="tab" class="step" aria-expanded="true"> | ||
| 56 | - <span class="number"> 1 </span> | ||
| 57 | - <span class="desc"> | ||
| 58 | - <i class="fa fa-check"></i> 选择时刻表 </span> | ||
| 59 | - </a> | ||
| 60 | - </li> | ||
| 61 | - <li> | ||
| 62 | - <a href="#tab2" data-toggle="tab" class="step"> | ||
| 63 | - <span class="number"> 2 </span> | ||
| 64 | - <span class="desc"> | ||
| 65 | - <i class="fa fa-check"></i> 选择参数方案 </span> | ||
| 66 | - </a> | ||
| 67 | - </li> | ||
| 68 | - <li> | ||
| 69 | - <a href="#tab3" data-toggle="tab" class="step active"> | ||
| 70 | - <span class="number"> 3 </span> | ||
| 71 | - <span class="desc"> | ||
| 72 | - <i class="fa fa-check"></i> 参数详情 </span> | ||
| 73 | - </a> | ||
| 74 | - </li> | ||
| 75 | - <li> | ||
| 76 | - <a href="#tab4" data-toggle="tab" class="step"> | ||
| 77 | - <span class="number"> 4 </span> | ||
| 78 | - <span class="desc"> | ||
| 79 | - <i class="fa fa-check"></i> 确认 </span> | ||
| 80 | - </a> | ||
| 81 | - </li> | ||
| 82 | - </ul> | ||
| 83 | - | ||
| 84 | - <!-- 进度条 --> | ||
| 85 | - <div id="bar" class="progress progress-striped" role="progressbar"> | ||
| 86 | - <div class="progress-bar progress-bar-success" style="width: 25%;"></div> | ||
| 87 | - </div> | ||
| 88 | - | ||
| 89 | - <div class="tab-content"> | ||
| 90 | - <div class="alert alert-danger display-hide"> | ||
| 91 | - <button class="close" data-close="alert"></button> | ||
| 92 | - 您的输入有误，请检查下面的输入项 | ||
| 93 | - </div> | ||
| 94 | - <div class="alert alert-success display-none"> | ||
| 95 | - <button class="close" data-dismiss="alert"></button> | ||
| 96 | - 验证成功! | ||
| 97 | - </div> | ||
| 98 | - <!-- 线路名称 --> | ||
| 99 | - <div class="tab-pane active" id="tab1"> | ||
| 100 | - <h3 class="block"> 选择时刻表 </h3> | ||
| 101 | - <!-- 表单分组组件 form-group START --> | ||
| 102 | - <div class="form-group"> | ||
| 103 | - <!-- 时刻表名称 (* 必填项) START --> | ||
| 104 | - <div class="col-md-6"> | ||
| 105 | - <label class="control-label col-md-5"> | ||
| 106 | - <span class="required"> * </span> 时刻表名称 ： | ||
| 107 | - </label> | ||
| 108 | - <div class="col-md-6"> | ||
| 109 | - <select name="skbName" class="form-control input-medium" id="skbNameSelect"></select> | ||
| 110 | - </div> | ||
| 111 | - </div> | ||
| 112 | - <!-- 时刻表名称 (* 必填项) END --> | ||
| 113 | - <!-- 线路名称 (* 必填项) START --> | ||
| 114 | - <div class="col-md-6"> | ||
| 115 | - <label class="control-label col-md-5"> | ||
| 116 | - <span class="required"> * </span> 线路名称 ： | ||
| 117 | - </label> | ||
| 118 | - <div class="col-md-6"> | ||
| 119 | - <select name="lineName" class="form-control input-medium" id="lineSelect"></select> | ||
| 120 | - </div> | ||
| 121 | - </div> | ||
| 122 | - <!-- 线路名称 (* 必填项) END --> | ||
| 123 | - | ||
| 124 | - </div> | ||
| 125 | - | ||
| 126 | - <div class="form-group"> | ||
| 127 | - <!-- 线路版本 --> | ||
| 128 | - <div class="col-md-6"> | ||
| 129 | - <label class="control-label col-md-5"> | ||
| 130 | - <span class="required"> * </span> 站点路由版本 ： | ||
| 131 | - </label> | ||
| 132 | - <div class="col-md-6"> | ||
| 133 | - <select name="lineVersion" class="form-control input-medium" id="lineVersionSelect"></select> | ||
| 134 | - </div> | ||
| 135 | - </div> | ||
| 136 | - </div> | ||
| 137 | - | ||
| 138 | - <!-- 表单分组组件 form-group END --> | ||
| 139 | - </div> | ||
| 140 | - <!-- 获取参数 --> | ||
| 141 | - <div class="tab-pane" id="tab2"> | ||
| 142 | - <h3 class="block"> 参数方案 </h3> | ||
| 143 | - <!-- 获取参数 --> | ||
| 144 | - <div class="form-group"> | ||
| 145 | - <label class="col-md-3 control-label"> <span class="required"> * </span> 选择参数方案：</label> | ||
| 146 | - <div class="col-md-9"> | ||
| 147 | - <div class="icheck-list"> | ||
| 148 | - <label > | ||
| 149 | - <input type="radio" class="icheck" name="baseRes" value=1> 班型/人次/车辆 | ||
| 150 | - </label> | ||
| 151 | - <label> | ||
| 152 | - <input type="radio" class="icheck" name="baseRes" value=2 > 发车间隔分析（旧：一步调整） | ||
| 153 | - </label> | ||
| 154 | - <label> | ||
| 155 | - <input type="radio" class="icheck" name="baseRes" value=3 checked> 发车间隔分析（新：增量调整-单向进出场） | ||
| 156 | - </label> | ||
| 157 | - <label> | ||
| 158 | - <input type="radio" class="icheck" name="baseRes" value=0> 客流大数据分析 | ||
| 159 | - </label> | ||
| 160 | - </div> | ||
| 161 | - </div> | ||
| 162 | - </div> | ||
| 163 | - <!-- 客容总量 --> | ||
| 164 | - <!-- <div class="form-group" id="krlGroup"> | ||
| 165 | - <label class="col-md-3 control-label"><span class="required"> * </span>客容总量 ：</label> | ||
| 166 | - <div class="col-md-9"> | ||
| 167 | - <input type="text" class="form-control input-medium" name="krl" id="krlInput" placeholder="客容总量"> | ||
| 168 | - </div> | ||
| 169 | - </div> --> | ||
| 170 | - </div> | ||
| 171 | - <!-- 参数详情 --> | ||
| 172 | - <div class="tab-pane" id="tab3"> | ||
| 173 | - <h3 class="block"> 参数详情 </h3> | ||
| 174 | - </div> | ||
| 175 | - <!-- 确定提交资料信息 --> | ||
| 176 | - <div class="tab-pane" id="tab4"> | ||
| 177 | - <h3 class="block"> 确认您提交的参数信息 </h3> | ||
| 178 | - </div> | ||
| 179 | - </div> | ||
| 180 | - </div> | ||
| 181 | - <div class="form-actions"> | ||
| 182 | - <div class="row"> | ||
| 183 | - <div class="col-md-offset-5 col-md-9"> | ||
| 184 | - <a href="javascript:;" class="btn default button-previous disabled" style="display: none;"> | ||
| 185 | - <i class="fa fa-angle-left"></i> 返回 </a> | ||
| 186 | - <a href="javascript:;" class="btn btn-outline green button-next"> 下一步 | ||
| 187 | - <i class="fa fa-angle-right"></i> | ||
| 188 | - </a> | ||
| 189 | - <a href="javascript:;" class="btn green button-submit" style="display: none;"> 生成时刻模型 | ||
| 190 | - <i class="fa fa-check"></i> | ||
| 191 | - </a> | ||
| 192 | - </div> | ||
| 193 | - </div> | ||
| 194 | - </div> | ||
| 195 | - </div> | ||
| 196 | - </form> | ||
| 197 | - <!-- END FORM--> | ||
| 198 | - </div> | ||
| 199 | -</div> | ||
| 200 | -<script src="/pages/base/timesmodel/js/add-form-wizard.js"></script> | ||
| 201 | -<script src="/pages/base/timesmodel/js/add-form-reload.js"></script> | ||
| 202 | -<script src="/pages/base/timesmodel/js/tagsinput.js"></script> | ||
| 203 | \ No newline at end of file | 0 | \ No newline at end of file |
src/main/resources/static/pages/base/timesmodel/gantt.html
| @@ -14,10 +14,10 @@ | @@ -14,10 +14,10 @@ | ||
| 14 | <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li> | 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 | <li> | 16 | <li> |
| 17 | - <a href="/#/ttInfoManage">时刻表管理</a> | 17 | + <a href="/#/ttInfoManage2">智能时刻表管理</a> |
| 18 | <i class="fa fa-circle"></i> | 18 | <i class="fa fa-circle"></i> |
| 19 | </li> | 19 | </li> |
| 20 | - <li><span class="active">时刻表明细模型</span></li> | 20 | + <li><span class="active">智能时刻表明细模型</span></li> |
| 21 | </ul> | 21 | </ul> |
| 22 | <!-- 线路信息导航栏组件 END --> | 22 | <!-- 线路信息导航栏组件 END --> |
| 23 | 23 |
src/main/resources/static/pages/base/timesmodel/js/gantt.js
| @@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
| 124 | } | 124 | } |
| 125 | // 按照发车序号顺序排序. | 125 | // 按照发车序号顺序排序. |
| 126 | lpbc_.sort(function(a,b){return a.fcno-b.fcno}); | 126 | lpbc_.sort(function(a,b){return a.fcno-b.fcno}); |
| 127 | - resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopAraay[0].lbsj,map)); | 127 | + resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopArray[0].lbsj,map)); |
| 128 | } | 128 | } |
| 129 | data = {'json':rsjar,'bxrcgs':null}; | 129 | data = {'json':rsjar,'bxrcgs':null}; |
| 130 | } | 130 | } |
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/detail.html renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/edit.html renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/edit.html
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/form.html renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/form.html
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/index.html renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/index.html
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/list.html renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/list.html
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/module.js renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/module.js
| @@ -187,7 +187,7 @@ angular.module('ScheduleApp').controller( | @@ -187,7 +187,7 @@ angular.module('ScheduleApp').controller( | ||
| 187 | // TODO：跳转到自动生成时刻表页面（jquery页面），之后会替换为Angularjs版本 | 187 | // TODO：跳转到自动生成时刻表页面（jquery页面），之后会替换为Angularjs版本 |
| 188 | self.toTtInfoDetailAuto = function(ttinfoid) { | 188 | self.toTtInfoDetailAuto = function(ttinfoid) { |
| 189 | showPjax(); | 189 | showPjax(); |
| 190 | - $.pjax({url: 'pages/base/timesmodel/add2.html?no=' + ttinfoid, container: pjaxContainer}); | 190 | + $.pjax({url: 'pages/base/timesmodel/add.html?no=' + ttinfoid, container: pjaxContainer}); |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | self.lineVersionTip = "载入中..."; | 193 | self.lineVersionTip = "载入中..."; |
src/main/resources/static/pages/scheduleApp/module/core/ttinfoManage2/route.js renamed to src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/route.js