潘钊 / bsth_control · Commits

Commit 23890d887e849fe1e7ba1be68ed115443a7bf7ea

Authored by 徐烜
2 parents 6d8b2f5a fce30c31

PSM-12

Inline Side-by-side
Showing 26 changed files with 1128 additions and 1113 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
  View file @23890d8
... ... @@ -50,8 +50,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
50 50  
51 51 @Override
52 52 public void run(String... arg0) throws Exception {
53   - logger.info("ArrivalData_GPS,50,10 @11-11");
54   - //Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 50, 10, TimeUnit.SECONDS);
  53 + logger.info("ArrivalData_GPS,100,10 @11-10");
  54 + Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 100, 10, TimeUnit.SECONDS);
55 55 }
56 56  
57 57 @Component
... ...
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
  View file @23890d8
... ... @@ -68,7 +68,7 @@ public class GpsRealData implements CommandLineRunner{
68 68 @Override
69 69 public void run(String... arg0) throws Exception {
70 70 logger.info("gpsDataLoader,20,6");
71   - //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
  71 + Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
72 72 }
73 73  
74 74 public GpsEntity add(GpsEntity gps) {
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @23890d8
... ... @@ -130,11 +130,11 @@ public class DayOfSchedule implements CommandLineRunner {
130 130 //翻班线程
131 131 Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
132 132 //入库
133   - //Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
  133 + Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
134 134 //首班出场指令补发器
135   - //Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
  135 + Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
136 136 //班次误点扫描
137   - //Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
  137 + Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
138 138  
139 139 //每天凌晨2点20提交数据到运管处
140 140 long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
... ... @@ -142,7 +142,7 @@ public class DayOfSchedule implements CommandLineRunner {
142 142 diff+=(1000*60*60*24);
143 143  
144 144 logger.info(diff/1000/60 + "分钟之后提交到运管处");
145   - //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  145 + Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
146 146 }
147 147  
148 148 public Map<String, String> getCurrSchDate() {
... ...
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
  View file @23890d8
... ... @@ -240,6 +240,11 @@ public class SchedulePlanInfo {
240 240 this.jhlc = ttInfoDetail.getJhlc(); // 计划里程
241 241 this.bcsj = ttInfoDetail.getBcsj(); // 班次时间
242 242  
  243 + // 使用的时刻表id
  244 + this.ttInfo = ttInfoDetail.getTtinfo().getId();
  245 + // 使用的时刻表名字
  246 + this.ttInfoName = ttInfoDetail.getTtinfo().getName();
  247 +
243 248 }
244 249  
245 250  
... ...
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
  View file @23890d8
... ... @@ -38,6 +38,9 @@ public class PredicatesBuilder {
38 38 } else if (String.class.isAssignableFrom(leftType) &&
39 39 (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String == String/Number
40 40 return cb.equal(expression, object);
  41 + } else if (Boolean.class.isAssignableFrom(leftType) &&
  42 + Boolean.class.isAssignableFrom(rightType)) {
  43 + return cb.equal(expression, object);
41 44 } else if (Date.class.isAssignableFrom(leftType) &&
42 45 Date.class.isAssignableFrom(rightType)) { // Date == Date
43 46 return cb.equal(expression, object);
... ...
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
  View file @23890d8
... ... @@ -64,7 +64,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
64 64 // 创建session，内部配置的是stateful
65 65 KieSession session = kieBase.newKieSession();
66 66 // 设置gloable对象，在drl中通过别名使用
67   - session.setGlobal("scheduleResult", scheduleResults_output);
  67 +// session.setGlobal("scheduleResult", scheduleResults_output);
  68 +
68 69 // 载入数据
69 70 session.insert(scheduleCalcuParam_input);
70 71 for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
... ...
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
  View file @23890d8
... ... @@ -21,6 +21,7 @@ import org.slf4j.Logger;
21 21 import org.slf4j.LoggerFactory;
22 22 import org.springframework.beans.factory.annotation.Autowired;
23 23 import org.springframework.stereotype.Service;
  24 +import org.springframework.util.CollectionUtils;
24 25  
25 26 import java.util.*;
26 27  
... ... @@ -50,8 +51,14 @@ public class IStrategyImpl implements IStrategy {
50 51  
51 52 @Override
52 53 public Line getLine(Integer xlId) {
53   - Line xl = lineService.findById(xlId); // 查找线路具体信息
54   - return xl;
  54 + Map<String, Object> param = new HashMap<>();
  55 + param.put("id_eq", xlId);
  56 + param.put("destroy_eq", 0); // 未撤销
  57 + List<Line> lines = (List<Line>) lineService.list(param);
  58 + if (CollectionUtils.isEmpty(lines)) {
  59 + throw new RuntimeException("线路找不到，可能已经撤销！");
  60 + }
  61 + return lines.get(0);
55 62 }
56 63  
57 64 @Override
... ...
src/main/resources/application-dev.properties
  View file @23890d8
... ... @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= false
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  11 +spring.datasource.url= jdbc:mysql://192.168.168.201/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
13 13 spring.datasource.password= 123456
14 14 #DATASOURCE
... ...
src/main/resources/application-prod.properties
  View file @23890d8
... ... @@ -6,11 +6,11 @@ spring.jpa.hibernate.ddl-auto= update
6 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 7 #DATABASE
8 8 spring.jpa.database= MYSQL
9   -spring.jpa.show-sql= true
  9 +spring.jpa.show-sql= false
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  11 +spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
13   -spring.datasource.password= root2jsp
  13 +spring.datasource.password= root@JSP2jsp
14 14 #DATASOURCE
15 15 spring.datasource.max-active=100
16 16 spring.datasource.max-idle=8
... ... @@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
26 26 ##
27 27 #222.66.0.204:5555
28 28 ##\u5B9E\u65F6gps
29   -http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
  29 +http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
30 30 ##\u6D88\u606F\u4E0B\u53D1
31   -http.send.directive = http://192.168.168.171:8080/transport_server/message/
32 31 \ No newline at end of file
  32 +http.send.directive = http://192.168.40.82:8080/transport_server/message/
33 33 \ No newline at end of file
... ...
src/main/resources/datatools/config-prod.properties
  View file @23890d8
... ... @@ -5,13 +5,13 @@ datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7 7 #数据库ip地址
8   -datatools.kvars_dbip=192.168.168.171
  8 +datatools.kvars_dbip=192.168.40.100
9 9 #数据库用户名
10 10 datatools.kvars_dbuname=root
11 11 #数据库密码
12   -datatools.kvars_dbpwd=root2jsp
  12 +datatools.kvars_dbpwd=root@JSP2jsp
13 13 #数据库库名
14   -datatools.kvars_dbdname=control
  14 +datatools.kvars_dbdname=qp_control
15 15  
16 16 # 3、上传数据配置信息
17 17 # 上传文件目录配置（根据不同的环境需要修正）
... ...
src/main/resources/ms-jdbc.properties
  View file @23890d8
1 1 ms.mysql.driver= com.mysql.jdbc.Driver
2   -ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
  2 +ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
3 3 ms.mysql.username= root
4 4 ms.mysql.password= 123456
5 5  
6 6 #ms.mysql.driver= com.mysql.jdbc.Driver
7   -#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
  7 +#ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
8 8 #ms.mysql.username= root
9   -#ms.mysql.password= root2jsp
  9 +#ms.mysql.password= 123456
... ...
src/main/resources/static/index.html
  View file @23890d8
... ... @@ -145,7 +145,7 @@ tr.row-active td {
145 145 <div class="page-header-inner ">
146 146 <!-- LOGO -->
147 147 <div class="page-logo">
148   - <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
  148 + <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
149 149 <div class="menu-toggler sidebar-toggler">
150 150 </div>
151 151 </div>
... ...
src/main/resources/static/login.html
  View file @23890d8
... ... @@ -180,7 +180,7 @@ h3.logo-text{
180 180 <div class="wrapper ng-scope">
181 181 <div id="loginPanel" class="dialog dialog-shadow">
182 182 <br>
183   - <h3 class="logo-text">闵行公交调度系统 </h3>
  183 + <h3 class="logo-text">青浦公交调度系统 </h3>
184 184 <hr>
185 185 <form style="padding: 0px 35px;">
186 186 <div class="form-group" style="margin-bottom: 0">
... ...
src/main/resources/static/pages/control/line/index.html
  View file @23890d8
... ... @@ -18,7 +18,7 @@
18 18 <div class="portlet-title banner" >
19 19 <div class="caption col_hide_1280" style="color: #FFF;">
20 20 <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
21   - class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span>
  21 + class="caption-subject bold" style="font-size: 24px;">青浦公交线路调度系统</span>
22 22 </div>
23 23 <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
24 24 <span class="top_username"></span> <span class="operation_mode_text animated" ></span>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @23890d8
... ... @@ -76,19 +76,18 @@
76 76 <div class="form-group has-success has-feedback">
77 77 <label class="col-md-2 control-label">驾驶员*：</label>
78 78 <div class="col-md-3">
79   - <sa-Select3 model="ctrl.employeeConfigForSave"
80   - name="jsy"
81   - placeholder="请输拼音..."
82   - dcvalue="{{ctrl.employeeConfigForSave.jsy.id}}"
  79 + <sa-Select5 name="jsy"
  80 + model="ctrl.employeeConfigForSave"
  81 + cmaps="{'jsy.id' : 'id'}"
83 82 dcname="jsy.id"
84 83 icname="id"
85   - icnames="personnelName"
86   - datatype="ry"
87   - dataassociate="true"
88   - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
89   - mlp="true"
  84 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  85 + iterobjname="item"
  86 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  87 + searchph="请输拼音..."
  88 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
90 89 required >
91   - </sa-Select3>
  90 + </sa-Select5>
92 91 </div>
93 92 <!-- 隐藏块，显示验证信息 -->
94 93 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
... ... @@ -99,18 +98,18 @@
99 98 <div class="form-group">
100 99 <label class="col-md-2 control-label">售票员：</label>
101 100 <div class="col-md-3">
102   - <sa-Select3 model="ctrl.employeeConfigForSave"
103   - name="spy"
104   - placeholder="请输拼音..."
105   - dcvalue="{{ctrl.employeeConfigForSave.spy.id}}"
  101 + <sa-Select5 name="spy"
  102 + model="ctrl.employeeConfigForSave"
  103 + cmaps="{'spy.id' : 'id'}"
106 104 dcname="spy.id"
107 105 icname="id"
108   - icnames="personnelName"
109   - datatype="ry"
110   - dataassociate="true"
111   - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
112   - mlp="true" >
113   - </sa-Select3>
  106 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  107 + iterobjname="item"
  108 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  109 + searchph="请输拼音..."
  110 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
  111 + >
  112 + </sa-Select5>
114 113 </div>
115 114 </div>
116 115  
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @23890d8
... ... @@ -78,19 +78,18 @@
78 78 <div class="form-group has-success has-feedback">
79 79 <label class="col-md-2 control-label">驾驶员*：</label>
80 80 <div class="col-md-3">
81   - <sa-Select3 model="ctrl.employeeConfigForSave"
82   - name="jsy"
83   - placeholder="请输拼音..."
84   - dcvalue="{{ctrl.employeeConfigForSave.jsy.id}}"
  81 + <sa-Select5 name="jsy"
  82 + model="ctrl.employeeConfigForSave"
  83 + cmaps="{'jsy.id' : 'id'}"
85 84 dcname="jsy.id"
86 85 icname="id"
87   - icnames="personnelName"
88   - datatype="ry"
89   - dataassociate="true"
90   - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
91   - mlp="true"
  86 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  87 + iterobjname="item"
  88 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  89 + searchph="请输拼音..."
  90 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
92 91 required >
93   - </sa-Select3>
  92 + </sa-Select5>
94 93 </div>
95 94 <!-- 隐藏块，显示验证信息 -->
96 95 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
... ... @@ -101,18 +100,18 @@
101 100 <div class="form-group">
102 101 <label class="col-md-2 control-label">售票员：</label>
103 102 <div class="col-md-3">
104   - <sa-Select3 model="ctrl.employeeConfigForSave"
105   - name="spy"
106   - placeholder="请输拼音..."
107   - dcvalue="{{ctrl.employeeConfigForSave.spy.id}}"
  103 + <sa-Select5 name="spy"
  104 + model="ctrl.employeeConfigForSave"
  105 + cmaps="{'spy.id' : 'id'}"
108 106 dcname="spy.id"
109 107 icname="id"
110   - icnames="personnelName"
111   - datatype="ry"
112   - dataassociate="true"
113   - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
114   - mlp="true" >
115   - </sa-Select3>
  108 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  109 + iterobjname="item"
  110 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  111 + searchph="请输拼音..."
  112 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
  113 + >
  114 + </sa-Select5>
116 115 </div>
117 116 </div>
118 117  
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/edit-detail.html
  View file @23890d8
1   -<div ng-controller="TimeTableDetailManageFormCtrl_old as ctrl">
2   - <div class="page-head">
3   - <div class="page-title">
4   - <h1>修改班次信息2</h1>
5   - </div>
6   - </div>
7   -
8   - <ul class="page-breadcrumb breadcrumb">
9   - <li>
10   - <a href="/pages/home.html" data-pjax>首页</a>
11   - <i class="fa fa-circle"></i>
12   - </li>
13   - <li>
14   - <span class="active">运营计划管理</span>
15   - <i class="fa fa-circle"></i>
16   - </li>
17   - <li>
18   - <a ui-sref="ttInfoManage">时刻表管理</a>
19   - <i class="fa fa-circle"></i>
20   - </li>
21   - <li>
22   - <a ui-sref="ttInfoDetailManage_edit({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})"><span ng-bind="ctrl.title1"></span></a>
23   - <i class="fa fa-circle"></i>
24   - </li>
25   - <li>
26   - <span class="active">修改班次信息</span>
27   - </li>
28   - </ul>
29   -
30   - <div class="portlet light bordered">
31   - <div class="portlet-title">
32   - <div class="caption">
33   - <i class="icon-equalizer font-red-sunglo"></i> <span
34   - class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title2"></span>
35   - </div>
36   - </div>
37   -
38   - <div class="portlet-body form">
39   - <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
40   - <div class="form-body">
41   - <div class="form-group has-success has-feedback">
42   - <label class="col-md-3 control-label">线路*：</label>
43   - <div class="col-md-7">
44   - <input type="text" class="form-control"
45   - ng-value="ctrl.TimeTableDetailForSave.xl.name"
46   - readonly/>
47   - </div>
48   -
49   - </div>
50   - <div class="form-group has-success has-feedback">
51   - <label class="col-md-3 control-label">时刻表名称*：</label>
52   - <div class="col-md-7">
53   - <input type="text" class="form-control"
54   - ng-value="ctrl.TimeTableDetailForSave.ttinfo.name"
55   - readonly/>
56   - </div>
57   - </div>
58   - <div class="form-group has-success has-feedback">
59   - <label class="col-md-3 control-label">路牌*：</label>
60   - <div class="col-md-7">
61   - <input type="text" class="form-control"
62   - ng-value="ctrl.TimeTableDetailForSave.lp.lpName"
63   - readonly/>
64   - </div>
65   -
66   - </div>
67   - <div class="form-group has-success has-feedback">
68   - <label class="col-md-3 control-label">发车顺序号*：</label>
69   - <div class="col-md-7">
70   - <input type="text" class="form-control"
71   - ng-value="ctrl.TimeTableDetailForSave.fcno"
72   - readonly/>
73   - </div>
74   -
75   - </div>
76   - <div class="form-group has-success has-feedback">
77   - <label class="col-md-3 control-label">方向*：</label>
78   - <div class="col-md-7">
79   - <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir" required></sa-Radiogroup>
80   - </div>
81   - <!-- 隐藏块，显示验证信息 -->
82   - <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
83   - 请选择线路上下行
84   - </div>
85   -
86   - </div>
87   - <div class="form-group">
88   - <label class="col-md-3 control-label">起点站：</label>
89   - <div class="col-md-7">
90   - <sa-Select3 model="ctrl.TimeTableDetailForSave"
91   - name="qdz"
92   - placeholder="请输拼音..."
93   - dcvalue="{{ctrl.TimeTableDetailForSave.qdz.id}}"
94   - dcname="qdz.id"
95   - icname="stationid"
96   - icnames="stationname"
97   - datatype="zd"
98   - dataassociate="true"
99   - dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
100   - mlp="true"
101   - >
102   - </sa-Select3>
103   - </div>
104   - </div>
105   - <div class="form-group">
106   - <label class="col-md-3 control-label">终点站：</label>
107   - <div class="col-md-7">
108   - <sa-Select3 model="ctrl.TimeTableDetailForSave"
109   - name="zdz"
110   - placeholder="请输拼音..."
111   - dcvalue="{{ctrl.TimeTableDetailForSave.zdz.id}}"
112   - dcname="zdz.id"
113   - icname="stationid"
114   - icnames="stationname"
115   - datatype="zd"
116   - dataassociate="true"
117   - dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
118   - mlp="true"
119   - >
120   - </sa-Select3>
121   - </div>
122   - </div>
123   - <div class="form-group">
124   - <label class="col-md-3 control-label">停车场：</label>
125   - <div class="col-md-7">
126   - <sa-Select3 model="ctrl.TimeTableDetailForSave"
127   - name="tcc"
128   - placeholder="请输拼音..."
129   - dcvalue="{{ctrl.TimeTableDetailForSave.tcc.id}}"
130   - dcname="tcc.id"
131   - icname="id"
132   - icnames="parkName"
133   - datatype="tcc"
134   - mlp="true"
135   - >
136   - </sa-Select3>
137   - </div>
138   - </div>
139   -
140   - <div class="form-group has-success has-feedback">
141   - <label class="col-md-3 control-label">发车时间*：</label>
142   - <div class="col-md-7">
143   - <input type="text" class="form-control"
144   - ng-model="ctrl.TimeTableDetailForSave.fcsj"
145   - />
146   - </div>
147   -
148   - </div>
149   - <div class="form-group">
150   - <label class="col-md-3 control-label">对应班次数：</label>
151   - <div class="col-md-7">
152   - <input type="text" class="form-control"
153   - ng-value="ctrl.TimeTableDetailForSave.bcs"
154   - readonly/>
155   - </div>
156   -
157   - </div>
158   - <div class="form-group">
159   - <label class="col-md-3 control-label">计划里程：</label>
160   - <div class="col-md-7">
161   - <input type="text" class="form-control"
162   - ng-model="ctrl.TimeTableDetailForSave.jhlc"
163   - />
164   - </div>
165   -
166   - </div>
167   - <div class="form-group">
168   - <label class="col-md-3 control-label">班次历时：</label>
169   - <div class="col-md-7">
170   - <input type="text" class="form-control"
171   - ng-model="ctrl.TimeTableDetailForSave.bcsj"
172   - />
173   - </div>
174   -
175   - </div>
176   - <div class="form-group has-success has-feedback">
177   - <label class="col-md-3 control-label">班次类型*：</label>
178   - <div class="col-md-7">
179   - <sa-Select3 model="ctrl.TimeTableDetailForSave"
180   - name="bcType"
181   - placeholder="请选择班次类型..."
182   - dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}"
183   - dcname="bcType"
184   - icname="code"
185   - icnames="name"
186   - datatype="ScheduleType"
187   - required >
188   - </sa-Select3>
189   - </div>
190   -
191   - </div>
192   - <div class="form-group">
193   - <label class="col-md-3 control-label">备注：</label>
194   - <div class="col-md-7">
195   - <textarea class="form-control"
196   - ng-model="ctrl.TimeTableDetailForSave.remark"
197   - />
198   - </div>
199   -
200   - </div>
201   -
202   - </div>
203   -
204   - <div class="form-actions">
205   - <div class="row">
206   - <div class="col-md-offset-3 col-md-4">
207   - <button type="submit" class="btn green"
208   - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
209   - <a type="button" class="btn default"
210   - ui-sref="ttInfoDetailManage_edit({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})" ><i class="fa fa-times"></i> 取消</a>
211   - </div>
212   - </div>
213   - </div>
214   - </form>
215   -
216   - </div>
217   - </div>
218   -
219   -
220   -
221   -
222   -</div>
  1 +<div ng-controller="TimeTableDetailManageFormCtrl_old as ctrl">
  2 + <div class="page-head">
  3 + <div class="page-title">
  4 + <h1>修改班次信息</h1>
  5 + </div>
  6 + </div>
  7 +
  8 + <ul class="page-breadcrumb breadcrumb">
  9 + <li>
  10 + <a href="/pages/home.html" data-pjax>首页</a>
  11 + <i class="fa fa-circle"></i>
  12 + </li>
  13 + <li>
  14 + <span class="active">运营计划管理</span>
  15 + <i class="fa fa-circle"></i>
  16 + </li>
  17 + <li>
  18 + <a ui-sref="ttInfoManage">时刻表管理</a>
  19 + <i class="fa fa-circle"></i>
  20 + </li>
  21 + <li>
  22 + <a ui-sref="ttInfoDetailManage_edit({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})"><span ng-bind="ctrl.title1"></span></a>
  23 + <i class="fa fa-circle"></i>
  24 + </li>
  25 + <li>
  26 + <span class="active">修改班次信息</span>
  27 + </li>
  28 + </ul>
  29 +
  30 + <div class="portlet light bordered">
  31 + <div class="portlet-title">
  32 + <div class="caption">
  33 + <i class="icon-equalizer font-red-sunglo"></i> <span
  34 + class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title2"></span>
  35 + </div>
  36 + </div>
  37 +
  38 + <div class="portlet-body form">
  39 + <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
  40 + <div class="form-body">
  41 + <div class="form-group has-success has-feedback">
  42 + <label class="col-md-3 control-label">线路*：</label>
  43 + <div class="col-md-7">
  44 + <input type="text" class="form-control"
  45 + ng-value="ctrl.TimeTableDetailForSave.xl.name"
  46 + readonly/>
  47 + </div>
  48 +
  49 + </div>
  50 + <div class="form-group has-success has-feedback">
  51 + <label class="col-md-3 control-label">时刻表名称*：</label>
  52 + <div class="col-md-7">
  53 + <input type="text" class="form-control"
  54 + ng-value="ctrl.TimeTableDetailForSave.ttinfo.name"
  55 + readonly/>
  56 + </div>
  57 + </div>
  58 + <div class="form-group has-success has-feedback">
  59 + <label class="col-md-3 control-label">路牌*：</label>
  60 + <div class="col-md-7">
  61 + <input type="text" class="form-control"
  62 + ng-value="ctrl.TimeTableDetailForSave.lp.lpName"
  63 + readonly/>
  64 + </div>
  65 +
  66 + </div>
  67 + <div class="form-group has-success has-feedback">
  68 + <label class="col-md-3 control-label">发车顺序号*：</label>
  69 + <div class="col-md-7">
  70 + <input type="text" class="form-control"
  71 + ng-value="ctrl.TimeTableDetailForSave.fcno"
  72 + readonly/>
  73 + </div>
  74 +
  75 + </div>
  76 + <div class="form-group has-success has-feedback">
  77 + <label class="col-md-3 control-label">方向*：</label>
  78 + <div class="col-md-7">
  79 + <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir" required></sa-Radiogroup>
  80 + </div>
  81 + <!-- 隐藏块，显示验证信息 -->
  82 + <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
  83 + 请选择线路上下行
  84 + </div>
  85 +
  86 + </div>
  87 + <div class="form-group">
  88 + <label class="col-md-3 control-label">起点站：</label>
  89 + <div class="col-md-7">
  90 + <sa-Select3 model="ctrl.TimeTableDetailForSave"
  91 + name="qdz"
  92 + placeholder="请输拼音..."
  93 + dcvalue="{{ctrl.TimeTableDetailForSave.qdz.id}}"
  94 + dcname="qdz.id"
  95 + icname="stationid"
  96 + icnames="stationname"
  97 + datatype="zd"
  98 + dataassociate="true"
  99 + dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
  100 + mlp="true"
  101 + >
  102 + </sa-Select3>
  103 + </div>
  104 + </div>
  105 + <div class="form-group">
  106 + <label class="col-md-3 control-label">终点站：</label>
  107 + <div class="col-md-7">
  108 + <sa-Select3 model="ctrl.TimeTableDetailForSave"
  109 + name="zdz"
  110 + placeholder="请输拼音..."
  111 + dcvalue="{{ctrl.TimeTableDetailForSave.zdz.id}}"
  112 + dcname="zdz.id"
  113 + icname="stationid"
  114 + icnames="stationname"
  115 + datatype="zd"
  116 + dataassociate="true"
  117 + dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
  118 + mlp="true"
  119 + >
  120 + </sa-Select3>
  121 + </div>
  122 + </div>
  123 + <div class="form-group">
  124 + <label class="col-md-3 control-label">停车场：</label>
  125 + <div class="col-md-7">
  126 + <sa-Select3 model="ctrl.TimeTableDetailForSave"
  127 + name="tcc"
  128 + placeholder="请输拼音..."
  129 + dcvalue="{{ctrl.TimeTableDetailForSave.tcc.id}}"
  130 + dcname="tcc.id"
  131 + icname="id"
  132 + icnames="parkName"
  133 + datatype="tcc"
  134 + mlp="true"
  135 + >
  136 + </sa-Select3>
  137 + </div>
  138 + </div>
  139 +
  140 + <div class="form-group has-success has-feedback">
  141 + <label class="col-md-3 control-label">发车时间*：</label>
  142 + <div class="col-md-7">
  143 + <input type="text" class="form-control"
  144 + ng-model="ctrl.TimeTableDetailForSave.fcsj"
  145 + />
  146 + </div>
  147 +
  148 + </div>
  149 + <div class="form-group">
  150 + <label class="col-md-3 control-label">对应班次数：</label>
  151 + <div class="col-md-7">
  152 + <input type="text" class="form-control"
  153 + ng-value="ctrl.TimeTableDetailForSave.bcs"
  154 + readonly/>
  155 + </div>
  156 +
  157 + </div>
  158 + <div class="form-group">
  159 + <label class="col-md-3 control-label">计划里程：</label>
  160 + <div class="col-md-7">
  161 + <input type="text" class="form-control"
  162 + ng-model="ctrl.TimeTableDetailForSave.jhlc"
  163 + />
  164 + </div>
  165 +
  166 + </div>
  167 + <div class="form-group">
  168 + <label class="col-md-3 control-label">班次历时：</label>
  169 + <div class="col-md-7">
  170 + <input type="text" class="form-control"
  171 + ng-model="ctrl.TimeTableDetailForSave.bcsj"
  172 + />
  173 + </div>
  174 +
  175 + </div>
  176 + <div class="form-group has-success has-feedback">
  177 + <label class="col-md-3 control-label">班次类型*：</label>
  178 + <div class="col-md-7">
  179 + <sa-Select3 model="ctrl.TimeTableDetailForSave"
  180 + name="bcType"
  181 + placeholder="请选择班次类型..."
  182 + dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}"
  183 + dcname="bcType"
  184 + icname="code"
  185 + icnames="name"
  186 + datatype="ScheduleType"
  187 + required >
  188 + </sa-Select3>
  189 + </div>
  190 +
  191 + </div>
  192 + <div class="form-group">
  193 + <label class="col-md-3 control-label">备注：</label>
  194 + <div class="col-md-7">
  195 + <textarea class="form-control"
  196 + ng-model="ctrl.TimeTableDetailForSave.remark"
  197 + />
  198 + </div>
  199 +
  200 + </div>
  201 +
  202 + </div>
  203 +
  204 + <div class="form-actions">
  205 + <div class="row">
  206 + <div class="col-md-offset-3 col-md-4">
  207 + <button type="submit" class="btn green"
  208 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  209 + <a type="button" class="btn default"
  210 + ui-sref="ttInfoDetailManage_edit({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})" ><i class="fa fa-times"></i> 取消</a>
  211 + </div>
  212 + </div>
  213 + </div>
  214 + </form>
  215 +
  216 + </div>
  217 + </div>
  218 +
  219 +
  220 +
  221 +
  222 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/edit.html
  View file @23890d8
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>时刻表管理2</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   - <a ui-sref="ttInfoManage">时刻表管理</a>
18   - <i class="fa fa-circle"></i>
19   - </li>
20   - <li>
21   - <span class="active">编辑时刻表明细信息</span>
22   - </li>
23   -</ul>
24   -
25   -<!--&lt;!&ndash; loading widget &ndash;&gt;-->
26   -<!--<div id="loadingWidget" class="flyover mask" loading-widget>-->
27   -<!--<div class="alert alert-info">-->
28   -<!--<strong>载入中......</strong>-->
29   -<!--</div>-->
30   -<!--</div>-->
31   -
32   -<div class="row" id="timeTableDetail" ng-controller="TimeTableDetailManageCtrl_old as ctrl">
33   - <div class="col-md-12">
34   - <div class="portlet light bordered">
35   - <div class="portlet-title">
36   - <div class="caption font-dark">
37   - <i class="fa fa-database font-dark"></i>
38   - <span class="caption-subject bold uppercase" ng-bind="ctrl.title"></span>
39   - </div>
40   - <div class="actions">
41   - <i class="fa fa-arrow-up" aria-hidden="true"></i>
42   - <span style="padding-right: 10px;">上行班次</span>
43   - <i class="fa fa-arrow-down" aria-hidden="true"></i>
44   - <span style="padding-right: 10px;">下行班次</span>
45   - <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
46   - <span style="padding-right: 10px;">区间班次</span>
47   - <i class="fa fa-adjust" aria-hidden="true"></i>
48   - <span style="padding-right: 10px;">分班班次</span>
49   -
50   - <div class="btn-group">
51   - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
52   - <i class="fa fa-share"></i>
53   - <span>数据工具</span>
54   - <i class="fa fa-angle-down"></i>
55   - </a>
56   - <ul class="dropdown-menu pull-right">
57   - <li>
58   - <a href="javascript:" class="tool-action">
59   - <i class="fa fa-file-excel-o"></i>
60   - 导出excel
61   - </a>
62   - </li>
63   - <li class="divider"></li>
64   - <li>
65   - <a href="javascript:" class="tool-action" ng-click="ctrl.refresh()">
66   - <i class="fa fa-refresh"></i>
67   - 刷行数据
68   - </a>
69   - </li>
70   - </ul>
71   - </div>
72   -
73   - </div>
74   - </div>
75   -
76   - <div class="portlet-body">
77   - <!--<div ng-view></div>-->
78   - <div class="fixDiv">
79   - <table style="width: 2000px" class="table table-striped table-bordered table-hover table-checkable order-column">
80   - <thead>
81   - <tr>
82   - <th ng-repeat="head in ctrl.detailHeads track by $index">
83   - <span ng-bind="head"></span>
84   - </th>
85   -
86   - </tr>
87   - </thead>
88   - <tbody>
89   - <tr ng-repeat="info in ctrl.detailInfos">
90   - <td ng-repeat="cell in info track by $index">
91   -
92   - <!--<span ng-bind="cell.fcsj"></span>-->
93   - <span ng-if="!cell.ttdid" ng-bind="cell.fcsj"></span>
94   -
95   - <div ng-if="cell.ttdid" class="btn-group">
96   - <a href="javascript:" class="btn blue btn-outline btn-circle" data-toggle="dropdown">
97   - <!-- 上下行图标 -->
98   - <i ng-if="cell.xldir == '0'" class="fa fa-arrow-up" aria-hidden="true"></i>
99   - <i ng-if="cell.xldir == '1'" class="fa fa-arrow-down" aria-hidden="true"></i>
100   - <!-- 班次类型图标（区间班次） -->
101   - <i ng-if="cell.bc_type == 'region'" class="fa fa-circle-o-notch" aria-hidden="true"></i>
102   - <!-- 分班班次 -->
103   - <i ng-if="cell.isfb == true" class="fa fa-adjust" aria-hidden="true"></i>
104   -
105   - <span ng-bind="cell.fcsj"></span>
106   - <i class="fa fa-angle-down"></i>
107   - </a>
108   - <ul class="dropdown-menu pull-left">
109   - <li>
110   - <a href="javascript:" class="tool-action" ui-sref="ttInfoDetailManage_detail_edit({id: cell.ttdid, xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname})">
111   - <i class="fa fa-file-excel-o"></i>
112   - 修改
113   - </a>
114   - </li>
115   - <li>
116   - <a href="javascript:" class="tool-action">
117   - <i class="fa fa-refresh"></i>
118   - 删除
119   - </a>
120   - </li>
121   - <li class="divider"></li>
122   - <li>
123   - <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 0)">
124   - <i class="fa fa-file-excel-o"></i>
125   - 设为上行
126   - <i class="fa fa-arrow-up" aria-hidden="true"></i>
127   - </a>
128   - </li>
129   - <li>
130   - <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 1)">
131   - <i class="fa fa-file-excel-o"></i>
132   - 设为下行
133   - <i class="fa fa-arrow-down" aria-hidden="true"></i>
134   - </a>
135   - </li>
136   - <li>
137   - <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, true)">
138   - <i class="fa fa-file-excel-o"></i>
139   - 设置分班
140   - <i class="fa fa-adjust" aria-hidden="true"></i>
141   - </a>
142   - </li>
143   - <li>
144   - <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, false)">
145   - <i class="fa fa-file-excel-o"></i>
146   - 取消分班
147   - <i class="fa fa-adjust" aria-hidden="true"></i>
148   - </a>
149   - </li>
150   - <li>
151   - <a href="javascript:" class="tool-action" ng-click="ctrl.changeBCType(cell, 'region')">
152   - <i class="fa fa-file-excel-o"></i>
153   - 设为区间
154   - <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
155   - </a>
156   - </li>
157   -
158   -
159   - </ul>
160   - </div>
161   -
162   -
163   -
164   - </td>
165   - </tr>
166   -
167   - </tbody>
168   - </table>
169   - </div>
170   -
171   -
172   - </div>
173   - </div>
174   - </div>
175   -</div>
  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 + <a ui-sref="ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">编辑时刻表明细信息</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<!--&lt;!&ndash; loading widget &ndash;&gt;-->
  26 +<!--<div id="loadingWidget" class="flyover mask" loading-widget>-->
  27 +<!--<div class="alert alert-info">-->
  28 +<!--<strong>载入中......</strong>-->
  29 +<!--</div>-->
  30 +<!--</div>-->
  31 +
  32 +<div class="row" id="timeTableDetail" ng-controller="TimeTableDetailManageCtrl_old as ctrl">
  33 + <div class="col-md-12">
  34 + <div class="portlet light bordered">
  35 + <div class="portlet-title">
  36 + <div class="caption font-dark">
  37 + <i class="fa fa-database font-dark"></i>
  38 + <span class="caption-subject bold uppercase" ng-bind="ctrl.title"></span>
  39 + </div>
  40 + <div class="actions">
  41 + <i class="fa fa-arrow-up" aria-hidden="true"></i>
  42 + <span style="padding-right: 10px;">上行班次</span>
  43 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  44 + <span style="padding-right: 10px;">下行班次</span>
  45 + <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
  46 + <span style="padding-right: 10px;">区间班次</span>
  47 + <i class="fa fa-adjust" aria-hidden="true"></i>
  48 + <span style="padding-right: 10px;">分班班次</span>
  49 +
  50 + <div class="btn-group">
  51 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  52 + <i class="fa fa-share"></i>
  53 + <span>数据工具</span>
  54 + <i class="fa fa-angle-down"></i>
  55 + </a>
  56 + <ul class="dropdown-menu pull-right">
  57 + <li>
  58 + <a href="javascript:" class="tool-action">
  59 + <i class="fa fa-file-excel-o"></i>
  60 + 导出excel
  61 + </a>
  62 + </li>
  63 + <li class="divider"></li>
  64 + <li>
  65 + <a href="javascript:" class="tool-action" ng-click="ctrl.refresh()">
  66 + <i class="fa fa-refresh"></i>
  67 + 刷行数据
  68 + </a>
  69 + </li>
  70 + </ul>
  71 + </div>
  72 +
  73 + </div>
  74 + </div>
  75 +
  76 + <div class="portlet-body">
  77 + <!--<div ng-view></div>-->
  78 + <div class="fixDiv">
  79 + <table style="width: 2000px" class="table table-striped table-bordered table-hover table-checkable order-column">
  80 + <thead>
  81 + <tr>
  82 + <th ng-repeat="head in ctrl.detailHeads track by $index">
  83 + <span ng-bind="head"></span>
  84 + </th>
  85 +
  86 + </tr>
  87 + </thead>
  88 + <tbody>
  89 + <tr ng-repeat="info in ctrl.detailInfos">
  90 + <td ng-repeat="cell in info track by $index">
  91 +
  92 + <!--<span ng-bind="cell.fcsj"></span>-->
  93 + <span ng-if="!cell.ttdid" ng-bind="cell.fcsj"></span>
  94 +
  95 + <div ng-if="cell.ttdid" class="btn-group">
  96 + <a href="javascript:" class="btn blue btn-outline btn-circle" data-toggle="dropdown">
  97 + <!-- 上下行图标 -->
  98 + <i ng-if="cell.xldir == '0'" class="fa fa-arrow-up" aria-hidden="true"></i>
  99 + <i ng-if="cell.xldir == '1'" class="fa fa-arrow-down" aria-hidden="true"></i>
  100 + <!-- 班次类型图标（区间班次） -->
  101 + <i ng-if="cell.bc_type == 'region'" class="fa fa-circle-o-notch" aria-hidden="true"></i>
  102 + <!-- 分班班次 -->
  103 + <i ng-if="cell.isfb == true" class="fa fa-adjust" aria-hidden="true"></i>
  104 +
  105 + <span ng-bind="cell.fcsj"></span>
  106 + <i class="fa fa-angle-down"></i>
  107 + </a>
  108 + <ul class="dropdown-menu pull-left">
  109 + <li>
  110 + <a href="javascript:" class="tool-action" ui-sref="ttInfoDetailManage_detail_edit({id: cell.ttdid, xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname})">
  111 + <i class="fa fa-file-excel-o"></i>
  112 + 修改
  113 + </a>
  114 + </li>
  115 + <li>
  116 + <a href="javascript:" class="tool-action">
  117 + <i class="fa fa-refresh"></i>
  118 + 删除
  119 + </a>
  120 + </li>
  121 + <li class="divider"></li>
  122 + <li>
  123 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 0)">
  124 + <i class="fa fa-file-excel-o"></i>
  125 + 设为上行
  126 + <i class="fa fa-arrow-up" aria-hidden="true"></i>
  127 + </a>
  128 + </li>
  129 + <li>
  130 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 1)">
  131 + <i class="fa fa-file-excel-o"></i>
  132 + 设为下行
  133 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  134 + </a>
  135 + </li>
  136 + <li>
  137 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, true)">
  138 + <i class="fa fa-file-excel-o"></i>
  139 + 设置分班
  140 + <i class="fa fa-adjust" aria-hidden="true"></i>
  141 + </a>
  142 + </li>
  143 + <li>
  144 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, false)">
  145 + <i class="fa fa-file-excel-o"></i>
  146 + 取消分班
  147 + <i class="fa fa-adjust" aria-hidden="true"></i>
  148 + </a>
  149 + </li>
  150 + <li>
  151 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeBCType(cell, 'region')">
  152 + <i class="fa fa-file-excel-o"></i>
  153 + 设为区间
  154 + <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
  155 + </a>
  156 + </li>
  157 +
  158 +
  159 + </ul>
  160 + </div>
  161 +
  162 +
  163 +
  164 + </td>
  165 + </tr>
  166 +
  167 + </tbody>
  168 + </table>
  169 + </div>
  170 +
  171 +
  172 + </div>
  173 + </div>
  174 + </div>
  175 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/form.html
  View file @23890d8
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>时刻表管理2</h1>
  3 + <h1>时刻表管理</h1>
4 4 </div>
5 5 </div>
6 6  
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detail.html
  View file @23890d8
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>时刻表管理2</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   - <a ui-sref="ttInfoManage">时刻表管理</a>
18   - <i class="fa fa-circle"></i>
19   - </li>
20   - <li>
21   - <span class="active">时刻表基础信息</span>
22   - </li>
23   -</ul>
24   -
25   -<div class="portlet light bordered" ng-controller="TtInfoManageDetailCtrl as ctrl">
26   - <div class="portlet-title">
27   - <div class="caption">
28   - <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase"
30   - ng-bind="ctrl.title"></span>
31   - </div>
32   - </div>
33   -
34   - <div class="portlet-body form">
35   - <form class="form-horizontal" novalidate name="myForm">
36   - <!--<div class="alert alert-danger display-hide">-->
37   - <!--<button class="close" data-close="alert"></button>-->
38   - <!--您的输入有误，请检查下面的输入项-->
39   - <!--</div>-->
40   -
41   -
42   - <!-- 其他信息放置在这里 -->
43   - <div class="form-body">
44   - <div class="form-group has-success has-feedback">
45   - <label class="col-md-2 control-label">线路*：</label>
46   - <div class="col-md-4">
47   - <input type="text" class="form-control"
48   - name="xl" ng-model="ctrl.ttInfoManageForDetail.xl.name" readonly/>
49   - </div>
50   - </div>
51   -
52   - <div class="form-group has-success has-feedback">
53   - <label class="col-md-2 control-label">线路走向*：</label>
54   - <div class="col-md-4">
55   - <sa-Radiogroup model="ctrl.ttInfoManageForDetail.xlDir" dicgroup="LineTrend2" name="xlDir" disabled="true"></sa-Radiogroup>
56   - </div>
57   - </div>
58   -
59   - <div class="form-group has-success has-feedback">
60   - <label class="col-md-2 control-label">时刻表名字*：</label>
61   - <div class="col-md-4">
62   - <input type="text" class="form-control"
63   - name="name" ng-model="ctrl.ttInfoManageForDetail.name" readonly/>
64   - </div>
65   - </div>
66   -
67   - <div class="form-group has-success has-feedback">
68   - <label class="col-md-2 control-label">启用日期*：</label>
69   - <div class="col-md-4">
70   - <input type="text" class="form-control"
71   - name="qyrq" uib-datepicker-popup="yyyy年MM月dd日"
72   - ng-model="ctrl.ttInfoManageForDetail.qyrq" readonly/>
73   - </div>
74   - </div>
75   -
76   - <div class="form-group has-success has-feedback">
77   - <label class="col-md-2 control-label">是否启用*：</label>
78   - <div class="col-md-4">
79   - <sa-Radiogroup model="ctrl.ttInfoManageForDetail.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" disabled="true"></sa-Radiogroup>
80   - </div>
81   -
82   - </div>
83   -
84   - <div class="form-group">
85   - <label class="col-md-2 control-label">路牌数量：</label>
86   - <div class="col-md-4">
87   - <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.lpCount"
88   - name="lpCount" placeholder="请输入路牌数" min="1" readonly/>
89   - </div>
90   - </div>
91   -
92   - <div class="form-group">
93   - <label class="col-md-2 control-label">营运圈数：</label>
94   - <div class="col-md-4">
95   - <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.loopCount"
96   - name="loopCount" placeholder="请输入圈数" min="1" readonly/>
97   - </div>
98   - </div>
99   -
100   - <div class="form-group">
101   - <label class="col-md-2 control-label">停车场：</label>
102   - <div class="col-md-4">
103   - <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.xl.carParkCode | dict:'CarPark':'未知' "
104   - name="carParkCode" readonly/>
105   - </div>
106   - </div>
107   -
108   - <div class="form-group">
109   - <label class="col-md-2 control-label">常规有效日：</label>
110   - <div class="col-md-6">
111   - <sa-Checkboxgroup model="ctrl.timeTableManageForForm"
112   - name="rule_days"
113   - dcvalue="{{ctrl.ttInfoManageForDetail.rule_days}}"
114   - disabled >
115   - </sa-Checkboxgroup>
116   - </div>
117   - </div>
118   -
119   - <div class="form-group">
120   - <label class="col-md-2 control-label">特殊有效日：</label>
121   - <div class="col-md-6">
122   - <sa-Dategroup model="ctrl.ttInfoManageForDetail"
123   - name="special_days"
124   - dcvalue="{{ctrl.timeTableManageForDetail.special_days}}"
125   - disabled
126   - >
127   - </sa-Dategroup>
128   - </div>
129   - </div>
130   -
131   - <!--<div class="form-group">-->
132   - <!--<label class="col-md-2 control-label">备注：</label>-->
133   - <!--</div>-->
134   -
135   - <div class="form-group">
136   - <label class="col-md-2 control-label">创建人：</label>
137   - <div class="col-md-4">
138   - <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.createBy.name"
139   - name="createBy" readonly/>
140   - </div>
141   - </div>
142   -
143   - <div class="form-group">
144   - <label class="col-md-2 control-label">创建时间：</label>
145   - <div class="col-md-4">
146   - <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForDetail.createDate"
147   - name="createDate" uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"
148   - readonly/>
149   - </div>
150   - </div>
151   -
152   - <div class="form-group">
153   - <label class="col-md-2 control-label">更新人：</label>
154   - <div class="col-md-4">
155   - <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.updateBy.name"
156   - name="updateBy" readonly/>
157   - </div>
158   - </div>
159   -
160   - <div class="form-group">
161   - <label class="col-md-2 control-label">更新时间：</label>
162   - <div class="col-md-4">
163   - <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForDetail.updateDate"
164   - name="updateDate" uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"
165   - readonly/>
166   - </div>
167   - </div>
168   -
169   - <!-- 其他form-group -->
170   -
171   - </div>
172   -
173   - </form>
174   -
175   - </div>
176   -
177   -
  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 + <a ui-sref="ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">时刻表基础信息</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<div class="portlet light bordered" ng-controller="TtInfoManageDetailCtrl as ctrl">
  26 + <div class="portlet-title">
  27 + <div class="caption">
  28 + <i class="icon-equalizer font-red-sunglo"></i> <span
  29 + class="caption-subject font-red-sunglo bold uppercase"
  30 + ng-bind="ctrl.title"></span>
  31 + </div>
  32 + </div>
  33 +
  34 + <div class="portlet-body form">
  35 + <form class="form-horizontal" novalidate name="myForm">
  36 + <!--<div class="alert alert-danger display-hide">-->
  37 + <!--<button class="close" data-close="alert"></button>-->
  38 + <!--您的输入有误，请检查下面的输入项-->
  39 + <!--</div>-->
  40 +
  41 +
  42 + <!-- 其他信息放置在这里 -->
  43 + <div class="form-body">
  44 + <div class="form-group has-success has-feedback">
  45 + <label class="col-md-2 control-label">线路*：</label>
  46 + <div class="col-md-4">
  47 + <input type="text" class="form-control"
  48 + name="xl" ng-model="ctrl.ttInfoManageForDetail.xl.name" readonly/>
  49 + </div>
  50 + </div>
  51 +
  52 + <div class="form-group has-success has-feedback">
  53 + <label class="col-md-2 control-label">线路走向*：</label>
  54 + <div class="col-md-4">
  55 + <sa-Radiogroup model="ctrl.ttInfoManageForDetail.xlDir" dicgroup="LineTrend2" name="xlDir" disabled="true"></sa-Radiogroup>
  56 + </div>
  57 + </div>
  58 +
  59 + <div class="form-group has-success has-feedback">
  60 + <label class="col-md-2 control-label">时刻表名字*：</label>
  61 + <div class="col-md-4">
  62 + <input type="text" class="form-control"
  63 + name="name" ng-model="ctrl.ttInfoManageForDetail.name" readonly/>
  64 + </div>
  65 + </div>
  66 +
  67 + <div class="form-group has-success has-feedback">
  68 + <label class="col-md-2 control-label">启用日期*：</label>
  69 + <div class="col-md-4">
  70 + <input type="text" class="form-control"
  71 + name="qyrq" uib-datepicker-popup="yyyy年MM月dd日"
  72 + ng-model="ctrl.ttInfoManageForDetail.qyrq" readonly/>
  73 + </div>
  74 + </div>
  75 +
  76 + <div class="form-group has-success has-feedback">
  77 + <label class="col-md-2 control-label">是否启用*：</label>
  78 + <div class="col-md-4">
  79 + <sa-Radiogroup model="ctrl.ttInfoManageForDetail.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" disabled="true"></sa-Radiogroup>
  80 + </div>
  81 +
  82 + </div>
  83 +
  84 + <div class="form-group">
  85 + <label class="col-md-2 control-label">路牌数量：</label>
  86 + <div class="col-md-4">
  87 + <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.lpCount"
  88 + name="lpCount" placeholder="请输入路牌数" min="1" readonly/>
  89 + </div>
  90 + </div>
  91 +
  92 + <div class="form-group">
  93 + <label class="col-md-2 control-label">营运圈数：</label>
  94 + <div class="col-md-4">
  95 + <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.loopCount"
  96 + name="loopCount" placeholder="请输入圈数" min="1" readonly/>
  97 + </div>
  98 + </div>
  99 +
  100 + <div class="form-group">
  101 + <label class="col-md-2 control-label">停车场：</label>
  102 + <div class="col-md-4">
  103 + <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.xl.carParkCode | dict:'CarPark':'未知' "
  104 + name="carParkCode" readonly/>
  105 + </div>
  106 + </div>
  107 +
  108 + <div class="form-group">
  109 + <label class="col-md-2 control-label">常规有效日：</label>
  110 + <div class="col-md-6">
  111 + <sa-Checkboxgroup model="ctrl.timeTableManageForForm"
  112 + name="rule_days"
  113 + dcvalue="{{ctrl.ttInfoManageForDetail.rule_days}}"
  114 + disabled >
  115 + </sa-Checkboxgroup>
  116 + </div>
  117 + </div>
  118 +
  119 + <div class="form-group">
  120 + <label class="col-md-2 control-label">特殊有效日：</label>
  121 + <div class="col-md-6">
  122 + <sa-Dategroup model="ctrl.ttInfoManageForDetail"
  123 + name="special_days"
  124 + dcvalue="{{ctrl.timeTableManageForDetail.special_days}}"
  125 + disabled
  126 + >
  127 + </sa-Dategroup>
  128 + </div>
  129 + </div>
  130 +
  131 + <!--<div class="form-group">-->
  132 + <!--<label class="col-md-2 control-label">备注：</label>-->
  133 + <!--</div>-->
  134 +
  135 + <div class="form-group">
  136 + <label class="col-md-2 control-label">创建人：</label>
  137 + <div class="col-md-4">
  138 + <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.createBy.name"
  139 + name="createBy" readonly/>
  140 + </div>
  141 + </div>
  142 +
  143 + <div class="form-group">
  144 + <label class="col-md-2 control-label">创建时间：</label>
  145 + <div class="col-md-4">
  146 + <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForDetail.createDate"
  147 + name="createDate" uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"
  148 + readonly/>
  149 + </div>
  150 + </div>
  151 +
  152 + <div class="form-group">
  153 + <label class="col-md-2 control-label">更新人：</label>
  154 + <div class="col-md-4">
  155 + <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.updateBy.name"
  156 + name="updateBy" readonly/>
  157 + </div>
  158 + </div>
  159 +
  160 + <div class="form-group">
  161 + <label class="col-md-2 control-label">更新时间：</label>
  162 + <div class="col-md-4">
  163 + <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForDetail.updateDate"
  164 + name="updateDate" uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"
  165 + readonly/>
  166 + </div>
  167 + </div>
  168 +
  169 + <!-- 其他form-group -->
  170 +
  171 + </div>
  172 +
  173 + </form>
  174 +
  175 + </div>
  176 +
  177 +
  178 +>>>>>>> PSM-12
178 179 </div>
179 180 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/edit.html
  View file @23890d8
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>时刻表管理2</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   - <a ui-sref="ttInfoManage">时刻表管理</a>
18   - <i class="fa fa-circle"></i>
19   - </li>
20   - <li>
21   - <span class="active">修改时刻表基础信息</span>
22   - </li>
23   -</ul>
24   -
25   -<div class="portlet light bordered" ng-controller="TtInfoManageFormCtrl as ctrl">
26   - <div class="portlet-title">
27   - <div class="caption">
28   - <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">表单</span>
30   - </div>
31   - </div>
32   -
33   - <div class="portlet-body form">
34   - <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
35   - <!--<div class="alert alert-danger display-hide">-->
36   - <!--<button class="close" data-close="alert"></button>-->
37   - <!--您的输入有误，请检查下面的输入项-->
38   - <!--</div>-->
39   -
40   -
41   - <!-- 其他信息放置在这里 -->
42   - <div class="form-body">
43   - <div class="form-group has-success has-feedback">
44   - <label class="col-md-2 control-label">线路*：</label>
45   - <div class="col-md-3">
46   - <sa-Select5 name="xl"
47   - model="ctrl.ttInfoManageForForm"
48   - cmaps="{'xl.id' : 'id'}"
49   - dcname="xl.id"
50   - icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
52   - iterobjname="item"
53   - iterobjexp="item.name"
54   - searchph="请输拼音..."
55   - searchexp="this.name"
56   - required >
57   - </sa-Select5>
58   - </div>
59   - <!-- 隐藏块，显示验证信息 -->
60   - <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
61   - 线路必须选择
62   - </div>
63   - </div>
64   -
65   - <div class="form-group has-success has-feedback">
66   - <label class="col-md-2 control-label">线路走向*：</label>
67   - <div class="col-md-3">
68   - <sa-Radiogroup model="ctrl.ttInfoManageForForm.xlDir" dicgroup="LineTrend2" name="xlDir" required></sa-Radiogroup>
69   - </div>
70   - <!-- 隐藏块，显示验证信息 -->
71   - <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
72   - 线路走向必须填写
73   - </div>
74   - </div>
75   -
76   - <div class="form-group has-success has-feedback">
77   - <label class="col-md-2 control-label">时刻表名字*：</label>
78   - <div class="col-md-3">
79   - <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForForm.name"
80   - name="name" placeholder="请输入时刻表名字..." required
81   - remote-Validation
82   - remotevtype="ttc1"
83   - remotevparam="{{ {'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'name_eq': ctrl.ttInfoManageForForm.name} | json}}"
84   - />
85   - </div>
86   -
87   - <!-- 隐藏块，显示验证信息 -->
88   - <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.required">
89   - 时刻表名字必须填写
90   - </div>
91   - <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.remote">
92   - 相同线路下的时刻表不能同名
93   - </div>
94   - </div>
95   -
96   - <div class="form-group has-success has-feedback">
97   - <label class="col-md-2 control-label">启用日期*：</label>
98   - <div class="col-md-3">
99   - <div class="input-group">
100   - <input type="text" class="form-control"
101   - name="qyrq" placeholder="请选择启用日期..."
102   - uib-datepicker-popup="yyyy年MM月dd日"
103   - is-open="ctrl.qyrqOpen"
104   - ng-model="ctrl.ttInfoManageForForm.qyrq" readonly required/>
105   - <span class="input-group-btn">
106   - <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
107   - <i class="glyphicon glyphicon-calendar"></i>
108   - </button>
109   - </span>
110   - </div>
111   - </div>
112   -
113   - <!-- 隐藏块，显示验证信息 -->
114   - <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
115   - 启用日期必须填写
116   - </div>
117   - </div>
118   -
119   - <div class="form-group has-success has-feedback">
120   - <label class="col-md-2 control-label">是否启用*：</label>
121   - <div class="col-md-3">
122   - <sa-Radiogroup model="ctrl.ttInfoManageForForm.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" required></sa-Radiogroup>
123   - </div>
124   -
125   - <!-- 隐藏块，显示验证信息 -->
126   - <div class="alert alert-danger well-sm" ng-show="myForm.isEnableDisTemplate.$error.required">
127   - 是否启用必须选择
128   - </div>
129   -
130   - </div>
131   -
132   - <div class="form-group">
133   - <label class="col-md-2 control-label">路牌数量：</label>
134   - <div class="col-md-3">
135   - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"
136   - name="lpCount" placeholder="请输入路牌数..." min="1"/>
137   - </div>
138   - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">
139   - 必须输入数字
140   - </div>
141   - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">
142   - 路爬数量必须大于1
143   - </div>
144   - </div>
145   -
146   - <div class="form-group">
147   - <label class="col-md-2 control-label">营运圈数：</label>
148   - <div class="col-md-3">
149   - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"
150   - name="loopCount" placeholder="请输入圈数..." min="1"/>
151   - </div>
152   - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">
153   - 必须输入数字
154   - </div>
155   - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">
156   - 营运圈数必须大于1
157   - </div>
158   - </div>
159   -
160   - <div class="form-group">
161   - <label class="col-md-2 control-label">常规有效日：</label>
162   - <div class="col-md-6">
163   - <sa-Checkboxgroup model="ctrl.ttInfoManageForForm"
164   - name="rule_days"
165   - dcvalue="{{ctrl.ttInfoManageForForm.rule_days}}"
166   - dcname="rule_days"
167   - required >
168   - </sa-Checkboxgroup>
169   - </div>
170   - <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
171   - 请操作一下1
172   - </div>
173   - </div>
174   -
175   - <div class="form-group">
176   - <label class="col-md-2 control-label">特殊有效日：</label>
177   - <div class="col-md-6">
178   - <sa-Dategroup model="ctrl.ttInfoManageForForm"
179   - name="special_days"
180   - dcvalue="{{ctrl.ttInfoManageForForm.special_days}}"
181   - dcname="special_days"
182   - >
183   - </sa-Dategroup>
184   - </div>
185   - <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
186   - 请操作一下2
187   - </div>
188   - </div>
189   -
190   - <!--<div class="form-group">-->
191   - <!--<label class="col-md-2 control-label">备注：</label>-->
192   - <!--</div>-->
193   -
194   - <!-- 其他form-group -->
195   -
196   - </div>
197   -
198   - <!-- TODO：!myForm.$valid 在这里有点问题，改用以下方法验证 -->
199   - <div class="form-actions">
200   - <div class="row">
201   - <div class="col-md-offset-3 col-md-4">
202   - <button type="submit" class="btn green"
203   - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
204   - <a type="button" class="btn default" ui-sref="ttInfoManage" ><i class="fa fa-times"></i> 取消</a>
205   - </div>
206   - </div>
207   - </div>
208   -
209   - </form>
210   -
211   - </div>
212   -
213   -
  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 + <a ui-sref="ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">修改时刻表基础信息</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<div class="portlet light bordered" ng-controller="TtInfoManageFormCtrl as ctrl">
  26 + <div class="portlet-title">
  27 + <div class="caption">
  28 + <i class="icon-equalizer font-red-sunglo"></i> <span
  29 + class="caption-subject font-red-sunglo bold uppercase">表单</span>
  30 + </div>
  31 + </div>
  32 +
  33 + <div class="portlet-body form">
  34 + <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
  35 + <!--<div class="alert alert-danger display-hide">-->
  36 + <!--<button class="close" data-close="alert"></button>-->
  37 + <!--您的输入有误，请检查下面的输入项-->
  38 + <!--</div>-->
  39 +
  40 +
  41 + <!-- 其他信息放置在这里 -->
  42 + <div class="form-body">
  43 + <div class="form-group has-success has-feedback">
  44 + <label class="col-md-2 control-label">线路*：</label>
  45 + <div class="col-md-3">
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.ttInfoManageForForm"
  48 + cmaps="{'xl.id' : 'id'}"
  49 + dcname="xl.id"
  50 + icname="id"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
  56 + required >
  57 + </sa-Select5>
  58 + </div>
  59 + <!-- 隐藏块，显示验证信息 -->
  60 + <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
  61 + 线路必须选择
  62 + </div>
  63 + </div>
  64 +
  65 + <div class="form-group has-success has-feedback">
  66 + <label class="col-md-2 control-label">线路走向*：</label>
  67 + <div class="col-md-3">
  68 + <sa-Radiogroup model="ctrl.ttInfoManageForForm.xlDir" dicgroup="LineTrend2" name="xlDir" required></sa-Radiogroup>
  69 + </div>
  70 + <!-- 隐藏块，显示验证信息 -->
  71 + <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
  72 + 线路走向必须填写
  73 + </div>
  74 + </div>
  75 +
  76 + <div class="form-group has-success has-feedback">
  77 + <label class="col-md-2 control-label">时刻表名字*：</label>
  78 + <div class="col-md-3">
  79 + <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForForm.name"
  80 + name="name" placeholder="请输入时刻表名字..." required
  81 + remote-Validation
  82 + remotevtype="ttc1"
  83 + remotevparam="{{ {'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'name_eq': ctrl.ttInfoManageForForm.name} | json}}"
  84 + />
  85 + </div>
  86 +
  87 + <!-- 隐藏块，显示验证信息 -->
  88 + <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.required">
  89 + 时刻表名字必须填写
  90 + </div>
  91 + <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.remote">
  92 + 相同线路下的时刻表不能同名
  93 + </div>
  94 + </div>
  95 +
  96 + <div class="form-group has-success has-feedback">
  97 + <label class="col-md-2 control-label">启用日期*：</label>
  98 + <div class="col-md-3">
  99 + <div class="input-group">
  100 + <input type="text" class="form-control"
  101 + name="qyrq" placeholder="请选择启用日期..."
  102 + uib-datepicker-popup="yyyy年MM月dd日"
  103 + is-open="ctrl.qyrqOpen"
  104 + ng-model="ctrl.ttInfoManageForForm.qyrq" readonly required/>
  105 + <span class="input-group-btn">
  106 + <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
  107 + <i class="glyphicon glyphicon-calendar"></i>
  108 + </button>
  109 + </span>
  110 + </div>
  111 + </div>
  112 +
  113 + <!-- 隐藏块，显示验证信息 -->
  114 + <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
  115 + 启用日期必须填写
  116 + </div>
  117 + </div>
  118 +
  119 + <div class="form-group has-success has-feedback">
  120 + <label class="col-md-2 control-label">是否启用*：</label>
  121 + <div class="col-md-3">
  122 + <sa-Radiogroup model="ctrl.ttInfoManageForForm.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" required></sa-Radiogroup>
  123 + </div>
  124 +
  125 + <!-- 隐藏块，显示验证信息 -->
  126 + <div class="alert alert-danger well-sm" ng-show="myForm.isEnableDisTemplate.$error.required">
  127 + 是否启用必须选择
  128 + </div>
  129 +
  130 + </div>
  131 +
  132 + <div class="form-group">
  133 + <label class="col-md-2 control-label">路牌数量：</label>
  134 + <div class="col-md-3">
  135 + <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"
  136 + name="lpCount" placeholder="请输入路牌数..." min="1"/>
  137 + </div>
  138 + <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">
  139 + 必须输入数字
  140 + </div>
  141 + <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">
  142 + 路爬数量必须大于1
  143 + </div>
  144 + </div>
  145 +
  146 + <div class="form-group">
  147 + <label class="col-md-2 control-label">营运圈数：</label>
  148 + <div class="col-md-3">
  149 + <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"
  150 + name="loopCount" placeholder="请输入圈数..." min="1"/>
  151 + </div>
  152 + <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">
  153 + 必须输入数字
  154 + </div>
  155 + <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">
  156 + 营运圈数必须大于1
  157 + </div>
  158 + </div>
  159 +
  160 + <div class="form-group">
  161 + <label class="col-md-2 control-label">常规有效日：</label>
  162 + <div class="col-md-6">
  163 + <sa-Checkboxgroup model="ctrl.ttInfoManageForForm"
  164 + name="rule_days"
  165 + dcvalue="{{ctrl.ttInfoManageForForm.rule_days}}"
  166 + dcname="rule_days"
  167 + required >
  168 + </sa-Checkboxgroup>
  169 + </div>
  170 + <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
  171 + 请操作一下1
  172 + </div>
  173 + </div>
  174 +
  175 + <div class="form-group">
  176 + <label class="col-md-2 control-label">特殊有效日：</label>
  177 + <div class="col-md-6">
  178 + <sa-Dategroup model="ctrl.ttInfoManageForForm"
  179 + name="special_days"
  180 + dcvalue="{{ctrl.ttInfoManageForForm.special_days}}"
  181 + dcname="special_days"
  182 + >
  183 + </sa-Dategroup>
  184 + </div>
  185 + <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
  186 + 请操作一下2
  187 + </div>
  188 + </div>
  189 +
  190 + <!--<div class="form-group">-->
  191 + <!--<label class="col-md-2 control-label">备注：</label>-->
  192 + <!--</div>-->
  193 +
  194 + <!-- 其他form-group -->
  195 +
  196 + </div>
  197 +
  198 + <!-- TODO：!myForm.$valid 在这里有点问题，改用以下方法验证 -->
  199 + <div class="form-actions">
  200 + <div class="row">
  201 + <div class="col-md-offset-3 col-md-4">
  202 + <button type="submit" class="btn green"
  203 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  204 + <a type="button" class="btn default" ui-sref="ttInfoManage" ><i class="fa fa-times"></i> 取消</a>
  205 + </div>
  206 + </div>
  207 + </div>
  208 +
  209 + </form>
  210 +
  211 + </div>
  212 +
  213 +
214 214 </div>
215 215 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/form.html
  View file @23890d8
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>时刻表管理2</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   - <a ui-sref="ttInfoManage">时刻表管理</a>
18   - <i class="fa fa-circle"></i>
19   - </li>
20   - <li>
21   - <span class="active">添加时刻表基础信息</span>
22   - </li>
23   -</ul>
24   -
25   -<div class="portlet light bordered" ng-controller="TtInfoManageFormCtrl as ctrl">
26   - <div class="portlet-title">
27   - <div class="caption">
28   - <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">表单</span>
30   - </div>
31   - </div>
32   -
33   - <div class="portlet-body form">
34   - <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
35   - <!--<div class="alert alert-danger display-hide">-->
36   - <!--<button class="close" data-close="alert"></button>-->
37   - <!--您的输入有误，请检查下面的输入项-->
38   - <!--</div>-->
39   -
40   -
41   - <!-- 其他信息放置在这里 -->
42   - <div class="form-body">
43   - <div class="form-group has-success has-feedback">
44   - <label class="col-md-2 control-label">线路*：</label>
45   - <div class="col-md-3">
46   - <sa-Select5 name="xl"
47   - model="ctrl.ttInfoManageForForm"
48   - cmaps="{'xl.id' : 'id'}"
49   - dcname="xl.id"
50   - icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
52   - iterobjname="item"
53   - iterobjexp="item.name"
54   - searchph="请输拼音..."
55   - searchexp="this.name"
56   - required >
57   - </sa-Select5>
58   - </div>
59   - <!-- 隐藏块，显示验证信息 -->
60   - <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
61   - 线路必须选择
62   - </div>
63   - </div>
64   -
65   - <div class="form-group has-success has-feedback">
66   - <label class="col-md-2 control-label">线路走向*：</label>
67   - <div class="col-md-3">
68   - <sa-Radiogroup model="ctrl.ttInfoManageForForm.xlDir" dicgroup="LineTrend2" name="xlDir" required></sa-Radiogroup>
69   - </div>
70   - <!-- 隐藏块，显示验证信息 -->
71   - <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
72   - 线路走向必须填写
73   - </div>
74   - </div>
75   -
76   - <div class="form-group has-success has-feedback">
77   - <label class="col-md-2 control-label">时刻表名字*：</label>
78   - <div class="col-md-3">
79   - <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForForm.name"
80   - name="name" placeholder="请输入时刻表名字..." required
81   - remote-Validation
82   - remotevtype="ttc1"
83   - remotevparam="{{ {'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'name_eq': ctrl.ttInfoManageForForm.name} | json}}"
84   - />
85   - </div>
86   -
87   - <!-- 隐藏块，显示验证信息 -->
88   - <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.required">
89   - 时刻表名字必须填写
90   - </div>
91   - <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.remote">
92   - 相同线路下的时刻表不能同名
93   - </div>
94   - </div>
95   -
96   - <div class="form-group has-success has-feedback">
97   - <label class="col-md-2 control-label">启用日期*：</label>
98   - <div class="col-md-3">
99   - <div class="input-group">
100   - <input type="text" class="form-control"
101   - name="qyrq" placeholder="请选择启用日期..."
102   - uib-datepicker-popup="yyyy年MM月dd日"
103   - is-open="ctrl.qyrqOpen"
104   - ng-model="ctrl.ttInfoManageForForm.qyrq" readonly required/>
105   - <span class="input-group-btn">
106   - <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
107   - <i class="glyphicon glyphicon-calendar"></i>
108   - </button>
109   - </span>
110   - </div>
111   - </div>
112   -
113   - <!-- 隐藏块，显示验证信息 -->
114   - <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
115   - 启用日期必须填写
116   - </div>
117   - </div>
118   -
119   - <div class="form-group has-success has-feedback">
120   - <label class="col-md-2 control-label">是否启用*：</label>
121   - <div class="col-md-3">
122   - <sa-Radiogroup model="ctrl.ttInfoManageForForm.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" required></sa-Radiogroup>
123   - </div>
124   -
125   - <!-- 隐藏块，显示验证信息 -->
126   - <div class="alert alert-danger well-sm" ng-show="myForm.isEnableDisTemplate.$error.required">
127   - 是否启用必须选择
128   - </div>
129   -
130   - </div>
131   -
132   - <div class="form-group">
133   - <label class="col-md-2 control-label">路牌数量：</label>
134   - <div class="col-md-3">
135   - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"
136   - name="lpCount" placeholder="请输入路牌数..." min="1"/>
137   - </div>
138   - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">
139   - 必须输入数字
140   - </div>
141   - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">
142   - 路爬数量必须大于1
143   - </div>
144   - </div>
145   -
146   - <div class="form-group">
147   - <label class="col-md-2 control-label">营运圈数：</label>
148   - <div class="col-md-3">
149   - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"
150   - name="loopCount" placeholder="请输入圈数..." min="1"/>
151   - </div>
152   - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">
153   - 必须输入数字
154   - </div>
155   - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">
156   - 营运圈数必须大于1
157   - </div>
158   - </div>
159   -
160   - <div class="form-group">
161   - <label class="col-md-2 control-label">常规有效日：</label>
162   - <div class="col-md-6">
163   - <sa-Checkboxgroup model="ctrl.ttInfoManageForForm"
164   - name="rule_days"
165   - dcvalue="{{ctrl.ttInfoManageForForm.rule_days}}"
166   - dcname="rule_days"
167   - required >
168   - </sa-Checkboxgroup>
169   - </div>
170   - <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
171   - 请操作一下1
172   - </div>
173   - </div>
174   -
175   - <div class="form-group">
176   - <label class="col-md-2 control-label">特殊有效日：</label>
177   - <div class="col-md-6">
178   - <sa-Dategroup model="ctrl.ttInfoManageForForm"
179   - name="special_days"
180   - dcvalue="{{ctrl.ttInfoManageForForm.special_days}}"
181   - dcname="special_days"
182   - >
183   - </sa-Dategroup>
184   - </div>
185   - <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
186   - 请操作一下2
187   - </div>
188   - </div>
189   -
190   - <!--<div class="form-group">-->
191   - <!--<label class="col-md-2 control-label">备注：</label>-->
192   - <!--</div>-->
193   -
194   - <!-- 其他form-group -->
195   -
196   - </div>
197   -
198   - <!-- TODO：!myForm.$valid 在这里有点问题，改用以下方法验证 -->
199   - <div class="form-actions">
200   - <div class="row">
201   - <div class="col-md-offset-3 col-md-4">
202   - <button type="submit" class="btn green"
203   - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
204   - <a type="button" class="btn default" ui-sref="ttInfoManage" ><i class="fa fa-times"></i> 取消</a>
205   - </div>
206   - </div>
207   - </div>
208   -
209   - </form>
210   -
211   - </div>
212   -
213   -
  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 + <a ui-sref="ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">添加时刻表基础信息</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<div class="portlet light bordered" ng-controller="TtInfoManageFormCtrl as ctrl">
  26 + <div class="portlet-title">
  27 + <div class="caption">
  28 + <i class="icon-equalizer font-red-sunglo"></i> <span
  29 + class="caption-subject font-red-sunglo bold uppercase">表单</span>
  30 + </div>
  31 + </div>
  32 +
  33 + <div class="portlet-body form">
  34 + <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
  35 + <!--<div class="alert alert-danger display-hide">-->
  36 + <!--<button class="close" data-close="alert"></button>-->
  37 + <!--您的输入有误，请检查下面的输入项-->
  38 + <!--</div>-->
  39 +
  40 +
  41 + <!-- 其他信息放置在这里 -->
  42 + <div class="form-body">
  43 + <div class="form-group has-success has-feedback">
  44 + <label class="col-md-2 control-label">线路*：</label>
  45 + <div class="col-md-3">
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.ttInfoManageForForm"
  48 + cmaps="{'xl.id' : 'id'}"
  49 + dcname="xl.id"
  50 + icname="id"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
  56 + required >
  57 + </sa-Select5>
  58 + </div>
  59 + <!-- 隐藏块，显示验证信息 -->
  60 + <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
  61 + 线路必须选择
  62 + </div>
  63 + </div>
  64 +
  65 + <div class="form-group has-success has-feedback">
  66 + <label class="col-md-2 control-label">线路走向*：</label>
  67 + <div class="col-md-3">
  68 + <sa-Radiogroup model="ctrl.ttInfoManageForForm.xlDir" dicgroup="LineTrend2" name="xlDir" required></sa-Radiogroup>
  69 + </div>
  70 + <!-- 隐藏块，显示验证信息 -->
  71 + <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
  72 + 线路走向必须填写
  73 + </div>
  74 + </div>
  75 +
  76 + <div class="form-group has-success has-feedback">
  77 + <label class="col-md-2 control-label">时刻表名字*：</label>
  78 + <div class="col-md-3">
  79 + <input type="text" class="form-control" ng-model="ctrl.ttInfoManageForForm.name"
  80 + name="name" placeholder="请输入时刻表名字..." required
  81 + remote-Validation
  82 + remotevtype="ttc1"
  83 + remotevparam="{{ {'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'name_eq': ctrl.ttInfoManageForForm.name} | json}}"
  84 + />
  85 + </div>
  86 +
  87 + <!-- 隐藏块，显示验证信息 -->
  88 + <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.required">
  89 + 时刻表名字必须填写
  90 + </div>
  91 + <div class="alert alert-danger well-sm" ng-show="myForm.name.$error.remote">
  92 + 相同线路下的时刻表不能同名
  93 + </div>
  94 + </div>
  95 +
  96 + <div class="form-group has-success has-feedback">
  97 + <label class="col-md-2 control-label">启用日期*：</label>
  98 + <div class="col-md-3">
  99 + <div class="input-group">
  100 + <input type="text" class="form-control"
  101 + name="qyrq" placeholder="请选择启用日期..."
  102 + uib-datepicker-popup="yyyy年MM月dd日"
  103 + is-open="ctrl.qyrqOpen"
  104 + ng-model="ctrl.ttInfoManageForForm.qyrq" readonly required/>
  105 + <span class="input-group-btn">
  106 + <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
  107 + <i class="glyphicon glyphicon-calendar"></i>
  108 + </button>
  109 + </span>
  110 + </div>
  111 + </div>
  112 +
  113 + <!-- 隐藏块，显示验证信息 -->
  114 + <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
  115 + 启用日期必须填写
  116 + </div>
  117 + </div>
  118 +
  119 + <div class="form-group has-success has-feedback">
  120 + <label class="col-md-2 control-label">是否启用*：</label>
  121 + <div class="col-md-3">
  122 + <sa-Radiogroup model="ctrl.ttInfoManageForForm.isEnableDisTemplate" dicgroup="truefalseType" name="isEnableDisTemplate" required></sa-Radiogroup>
  123 + </div>
  124 +
  125 + <!-- 隐藏块，显示验证信息 -->
  126 + <div class="alert alert-danger well-sm" ng-show="myForm.isEnableDisTemplate.$error.required">
  127 + 是否启用必须选择
  128 + </div>
  129 +
  130 + </div>
  131 +
  132 + <div class="form-group">
  133 + <label class="col-md-2 control-label">路牌数量：</label>
  134 + <div class="col-md-3">
  135 + <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"
  136 + name="lpCount" placeholder="请输入路牌数..." min="1"/>
  137 + </div>
  138 + <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">
  139 + 必须输入数字
  140 + </div>
  141 + <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">
  142 + 路爬数量必须大于1
  143 + </div>
  144 + </div>
  145 +
  146 + <div class="form-group">
  147 + <label class="col-md-2 control-label">营运圈数：</label>
  148 + <div class="col-md-3">
  149 + <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"
  150 + name="loopCount" placeholder="请输入圈数..." min="1"/>
  151 + </div>
  152 + <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">
  153 + 必须输入数字
  154 + </div>
  155 + <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">
  156 + 营运圈数必须大于1
  157 + </div>
  158 + </div>
  159 +
  160 + <div class="form-group">
  161 + <label class="col-md-2 control-label">常规有效日：</label>
  162 + <div class="col-md-6">
  163 + <sa-Checkboxgroup model="ctrl.ttInfoManageForForm"
  164 + name="rule_days"
  165 + dcvalue="{{ctrl.ttInfoManageForForm.rule_days}}"
  166 + dcname="rule_days"
  167 + required >
  168 + </sa-Checkboxgroup>
  169 + </div>
  170 + <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
  171 + 请操作一下1
  172 + </div>
  173 + </div>
  174 +
  175 + <div class="form-group">
  176 + <label class="col-md-2 control-label">特殊有效日：</label>
  177 + <div class="col-md-6">
  178 + <sa-Dategroup model="ctrl.ttInfoManageForForm"
  179 + name="special_days"
  180 + dcvalue="{{ctrl.ttInfoManageForForm.special_days}}"
  181 + dcname="special_days"
  182 + >
  183 + </sa-Dategroup>
  184 + </div>
  185 + <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
  186 + 请操作一下2
  187 + </div>
  188 + </div>
  189 +
  190 + <!--<div class="form-group">-->
  191 + <!--<label class="col-md-2 control-label">备注：</label>-->
  192 + <!--</div>-->
  193 +
  194 + <!-- 其他form-group -->
  195 +
  196 + </div>
  197 +
  198 + <!-- TODO：!myForm.$valid 在这里有点问题，改用以下方法验证 -->
  199 + <div class="form-actions">
  200 + <div class="row">
  201 + <div class="col-md-offset-3 col-md-4">
  202 + <button type="submit" class="btn green"
  203 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  204 + <a type="button" class="btn default" ui-sref="ttInfoManage" ><i class="fa fa-times"></i> 取消</a>
  205 + </div>
  206 + </div>
  207 + </div>
  208 +
  209 + </form>
  210 +
  211 + </div>
  212 +
  213 +
214 214 </div>
215 215 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/index.html
  View file @23890d8
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>时刻表管理2</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   -</ul>
20   -
21   -<div class="row">
22   - <div class="col-md-12" ng-controller="TtInfoManageIndexCtrl as ctrl">
23   - <div class="portlet light bordered">
24   - <div class="portlet-title">
25   - <div class="caption font-dark">
26   - <i class="fa fa-database font-dark"></i>
27   - <span class="caption-subject bold uppercase">时刻表</span>
28   - </div>
29   - <div class="actions">
30   - <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.toTtInfoManageForm()">
31   - <i class="fa fa-plus"></i>
32   - 添加时刻表
33   - </a>
34   -
35   - </div>
36   - </div>
37   -
38   - <div class="portlet-body">
39   - <div ui-view="ttInfoManage_list"></div>
40   - </div>
41   - </div>
42   - </div>
  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 +</ul>
  20 +
  21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="TtInfoManageIndexCtrl as ctrl">
  23 + <div class="portlet light bordered">
  24 + <div class="portlet-title">
  25 + <div class="caption font-dark">
  26 + <i class="fa fa-database font-dark"></i>
  27 + <span class="caption-subject bold uppercase">时刻表</span>
  28 + </div>
  29 + <div class="actions">
  30 + <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.toTtInfoManageForm()">
  31 + <i class="fa fa-plus"></i>
  32 + 添加时刻表
  33 + </a>
  34 +
  35 + </div>
  36 + </div>
  37 +
  38 + <div class="portlet-body">
  39 + <div ui-view="ttInfoManage_list"></div>
  40 + </div>
  41 + </div>
  42 + </div>
43 43 </div>
44 44 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
  View file @23890d8
... ... @@ -111,8 +111,8 @@
111 111 </dd>
112 112 </script>
113 113  
114   - <script id="line-schedule-sfsj-temp" type="text/html">
115   - <dd class="
  114 +<script id="line-schedule-sfsj-temp" type="text/html">
  115 +<dd class="
116 116 {{if status==-1}}
117 117 tl-qrlb
118 118 {{else if status==2}}
... ...
src/main/resources/static/real_control_v2/main.html
  View file @23890d8
... ... @@ -39,7 +39,7 @@
39 39 <div class="uk-width-4-10">
40 40 <div class="uk-panel">
41 41 <h2 class="north-logo">
42   - <i class="uk-icon-life-ring"></i> 闵行公交线路调度
  42 + <i class="uk-icon-life-ring"></i> 青浦公交线路调度
43 43 </h2>
44 44 </div>
45 45 </div>
... ...
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
  View file @23890d8
... ... @@ -58,7 +58,7 @@ public class DroolsRulesTest {
58 58 session.dispose();
59 59 }
60 60  
61   - @Test
  61 +// @Test
62 62 public void ttinfoDrlTest() throws Exception {
63 63 logger.info("------------ttinfoDrlTest 测试---------------");
64 64  
... ... @@ -133,7 +133,7 @@ public class DroolsRulesTest {
133 133  
134 134 }
135 135  
136   -// @Test
  136 + @Test
137 137 public void shiftloopDrlTest() throws Exception {
138 138 // 1、创建session，内部配置的是stateful
139 139 KieSession session = kieBase.newKieSession();
... ...