潘钊 / bsth_control · Commits

Commit 15f3c167d0778da46168d8823cef62ab7c08668a

Authored by ljq
1 parent 99d83382
build: skipped

验收的一些临加内容和一些bug修复

Inline Side-by-side
Showing 32 changed files with 1362 additions and 21 deletions
src/main/java/com/bsth/controller/lg_travel/RegionConterller.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.controller.lg_travel;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.lg_travel.Region;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +
  8 +/**
  9 + * 区域
  10 + */
  11 +
  12 +@RestController
  13 +@RequestMapping("region")
  14 +public class RegionConterller extends BaseController<Region, Long> {
  15 +
  16 +
  17 +}
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @15f3c16
@@ -130,7 +130,8 @@ public class PilotReport { @@ -130,7 +130,8 @@ public class PilotReport {
130 try { 130 try {
131 ScheduleRealInfo sch = null; 131 ScheduleRealInfo sch = null;
132 if (d80.getSchId() == null){ 132 if (d80.getSchId() == null){
133 - return; 133 + logger.info(nbbm+"-----车辆没有班次");
  134 + return;
134 } 135 }
135 if (d80.getData().getStopNo() != null && !d80.getData().getStopNo().equals("")){ 136 if (d80.getData().getStopNo() != null && !d80.getData().getStopNo().equals("")){
136 d80.setStationName(BasicData.stationCode2NameMap.get(d80.getData().getStopNo())); 137 d80.setStationName(BasicData.stationCode2NameMap.get(d80.getData().getStopNo()));
src/main/java/com/bsth/data/zndd/OutEntrance.java
  View file @15f3c16
@@ -161,6 +161,10 @@ public class OutEntrance { @@ -161,6 +161,10 @@ public class OutEntrance {
161 } 161 }
162 String num=jsonObject.getString("num"); 162 String num=jsonObject.getString("num");
163 int count=automaticSch.getPenum("DKL","0"); 163 int count=automaticSch.getPenum("DKL","0");
  164 + if(Integer.parseInt(num)<count){
  165 + rtn.put("status",ResponseCode.SUCCESS);
  166 + return rtn;
  167 + }
164 String image=jsonObject.getString("image"); 168 String image=jsonObject.getString("image");
165 String img=uploadBase64Img(image); 169 String img=uploadBase64Img(image);
166 JSONArray jsonArray = jsonObject.getJSONArray("stations"); 170 JSONArray jsonArray = jsonObject.getJSONArray("stations");
src/main/java/com/bsth/entity/Cars.java
  View file @15f3c16
1 package com.bsth.entity; 1 package com.bsth.entity;
2 2
3 import com.bsth.entity.schedule.BEntity; 3 import com.bsth.entity.schedule.BEntity;
  4 +import com.fasterxml.jackson.annotation.JsonIgnore;
4 import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 5 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5 import org.hibernate.annotations.Formula; 6 import org.hibernate.annotations.Formula;
6 7
@@ -145,6 +146,24 @@ public class Cars extends BEntity implements Serializable { @@ -145,6 +146,24 @@ public class Cars extends BEntity implements Serializable {
145 /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */ 146 /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
146 private String xlmc; 147 private String xlmc;
147 148
  149 +
  150 + //** 车辆颜色 *//*
  151 + @Transient
  152 + @JsonIgnore
  153 + private String color;
  154 + //** 车辆最大乘坐人数 *//*
  155 + @Transient
  156 + @JsonIgnore
  157 + private String maxPeople;
  158 + //** 票价类型 *//*
  159 + @Transient
  160 + @JsonIgnore
  161 + private String priceType;
  162 + //** 票价 *//*
  163 + @Transient
  164 + @JsonIgnore
  165 + private String price;
  166 +
148 public Cars() {} 167 public Cars() {}
149 168
150 public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) { 169 public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
@@ -164,7 +183,40 @@ public class Cars extends BEntity implements Serializable { @@ -164,7 +183,40 @@ public class Cars extends BEntity implements Serializable {
164 this.equipmentCode = sbbh.toString(); 183 this.equipmentCode = sbbh.toString();
165 } 184 }
166 } 185 }
167 - 186 +
  187 +
  188 + public String getColor() {
  189 + return color;
  190 + }
  191 +
  192 + public void setColor(String color) {
  193 + this.color = color;
  194 + }
  195 +
  196 + public String getMaxPeople() {
  197 + return maxPeople;
  198 + }
  199 +
  200 + public void setMaxPeople(String maxPeople) {
  201 + this.maxPeople = maxPeople;
  202 + }
  203 +
  204 + public String getPriceType() {
  205 + return priceType;
  206 + }
  207 +
  208 + public void setPriceType(String priceType) {
  209 + this.priceType = priceType;
  210 + }
  211 +
  212 + public String getPrice() {
  213 + return price;
  214 + }
  215 +
  216 + public void setPrice(String price) {
  217 + this.price = price;
  218 + }
  219 +
168 public String getServiceNo() { 220 public String getServiceNo() {
169 return serviceNo; 221 return serviceNo;
170 } 222 }
src/main/java/com/bsth/entity/directive/D80.java
  View file @15f3c16
@@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
6 import javax.persistence.*; 6 import javax.persistence.*;
7 import java.util.Date; 7 import java.util.Date;
8 8
9 -import static javax.persistence.FetchType.LAZY;  
10 -  
11 /** 9 /**
12 * 10 *
13 * @ClassName: D80 11 * @ClassName: D80
@@ -49,7 +47,7 @@ public class D80 { @@ -49,7 +47,7 @@ public class D80 {
49 /** 47 /**
50 * c0 回复 48 * c0 回复
51 */ 49 */
52 - @OneToOne(cascade = CascadeType.ALL, fetch= LAZY) 50 + @OneToOne(cascade = CascadeType.ALL, fetch=FetchType.LAZY)
53 private DC0 c0; 51 private DC0 c0;
54 52
55 /** 调度员是否确认 */ 53 /** 调度员是否确认 */
src/main/java/com/bsth/entity/lg_travel/Region.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.entity.lg_travel;
  2 +
  3 +import com.bsth.entity.schedule.BEntity;
  4 +
  5 +import javax.persistence.Entity;
  6 +import javax.persistence.Id;
  7 +import javax.persistence.Table;
  8 +import java.io.Serializable;
  9 +
  10 +/**
  11 + * 区域
  12 + */
  13 +@Entity
  14 +@Table(name = "bsth_c_region")
  15 +public class Region extends BEntity implements Serializable {
  16 + @Id
  17 + private Long id;
  18 + //区域名称
  19 + private String name;
  20 + //是否删除
  21 + private String destroy;
  22 +
  23 +
  24 +
  25 +
  26 + public void setId(Long id) {
  27 + this.id = id;
  28 + }
  29 +
  30 + public Long getId() {
  31 + return id;
  32 + }
  33 +
  34 + public String getName() {
  35 + return name;
  36 + }
  37 +
  38 + public void setName(String name) {
  39 + this.name = name;
  40 + }
  41 +
  42 + public String getDestroy() {
  43 + return destroy;
  44 + }
  45 +
  46 + public void setDestroy(String destroy) {
  47 + this.destroy = destroy;
  48 + }
  49 +}
0 \ No newline at end of file 50 \ No newline at end of file
src/main/java/com/bsth/entity/lg_travel/RegionLineCar.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.entity.lg_travel;
  2 +
  3 +import com.bsth.entity.Line;
  4 +import com.bsth.entity.schedule.BEntity;
  5 +
  6 +import javax.persistence.*;
  7 +import java.io.Serializable;
  8 +
  9 +/**
  10 + * 区域
  11 + */
  12 +@Entity
  13 +@Table(name = "bsth_c_region_line_car")
  14 +public class RegionLineCar extends BEntity implements Serializable {
  15 + @Id
  16 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  17 + private Long id;
  18 + //区域名称
  19 + @ManyToOne
  20 + private Region region;
  21 + //线路
  22 + @ManyToOne
  23 + private Line line;
  24 + //线路名称
  25 + private String lineName;
  26 + //车辆自编号
  27 + private String clZbh;
  28 +
  29 + public Long getId() {
  30 + return id;
  31 + }
  32 +
  33 + public void setId(Long id) {
  34 + this.id = id;
  35 + }
  36 +
  37 +
  38 + public Region getRegion() {
  39 + return region;
  40 + }
  41 +
  42 + public void setRegion(Region region) {
  43 + this.region = region;
  44 + }
  45 +
  46 + public Line getLine() {
  47 + return line;
  48 + }
  49 +
  50 + public void setLine(Line line) {
  51 + this.line = line;
  52 + }
  53 +
  54 + public String getLineName() {
  55 + return lineName;
  56 + }
  57 +
  58 + public void setLineName(String lineName) {
  59 + this.lineName = lineName;
  60 + }
  61 +
  62 + public String getClZbh() {
  63 + return clZbh;
  64 + }
  65 +
  66 + public void setClZbh(String clZbh) {
  67 + this.clZbh = clZbh;
  68 + }
  69 +
  70 +
  71 +}
0 \ No newline at end of file 72 \ No newline at end of file
src/main/java/com/bsth/repository/lg_travel/RegionLineCarRepository.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.repository.lg_travel;
  2 +
  3 +
  4 +import com.bsth.entity.lg_travel.RegionLineCar;
  5 +import com.bsth.repository.BaseRepository;
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +@Repository
  9 +public interface RegionLineCarRepository extends BaseRepository<RegionLineCar, Long> {
  10 +}
src/main/java/com/bsth/repository/lg_travel/RegionRepository.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.repository.lg_travel;
  2 +
  3 +
  4 +import com.bsth.entity.lg_travel.Region;
  5 +import com.bsth.repository.BaseRepository;
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +@Repository
  9 +public interface RegionRepository extends BaseRepository<Region, Long> {
  10 +}
src/main/java/com/bsth/service/lg_travel/RegionLineCarService.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.service.lg_travel;
  2 +
  3 +import com.bsth.entity.lg_travel.RegionLineCar;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +public interface RegionLineCarService extends BaseService<RegionLineCar, Long> {
  7 +}
src/main/java/com/bsth/service/lg_travel/RegionService.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.service.lg_travel;
  2 +
  3 +import com.bsth.entity.lg_travel.Region;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +public interface RegionService extends BaseService<Region, Long> {
  7 +}
src/main/java/com/bsth/service/lg_travel/impl/RegionLineCarServiceImpl.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.service.lg_travel.impl;
  2 +
  3 +
  4 +import com.bsth.entity.lg_travel.RegionLineCar;
  5 +import com.bsth.service.impl.BaseServiceImpl;
  6 +import com.bsth.service.lg_travel.RegionLineCarService;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +@Service
  10 +public class RegionLineCarServiceImpl extends BaseServiceImpl<RegionLineCar, Long> implements RegionLineCarService {
  11 +
  12 +
  13 +
  14 +}
src/main/java/com/bsth/service/lg_travel/impl/RegionServiceImpl.java 0 → 100644
  View file @15f3c16
  1 +package com.bsth.service.lg_travel.impl;
  2 +
  3 +
  4 +import com.bsth.entity.lg_travel.Region;
  5 +import com.bsth.service.impl.BaseServiceImpl;
  6 +import com.bsth.service.lg_travel.RegionService;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +@Service
  10 +public class RegionServiceImpl extends BaseServiceImpl<Region, Long> implements RegionService {
  11 +
  12 +
  13 +
  14 +}
src/main/resources/fatso/start.js
  View file @15f3c16
@@ -16,7 +16,7 @@ var platform = process.platform; @@ -16,7 +16,7 @@ var platform = process.platform;
16 var iswin = platform == 'win32'; 16 var iswin = platform == 'win32';
17 var sp = platform == 'win32' ? '\\' : '/'; 17 var sp = platform == 'win32' ? '\\' : '/';
18 //不参与的目录 18 //不参与的目录
19 -var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','call'] 19 +var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','call','base' + sp + 'region',]
20 , ep = new EventProxy() 20 , ep = new EventProxy()
21 , pName = 'bsth_control' 21 , pName = 'bsth_control'
22 , path = process.cwd() 22 , path = process.cwd()
src/main/resources/static/pages/base/region/add.html 0 → 100644
  View file @15f3c16
  1 +<!-- 片段标题 START -->
  2 +<div class="page-head">
  3 + <div class="page-title">
  4 + <h1>添加公司</h1>
  5 + </div>
  6 +</div>
  7 +<!-- 片段标题 END -->
  8 +
  9 +<!-- 公司信息导航栏组件 START -->
  10 +<ul class="page-breadcrumb breadcrumb">
  11 + <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  12 + <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
  13 + <li><a href="/pages/base/company/list.html" data-pjax>区域</a> <i class="fa fa-circle"></i></li>
  14 + <li><span class="active">添加区域</span></li>
  15 +</ul>
  16 +<!-- 公司信息导航栏组件 END -->
  17 +
  18 +<!-- 信息容器组件 START -->
  19 +<div class="portlet light bordered">
  20 +
  21 + <!-- 信息容器组件标题 START -->
  22 + <div class="portlet-title">
  23 + <div class="caption">
  24 + <i class="icon-equalizer font-red-sunglo"></i>
  25 + <span class="caption-subject font-red-sunglo bold uppercase">添加区域</span>
  26 + </div>
  27 + </div>
  28 + <!-- 信息容器组件标题 END -->
  29 +
  30 + <!-- 表单容器组件 START -->
  31 + <div class="portlet-body form">
  32 +
  33 + <!-- comp_add_form FORM START -->
  34 + <form action="/line" class="form-horizontal" id="region_add_form" >
  35 +
  36 + <!-- 表单验证错误提示组件 START -->
  37 + <div class="alert alert-danger display-hide">
  38 + <button class="close" data-close="alert"></button>
  39 + 您的输入有误，请检查下面的输入项
  40 + </div>
  41 + <!-- 表单验证错误提示组件 END -->
  42 +
  43 + <!-- 表单字段内容 START -->
  44 + <div class="form-body">
  45 + <!-- 表单分组组件 form-group START -->
  46 + <div class="form-group">
  47 + <!-- 公司编码 (* 必填项) START -->
  48 + <div class="col-md-9">
  49 + <label class="control-label col-md-5">
  50 + <span class="required"> * </span>区域名称：
  51 + </label>
  52 + <div class="col-md-4">
  53 + <input type="text" class="form-control" name="name" id="name" placeholder="公司编码">
  54 + </div>
  55 + </div>
  56 + <!-- 公司编码 (* 必填项) END -->
  57 + </div>
  58 + <!-- 表单分组组件 form-group END -->
  59 +
  60 + </div>
  61 + <!-- 表单字段内容 END -->
  62 +
  63 + <!-- 表单按钮组件 START -->
  64 + <div class="form-actions">
  65 + <div class="row">
  66 + <div class="col-md-offset-3 col-md-4">
  67 + <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
  68 + <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
  69 + </div>
  70 + </div>
  71 + </div>
  72 + <!-- 表单按钮组件 END -->
  73 + </form>
  74 + <!-- comp_add_form FORM END -->
  75 + </div>
  76 + <!-- 表单组件 END -->
  77 +</div>
  78 +<!-- 信息容器组件 END -->
  79 +<!-- 公司信息添加片段JS模块 -->
  80 +<script src="/pages/base/region/js/region_add.js"></script>
0 \ No newline at end of file 81 \ No newline at end of file
src/main/resources/static/pages/base/region/js/region_add.js 0 → 100644
  View file @15f3c16
  1 +/**
  2 + * @description TODO(区域信息添加片段JS模块)
  3 + *
  4 + * @author bsth@lq
  5 + *
  6 + * @date 二〇一六年十月十八日 13:31:58
  7 + *
  8 + */
  9 +
  10 +$(function(){
  11 + // 定义表单
  12 + var form = $('#region_add_form');
  13 + // 定义表单异常
  14 + var error = $('.alert-danger',form);
  15 + // 表单验证
  16 + form.validate({
  17 + // 错误提示元素span对象
  18 + errorElement : 'span',
  19 + // 错误提示元素class名称
  20 + errorClass : 'help-block help-block-error',
  21 + // 验证错误获取焦点
  22 + focusInvalid : true,
  23 + // 需要验证的表单元素
  24 + rules : {
  25 +
  26 + // 区域名称
  27 + 'name' : {
  28 + // 必填项
  29 + required : true,
  30 + // 最大长度
  31 + maxlength: 30
  32 + },
  33 + },
  34 + /**
  35 + * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。
  36 + *
  37 + * 参数：该回调函数有两个参数：第一个为一个事件对象，第二个为验证器（validator）
  38 + */
  39 + invalidHandler : function(event, validator) {
  40 + // 显示表单未通过提示信息
  41 + error.show();
  42 + // 把提示信息放到指定的位置。
  43 + App.scrollTo(error, -200);
  44 + },
  45 + /**
  46 + * 类型：Callback。
  47 + *
  48 + * 默认：添加errorClass("has-error")到表单元素。将未通过验证的表单元素设置高亮。
  49 + */
  50 + highlight : function(element) {
  51 + // 添加errorClass("has-error")到表单元素
  52 + $(element).closest('.form-group').addClass('has-error');
  53 +
  54 + },
  55 + /**
  56 + * 类型：Callback。
  57 + *
  58 + * 默认：移除errorClass("has-error")。与highlight操作相反
  59 + */
  60 + unhighlight : function(element) {
  61 + // 移除errorClass("has-error")
  62 + $(element).closest('.form-group').removeClass('has-error');
  63 +
  64 + },
  65 + /**
  66 + * 类型：String,Callback。
  67 + *
  68 + * 如果指定它，当验证通过时显示一个消息。
  69 + *
  70 + * 如果是String类型的，则添加该样式到标签中；
  71 + *
  72 + * 如果是一个回调函数，则将标签作为其唯一的参数。
  73 + */
  74 + success : function(label) {
  75 + // 当验证通过时,移除errorClass("has-error")
  76 + label.closest('.form-group').removeClass('has-error');
  77 + },
  78 +
  79 + /**
  80 + * 类型：Callback。
  81 + *
  82 + * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
  83 + */
  84 + submitHandler : function(f) {
  85 + // 隐藏错误提示
  86 + error.hide();
  87 + // 表单序列化
  88 + var params = form.serializeJSON();
  89 + // 提交
  90 + // 防止用户多次提交
  91 + $("#submintBtn").addClass("disabled");
  92 + // 添加数据
  93 + $post('/region', params, function(result) {
  94 + // 如果返回结果不为空
  95 + if(result){
  96 + // 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
  97 + if(result.status=='SUCCESS') {
  98 + // 弹出添加成功提示消息
  99 + layer.msg('添加成功...');
  100 + } else if(result.status=='ERROR') {
  101 + // 弹出添加失败提示消息
  102 + layer.msg('添加失败...');
  103 + }
  104 + }
  105 + // 返回list.html页面
  106 + loadPage('list.html');
  107 + });
  108 + $("#submintBtn").removeClass("disabled");
  109 +
  110 + }
  111 + });
  112 +});
0 \ No newline at end of file 113 \ No newline at end of file
src/main/resources/static/pages/base/region/js/region_list.js 0 → 100644
  View file @15f3c16
  1 +/**
  2 + *
  3 + * @JSName : list.js(区域list.html页面js)
  4 + *
  5 + * @Author : bsth@lq
  6 + *
  7 + * @Description : TODO区域.html页面js)
  8 + *
  9 + *
  10 + */
  11 +
  12 +(function(){
  13 + // 关闭左侧栏
  14 + if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
  15 +
  16 + /** page : 当前页 initPag : */
  17 + var page = 0,initPag;
  18 + /** 表格数据分页加载 */
  19 + loadTableDate(null,true);
  20 + function getParams() {
  21 + // cells 集合返回表格中所有（列）单元格的一个数组
  22 + var cells = $('tr.filter')[0].cells;
  23 + // 搜索参数集合
  24 + var params = {};
  25 + // 搜索字段名称
  26 + var name;
  27 + // 遍历cells数组
  28 + $.each(cells, function(i, cell){
  29 + // 获取第i列的input或者select集合
  30 + var items = $('input,select', cell);
  31 + // 遍历items集合
  32 + for(var j = 0, item; item = items[j++];){
  33 + // 获取字段名称
  34 + name = $(item).attr('name');
  35 + if(name){
  36 + // 赋取相对应的值
  37 + params[name] = $(item).val();
  38 + }
  39 + }
  40 + });
  41 + if(params.parkName_like=='请选择...')
  42 + params.parkName_like = '';
  43 + else
  44 + params.parkName_like = params.parkName_like.split('_')[0];
  45 + return params;
  46 + }
  47 +
  48 + /**
  49 + * 表格数据分页加载事件
  50 + *
  51 + * ------@param : 查询参数
  52 + *
  53 + * ------@isPon : 是否重新分页
  54 + *
  55 + */
  56 + function loadTableDate(param,isPon){
  57 + // 搜索参数
  58 + var params = {};
  59 + if(param) {
  60 + params = param;
  61 + }
  62 + // 排序（按更新时间）
  63 + params['order'] = 'id';
  64 + // 记录当前页数
  65 + params['page'] = page;
  66 + // 弹出正在加载层
  67 + var i = layer.load(2);
  68 +
  69 + // 异步请求获取表格数据
  70 + $.get('/region',params,function(result){
  71 + // 添加序号
  72 + result.content.page = page;
  73 +
  74 + // 把数据填充到模版中
  75 + var tbodyHtml = template('region_list_table_temp',{list:result.content});
  76 + $('#datatable_region tbody').html(tbodyHtml);
  77 + // 是重新分页且返回数据长度大于0
  78 + if(isPon && result.content.length > 0){
  79 + // 重新分页
  80 + initPag = true;
  81 + // 分页栏
  82 + showPagination(result);
  83 + }
  84 + // 关闭弹出加载层
  85 + layer.close(i);
  86 + });
  87 +
  88 + }
  89 +
  90 + /** 分页栏组件 */
  91 + function showPagination(data){
  92 + // 分页组件
  93 + $('#pagination').jqPaginator({
  94 + // 总页数
  95 + totalPages: data.totalPages,
  96 + // 中间显示页数
  97 + visiblePages: 6,
  98 + // 当前页
  99 + currentPage: page + 1,
  100 + first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
  101 + prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
  102 + next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
  103 + last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
  104 + page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
  105 + onPageChange: function (num, type) {
  106 + if(initPag){
  107 + initPag = false;
  108 + return;
  109 + }
  110 + var pData = getParams();
  111 + page = num - 1;
  112 + loadTableDate(pData, false);
  113 + }
  114 + });
  115 + }
  116 +})();
0 \ No newline at end of file 117 \ No newline at end of file
src/main/resources/static/pages/base/region/list.html 0 → 100644
  View file @15f3c16
  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><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  9 + <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
  10 + <li><span class="active">区域信息</span></li>
  11 +</ul>
  12 +
  13 +<div class="row">
  14 + <div class="col-md-12">
  15 + <div class="portlet light porttlet-fit bordered">
  16 + <div class="portlet-title">
  17 + <div class="caption">
  18 + <i class="fa fa-info-circle font-dark"></i>
  19 + <span class="caption-subject font-dark sbold uppercase">区域信息</span>
  20 + </div>
  21 + <div class="actions">
  22 + <div class="btn-group btn-group-devided" data-toggle="buttons">
  23 + <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加区域</a>
  24 + </div>
  25 + </div>
  26 + </div>
  27 + <div class="portlet-body">
  28 + <div class="table-container" style="margin-top: 10px">
  29 + <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_region">
  30 + <thead>
  31 + <tr role="row" class="heading">
  32 + <th width="3%">序号</th>
  33 + <th width="12%">区域</th>
  34 + <th width="6%">是否撤销</th>
  35 + <th width="10%">操作</th>
  36 + </tr>
  37 + <tr role="row" class="filter">
  38 + <td>#</td>
  39 + <td>#</td>
  40 + <td>#</td>
  41 + <td>
  42 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
  43 + <i class="fa fa-search"></i> 搜索
  44 + </button>
  45 +
  46 + <button class="btn btn-sm red btn-outline filter-cancel">
  47 + <i class="fa fa-times"></i> 重置
  48 + </button>
  49 + </td>
  50 + </tr>
  51 + </thead>
  52 + <tbody></tbody>
  53 + </table>
  54 + <div style="text-align: right;">
  55 + <ul id="pagination" class="pagination"></ul>
  56 + </div>
  57 + </div>
  58 + </div>
  59 + </div>
  60 + </div>
  61 +</div>
  62 +
  63 +<script type="text/html" id="region_list_table_temp">
  64 + {{each list as obj i }}
  65 + <tr>
  66 + <td style="vertical-align: middle;">
  67 + {{(list.page*10)+(i+1)}}
  68 + </td>
  69 + <td>
  70 + {{obj.name}}
  71 + </td>
  72 +
  73 + <td>
  74 + {{if obj.destroy == 1}}
  75 + <span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
  76 + {{else if obj.destroy == 0}}
  77 + <span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
  78 + {{/if}}
  79 + </td>
  80 + <td>
  81 + <a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
  82 + {{if obj.destroy==1}}
  83 + <a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
  84 + {{/if}}
  85 + </td>
  86 + </tr>
  87 + {{/each}}
  88 + {{if list.length == 0}}
  89 + <tr>
  90 + <td colspan=10><h6 class="muted">没有找到相关数据</h6></td>
  91 + </tr>
  92 + {{/if}}
  93 +</script>
  94 +<script src="/pages/base/region/js/region_list.js"></script>
0 \ No newline at end of file 95 \ No newline at end of file
src/main/resources/static/pages/base/region_line_car/add.html 0 → 100644
  View file @15f3c16
  1 +<!-- 片段标题 START -->
  2 +<div class="page-head">
  3 + <div class="page-title">
  4 + <h1>添加公司</h1>
  5 + </div>
  6 +</div>
  7 +<!-- 片段标题 END -->
  8 +
  9 +<!-- 公司信息导航栏组件 START -->
  10 +<ul class="page-breadcrumb breadcrumb">
  11 + <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  12 + <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
  13 + <li><a href="/pages/base/company/list.html" data-pjax>区域</a> <i class="fa fa-circle"></i></li>
  14 + <li><span class="active">添加区域</span></li>
  15 +</ul>
  16 +<!-- 公司信息导航栏组件 END -->
  17 +
  18 +<!-- 信息容器组件 START -->
  19 +<div class="portlet light bordered">
  20 +
  21 + <!-- 信息容器组件标题 START -->
  22 + <div class="portlet-title">
  23 + <div class="caption">
  24 + <i class="icon-equalizer font-red-sunglo"></i>
  25 + <span class="caption-subject font-red-sunglo bold uppercase">添加区域</span>
  26 + </div>
  27 + </div>
  28 + <!-- 信息容器组件标题 END -->
  29 +
  30 + <!-- 表单容器组件 START -->
  31 + <div class="portlet-body form">
  32 +
  33 + <!-- comp_add_form FORM START -->
  34 + <form action="/line" class="form-horizontal" id="region_line_car_add_form" >
  35 +
  36 + <!-- 表单验证错误提示组件 START -->
  37 + <div class="alert alert-danger display-hide">
  38 + <button class="close" data-close="alert"></button>
  39 + 您的输入有误，请检查下面的输入项
  40 + </div>
  41 + <!-- 表单验证错误提示组件 END -->
  42 +
  43 +
  44 + <!-- 表单字段内容 START -->
  45 + <div class="form-body">
  46 + <!-- 表单分组组件 form-group START -->
  47 + <div class="form-group">
  48 + <!-- 公司编码 (* 必填项) START -->
  49 + <div class="col-md-9">
  50 + <label class="control-label col-md-5">
  51 + <span class="required"> * </span>区域名称：
  52 + </label>
  53 + <div class="col-md-4">
  54 + <select name="region" class="form-control" style="width:100%" id="regionSelect"></select>
  55 + </div>
  56 + </div>
  57 + </div>
  58 + </div>
  59 +
  60 + <div class="form-body">
  61 + <div class="form-group">
  62 + <div class="col-md-9">
  63 + <label class="control-label col-md-5">
  64 + <span class="required"> * </span> 线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; :
  65 + </label>
  66 + <div class="col-md-4">
  67 + <select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
  68 + </div>
  69 + </div>
  70 + </div>
  71 + </div>
  72 +
  73 + <div class="form-body">
  74 + <!-- 表单分组组件 form-group START -->
  75 + <div class="form-group">
  76 + <!-- 公司编码 (* 必填项) START -->
  77 + <div class="col-md-9">
  78 + <label class="control-label col-md-5">
  79 + <span class="required"> * </span>车辆：
  80 + </label>
  81 + <div class="col-md-4">
  82 + <select name="car" class="form-control" style="width:100%" id="carSelect"></select>
  83 + </div>
  84 + </div>
  85 + <!-- 公司编码 (* 必填项) END -->
  86 + </div>
  87 + <!-- 表单分组组件 form-group END -->
  88 +
  89 + </div>
  90 + <!-- 表单按钮组件 START -->
  91 + <div class="form-actions">
  92 + <div class="row">
  93 + <div class="col-md-offset-3 col-md-4">
  94 + <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
  95 + <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
  96 + </div>
  97 + </div>
  98 + </div>
  99 + <!-- 表单按钮组件 END -->
  100 + </form>
  101 + <!-- comp_add_form FORM END -->
  102 + </div>
  103 + <!-- 表单组件 END -->
  104 +</div>
  105 +<!-- 信息容器组件 END -->
  106 +<!-- 公司信息添加片段JS模块 -->
  107 +<script src="/pages/base/region_line_car/js/region_add.js"></script>
0 \ No newline at end of file 108 \ No newline at end of file
src/main/resources/static/pages/base/region_line_car/js/region_add.js 0 → 100644
  View file @15f3c16
  1 +/**
  2 + * @description TODO(区域信息添加片段JS模块)
  3 + *
  4 + * @author bsth@lq
  5 + *
  6 + * @date 二〇一六年十月十八日 13:31:58
  7 + *
  8 + */
  9 +
  10 +$(function(){
  11 + storage = window.localStorage;
  12 +
  13 + // 营运公司Map[key(businessCode)] = 名字
  14 + var companyMap = new Map();
  15 + // 分公司Map[key(upCode+_+businessCode)] = 名字
  16 + var branchMap = new Map();
  17 + initCompanySelect2(function(array) {
  18 + $.each(array, function() {
  19 + companyMap[this.businessCode] = this.businessName;
  20 + // companyMap.put(this.businessCode.toString(), this.businessName);
  21 + if(this.businessCode != null || this.businessCode !=''){
  22 + /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
  23 + $get('/business/all', {upCode_eq: this.businessCode}, function(array){
  24 + // 遍历array
  25 + $.each(array, function(i,d){
  26 + branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
  27 + // branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
  28 + });
  29 + });
  30 + }
  31 + });
  32 + // 公司下拉options属性值
  33 + var options = '<option value="">请选择...</option>';
  34 + // 遍历array
  35 + $.each(array, function(i,d){
  36 + options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
  37 + });
  38 + // 初始化公司下拉框并监听值改变事件.
  39 + $('#companySelect').html(options).on('change', setBrancheCompanySelectOptions);
  40 + // 初始化分公司下拉框.
  41 + setBrancheCompanySelectOptions();
  42 + initLineSelect2(array);
  43 +
  44 + });
  45 +
  46 + function initCompanySelect2(cb) {
  47 + // get请求获取公司
  48 + $get('/business/all', {upCode_eq: '88'}, function(gs_d){
  49 + return cb && cb(gs_d);
  50 + });
  51 + }
  52 + function getComp(cb) {
  53 + $.get('/user/companyData',null,function(rs) {
  54 + return cb && cb(rs);
  55 + });
  56 + }
  57 + /** 填充分公司下拉框选择值 */
  58 + function setBrancheCompanySelectOptions(){
  59 + // 获取公司下拉框选择值
  60 + var businessCode = $('#companySelect').val();
  61 + // 分公司下拉框options属性值
  62 + var options = '<option value="">请选择...</option>';
  63 + // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
  64 + if(businessCode == null || businessCode ==''){
  65 + // 填充分公司下拉框options
  66 + $('#brancheCompanySelect').html(options);
  67 + } else {
  68 + /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
  69 + $get('/business/all', {upCode_eq: businessCode}, function(array){
  70 + // 遍历array
  71 + $.each(array, function(i,d){
  72 + options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
  73 + // 填充分公司下拉框options
  74 + $('#brancheCompanySelect').html(options);
  75 + });
  76 + });
  77 + }
  78 + };
  79 + function initLineSelect2(compD) {
  80 + getComp(function(rs) {
  81 + var params = {};
  82 + if(rs.length>0) {
  83 + var compA = new Array();
  84 + for(var c = 0 ; c<rs.length;c++) {
  85 + var comC = rs[c].companyCode;
  86 + var child = rs[c].children;
  87 + if(child.length>0) {
  88 + for(var d = 0 ;d< child.length;d++) {
  89 + compA.push(comC + '_' + child[d].code);
  90 + }
  91 + }else {
  92 + compA.push(comC);
  93 + }
  94 + }
  95 + params.cgsbm_in = compA.toString();
  96 + }
  97 + // 填充线路拉框选择值
  98 + $get('/line/all', params, function(array){
  99 + var len_ = array.length,paramsD = new Array();
  100 + if(len_>0) {
  101 + $.each(array, function(i, g){
  102 + if(g.name!='' || g.name != null) {
  103 + paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
  104 + }
  105 + });
  106 + initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
  107 + selector.select2("val", storage.xlName_AgursData);
  108 + });
  109 + }
  110 + });
  111 +
  112 +
  113 + // 填充车辆拉框选择值
  114 + $get('/cars/all', params, function(array){
  115 + var len_ = array.length,paramsD = new Array();
  116 + if(len_>0) {
  117 + $.each(array, function(i, g){
  118 + if(g.name!='' || g.name != null) {
  119 +
  120 + paramsD.push({'id':g.insideCode,'text':g.insideCode + gsdmTogsName(compD,g.company)});
  121 + }
  122 + });
  123 + initPinYinSelect2($('#carSelect'),paramsD,function(selector) {
  124 + });
  125 + }
  126 + });
  127 +
  128 +
  129 + // 填充车辆拉框选择值
  130 + $get('/region/all', null, function(array){
  131 + var len_ = array.length,paramsD = new Array();
  132 + if(len_>0) {
  133 + $.each(array, function(i, g){
  134 + paramsD.push({'id':g.id ,'text':g.name});
  135 + });
  136 +
  137 + initPinYinSelect2($('#regionSelect'),paramsD,function(selector) {});
  138 + }
  139 + });
  140 +
  141 +
  142 + });
  143 + };
  144 + function gsdmTogsName(gsD,code) {
  145 + var rsStr = '';
  146 + for(var s = 0 ; s < gsD.length; s++) {
  147 + if(gsD[s].businessCode == code) {
  148 + rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
  149 + break;
  150 + }
  151 + }
  152 + return rsStr;
  153 + }
  154 +
  155 +
  156 + // 定义表单
  157 + var form = $('#region_line_car_add_form');
  158 + // 定义表单异常
  159 + var error = $('.alert-danger',form);
  160 + // 表单验证
  161 + form.validate({
  162 + submitHandler : function(f) {
  163 + // 隐藏错误提示
  164 + error.hide();
  165 + // 表单序列化
  166 + var params = form.serializeJSON();
  167 + debugger
  168 +
  169 + let data = {
  170 + region : params.region
  171 + };
  172 + if (params.line != null){
  173 + let line = params.line.split("_");
  174 + data['line'] =line[1];
  175 + data['lineName'] =line[0];
  176 + }
  177 + if (params.car != null){
  178 + data['clZbh'] =params.car;
  179 + }
  180 +
  181 +
  182 +
  183 +
  184 +
  185 + // 提交
  186 +
  187 + // 防止用户多次提交
  188 + $("#submintBtn").addClass("disabled");
  189 + // 添加数据
  190 + $post('/regionLineCar', data, function(result) {
  191 + // 如果返回结果不为空
  192 + if(result){
  193 + // 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
  194 + if(result.status=='SUCCESS') {
  195 + // 弹出添加成功提示消息
  196 + layer.msg('添加成功...');
  197 + } else if(result.status=='ERROR') {
  198 + // 弹出添加失败提示消息
  199 + layer.msg('添加失败...');
  200 + }
  201 + }
  202 + // 返回list.html页面
  203 + loadPage('list.html');
  204 + });
  205 + $("#submintBtn").removeClass("disabled");
  206 +
  207 + }
  208 + });
  209 +
  210 +});
  211 +
  212 +
src/main/resources/static/pages/base/region_line_car/js/region_list.js 0 → 100644
  View file @15f3c16
  1 +/**
  2 + *
  3 + * @JSName : list.js(区域list.html页面js)
  4 + *
  5 + * @Author : bsth@lq
  6 + *
  7 + * @Description : TODO区域.html页面js)
  8 + *
  9 + *
  10 + */
  11 +
  12 +(function(){
  13 + // 关闭左侧栏
  14 + if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
  15 +
  16 + /** page : 当前页 initPag : */
  17 + var page = 0,initPag;
  18 + /** 表格数据分页加载 */
  19 + loadTableDate(null,true);
  20 + function getParams() {
  21 + // cells 集合返回表格中所有（列）单元格的一个数组
  22 + var cells = $('tr.filter')[0].cells;
  23 + // 搜索参数集合
  24 + var params = {};
  25 + // 搜索字段名称
  26 + var name;
  27 + // 遍历cells数组
  28 + $.each(cells, function(i, cell){
  29 + // 获取第i列的input或者select集合
  30 + var items = $('input,select', cell);
  31 + // 遍历items集合
  32 + for(var j = 0, item; item = items[j++];){
  33 + // 获取字段名称
  34 + name = $(item).attr('name');
  35 + if(name){
  36 + // 赋取相对应的值
  37 + params[name] = $(item).val();
  38 + }
  39 + }
  40 + });
  41 + if(params.parkName_like=='请选择...')
  42 + params.parkName_like = '';
  43 + else
  44 + params.parkName_like = params.parkName_like.split('_')[0];
  45 + return params;
  46 + }
  47 +
  48 + /**
  49 + * 表格数据分页加载事件
  50 + *
  51 + * ------@param : 查询参数
  52 + *
  53 + * ------@isPon : 是否重新分页
  54 + *
  55 + */
  56 + function loadTableDate(param,isPon){
  57 + // 搜索参数
  58 + var params = {};
  59 + if(param) {
  60 + params = param;
  61 + }
  62 + // 排序（按更新时间）
  63 + params['order'] = 'id';
  64 + // 记录当前页数
  65 + params['page'] = page;
  66 + // 弹出正在加载层
  67 + var i = layer.load(2);
  68 +
  69 + // 异步请求获取表格数据
  70 + $.get('/regionLineCar',params,function(result){
  71 + // 添加序号
  72 + result.content.page = page;
  73 + $.each(result.content, function(i, obj) {
  74 + obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
  75 + });
  76 + // 把数据填充到模版中
  77 + var tbodyHtml = template('region_line_car_list_table_temp',{list:result.content});
  78 +
  79 +
  80 + $('#datatable_region tbody').html(tbodyHtml);
  81 + // 是重新分页且返回数据长度大于0
  82 + if(isPon && result.content.length > 0){
  83 + // 重新分页
  84 + initPag = true;
  85 + // 分页栏
  86 + showPagination(result);
  87 + }
  88 + // 关闭弹出加载层
  89 + layer.close(i);
  90 + });
  91 +
  92 + }
  93 +
  94 + /** 分页栏组件 */
  95 + function showPagination(data){
  96 + // 分页组件
  97 + $('#pagination').jqPaginator({
  98 + // 总页数
  99 + totalPages: data.totalPages,
  100 + // 中间显示页数
  101 + visiblePages: 6,
  102 + // 当前页
  103 + currentPage: page + 1,
  104 + first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
  105 + prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
  106 + next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
  107 + last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
  108 + page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
  109 + onPageChange: function (num, type) {
  110 + if(initPag){
  111 + initPag = false;
  112 + return;
  113 + }
  114 + var pData = getParams();
  115 + page = num - 1;
  116 + loadTableDate(pData, false);
  117 + }
  118 + });
  119 + }
  120 +})();
0 \ No newline at end of file 121 \ No newline at end of file
src/main/resources/static/pages/base/region_line_car/list.html 0 → 100644
  View file @15f3c16
  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><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  9 + <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
  10 + <li><span class="active">区域信息</span></li>
  11 +</ul>
  12 +
  13 +<div class="row">
  14 + <div class="col-md-12">
  15 + <div class="portlet light porttlet-fit bordered">
  16 + <div class="portlet-title">
  17 + <div class="caption">
  18 + <i class="fa fa-info-circle font-dark"></i>
  19 + <span class="caption-subject font-dark sbold uppercase">区域信息</span>
  20 + </div>
  21 + <div class="actions">
  22 + <div class="btn-group btn-group-devided" data-toggle="buttons">
  23 + <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路车辆</a>
  24 + </div>
  25 + </div>
  26 + </div>
  27 + <div class="portlet-body">
  28 + <div class="table-container" style="margin-top: 10px">
  29 + <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_region">
  30 + <thead>
  31 + <tr role="row" class="heading">
  32 + <th width="3%">序号</th>
  33 + <th width="12%">区域</th>
  34 + <th width="6%">线路</th>
  35 + <th width="10%">车牌号</th>
  36 + <th width="10%">日期</th>
  37 + <th width="10%">操作</th>
  38 + </tr>
  39 + <tr role="row" class="filter">
  40 + <td>#</td>
  41 + <td>#</td>
  42 + <td>#</td>
  43 + <td>#</td>
  44 + <td>#</td>
  45 + <td>
  46 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
  47 + <i class="fa fa-search"></i> 搜索
  48 + </button>
  49 +
  50 + <button class="btn btn-sm red btn-outline filter-cancel">
  51 + <i class="fa fa-times"></i> 重置
  52 + </button>
  53 + </td>
  54 + </tr>
  55 + </thead>
  56 + <tbody></tbody>
  57 + </table>
  58 + <div style="text-align: right;">
  59 + <ul id="pagination" class="pagination"></ul>
  60 + </div>
  61 + </div>
  62 + </div>
  63 + </div>
  64 + </div>
  65 +</div>
  66 +
  67 +<script type="text/html" id="region_line_car_list_table_temp">
  68 + {{each list as obj i }}
  69 + <tr>
  70 + <td style="vertical-align: middle;">
  71 + {{(list.page*10)+(i+1)}}
  72 + </td>
  73 + <td>
  74 + {{obj.region.name}}
  75 + </td>
  76 + <td>
  77 + {{obj.lineName}}
  78 + </td>
  79 +
  80 + <td>
  81 + {{obj.clZbh}}
  82 + </td>
  83 + <td>
  84 + {{obj.createDate}}
  85 + </td>
  86 +
  87 + <td>
  88 + <a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
  89 + {{if obj.destroy==1}}
  90 + <a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
  91 + {{/if}}
  92 + </td>
  93 + </tr>
  94 + {{/each}}
  95 + {{if list.length == 0}}
  96 + <tr>
  97 + <td colspan=10><h6 class="muted">没有找到相关数据</h6></td>
  98 + </tr>
  99 + {{/if}}
  100 +</script>
  101 +<script src="/pages/base/region_line_car/js/region_list.js"></script>
0 \ No newline at end of file 102 \ No newline at end of file
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrate.html
  View file @15f3c16
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 28
29 <div class="page-head"> 29 <div class="page-head">
30 <div class="page-title"> 30 <div class="page-title">
31 - <h1>营运线路出车率统计表</h1> 31 + <h1>营运线路出车率统计</h1>
32 </div> 32 </div>
33 </div> 33 </div>
34 34
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
  View file @15f3c16
@@ -307,7 +307,48 @@ @@ -307,7 +307,48 @@
307 307
308 308
309 <!-- 其他form-group --> 309 <!-- 其他form-group -->
  310 + <div class="form-group">
  311 + <label class="col-md-2 control-label">最大乘坐人数：</label>
  312 + <div class="col-md-4">
  313 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.maxPeople"
  314 + placeholder="请输入最大乘坐人数"/>
  315 + </div>
  316 + </div>
  317 + <div class="form-group">
  318 + <label class="col-md-2 control-label">票价类型：</label>
  319 + <div class="col-md-4">
  320 + <sa-Select5 name="priceType"
  321 + model="ctrl.busInfoForSave"
  322 + cmaps="{'priceType': 'code'}"
  323 + dcname="priceType"
  324 + icname="code"
  325 + dsparams="{{ {type: 'dic', param: 'priceType' } | json }}"
  326 + iterobjname="item"
  327 + iterobjexp="item.name"
  328 + searchph="请选择票价类型..."
  329 + searchexp="this.name"
  330 + >
  331 + </sa-Select5>
  332 + </div>
  333 + </div>
  334 + <div class="form-group">
  335 + <label class="col-md-2 control-label">票价：</label>
  336 + <div class="col-md-4">
  337 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.price"
  338 + placeholder="请输入票价"/>
  339 + </div>
  340 + </div>
  341 +
  342 + </div>
310 343
  344 + <div class="form-actions">
  345 + <div class="row">
  346 + <div class="col-md-offset-3 col-md-4">
  347 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  348 + <a type="button" class="btn default" ui-sref="busInfoManage" ><i class="fa fa-times"></i> 取消</a>
  349 + </div>
  350 + </div>
  351 + </div>
311 </div> 352 </div>
312 353
313 </form> 354 </form>
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
  View file @15f3c16
@@ -477,6 +477,63 @@ @@ -477,6 +477,63 @@
477 477
478 <!-- 其他form-group --> 478 <!-- 其他form-group -->
479 479
  480 + <div class="form-group">
  481 + <label class="col-md-2 control-label">颜色：</label>
  482 + <div class="col-md-4">
  483 + <sa-Select5 name="color"
  484 + model="ctrl.busInfoForSave"
  485 + cmaps="{'color': 'code'}"
  486 + dcname="color"
  487 + icname="code"
  488 + dsparams="{{ {type: 'dic', param: 'CarColor' } | json }}"
  489 + iterobjname="item"
  490 + iterobjexp="item.name"
  491 + searchph="请选择车辆颜色..."
  492 + searchexp="this.name"
  493 + >
  494 + </div>
  495 + </div>
  496 + <div class="form-group">
  497 + <label class="col-md-2 control-label">最大乘坐人数：</label>
  498 + <div class="col-md-4">
  499 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.maxPeople"
  500 + placeholder="请输入最大乘坐人数"/>
  501 + </div>
  502 + </div>
  503 + <div class="form-group">
  504 + <label class="col-md-2 control-label">票价类型：</label>
  505 + <div class="col-md-4">
  506 + <sa-Select5 name="priceType"
  507 + model="ctrl.busInfoForSave"
  508 + cmaps="{'priceType': 'code'}"
  509 + dcname="priceType"
  510 + icname="code"
  511 + dsparams="{{ {type: 'dic', param: 'priceType' } | json }}"
  512 + iterobjname="item"
  513 + iterobjexp="item.name"
  514 + searchph="请选择票价类型..."
  515 + searchexp="this.name"
  516 + >
  517 + </sa-Select5>
  518 + </div>
  519 + </div>
  520 + <div class="form-group">
  521 + <label class="col-md-2 control-label">票价：</label>
  522 + <div class="col-md-4">
  523 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.price"
  524 + placeholder="请输入票价"/>
  525 + </div>
  526 + </div>
  527 +
  528 + </div>
  529 +
  530 + <div class="form-actions">
  531 + <div class="row">
  532 + <div class="col-md-offset-3 col-md-4">
  533 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  534 + <a type="button" class="btn default" ui-sref="busInfoManage" ><i class="fa fa-times"></i> 取消</a>
  535 + </div>
  536 + </div>
480 </div> 537 </div>
481 538
482 <div class="form-actions"> 539 <div class="form-actions">
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @15f3c16
@@ -468,6 +468,53 @@ @@ -468,6 +468,53 @@
468 468
469 469
470 <!-- 其他form-group --> 470 <!-- 其他form-group -->
  471 + <div class="form-group">
  472 + <label class="col-md-2 control-label">颜色：</label>
  473 + <div class="col-md-4">
  474 + <sa-Select5 name="color"
  475 + model="ctrl.busInfoForSave"
  476 + cmaps="{'color': 'code'}"
  477 + dcname="color"
  478 + icname="code"
  479 + dsparams="{{ {type: 'dic', param: 'CarColor' } | json }}"
  480 + iterobjname="item"
  481 + iterobjexp="item.name"
  482 + searchph="请选择车辆颜色..."
  483 + searchexp="this.name"
  484 + >
  485 + </div>
  486 + </div>
  487 + <div class="form-group">
  488 + <label class="col-md-2 control-label">最大乘坐人数：</label>
  489 + <div class="col-md-4">
  490 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.maxPeople"
  491 + placeholder="请输入最大乘坐人数"/>
  492 + </div>
  493 + </div>
  494 + <div class="form-group">
  495 + <label class="col-md-2 control-label">票价类型：</label>
  496 + <div class="col-md-4">
  497 + <sa-Select5 name="priceType"
  498 + model="ctrl.busInfoForSave"
  499 + cmaps="{'priceType': 'code'}"
  500 + dcname="priceType"
  501 + icname="code"
  502 + dsparams="{{ {type: 'dic', param: 'priceType' } | json }}"
  503 + iterobjname="item"
  504 + iterobjexp="item.name"
  505 + searchph="请选择票价类型..."
  506 + searchexp="this.name"
  507 + >
  508 + </sa-Select5>
  509 + </div>
  510 + </div>
  511 + <div class="form-group">
  512 + <label class="col-md-2 control-label">票价：</label>
  513 + <div class="col-md-4">
  514 + <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.price"
  515 + placeholder="请输入票价"/>
  516 + </div>
  517 + </div>
471 518
472 </div> 519 </div>
473 520
src/main/resources/static/real_control_v2/main.html
  View file @15f3c16
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 </div> 307 </div>
308 308
309 <div class="popup-msg-contents" style="display:{{type == 'WD'?'':'none'}}"> 309 <div class="popup-msg-contents" style="display:{{type == 'WD'?'':'none'}}">
310 - <button class="uk-button uk-button-primary fcxxwts" data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">发车信息微调</button> 310 + <button class="uk-button uk-button-primary fcxxwts" data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">发车信息微调工具</button>
311 </div> 311 </div>
312 312
313 <div class="centerSpace msg-title"> 313 <div class="centerSpace msg-title">
src/main/resources/static/real_control_v2/zndd/qjgz/list.html
  View file @15f3c16
@@ -22,12 +22,12 @@ @@ -22,12 +22,12 @@
22 <table class="ct-fixed-table uk-table uk-table-hover"> 22 <table class="ct-fixed-table uk-table uk-table-hover">
23 <thead> 23 <thead>
24 <tr> 24 <tr>
25 - <th style="width: 10%;">线路</th>  
26 - <th style="width: 10%;">车辆</th>  
27 - <th style="width: 10%;">人员</th> 25 + <th style="width: 5%;">线路</th>
  26 + <th style="width: 5%;">车辆</th>
  27 + <th style="width: 5%;">人员</th>
28 <th style="width: 10%;">请假类型</th> 28 <th style="width: 10%;">请假类型</th>
29 <th style="width: 15%;">时间</th> 29 <th style="width: 15%;">时间</th>
30 - <th style="width: 35%;">处理方式</th> 30 + <th style="width: 50%;">处理方式</th>
31 </tr> 31 </tr>
32 </thead> 32 </thead>
33 <tbody> 33 <tbody>
@@ -54,10 +54,10 @@ @@ -54,10 +54,10 @@
54 <td>{{obj.rq}}</td> 54 <td>{{obj.rq}}</td>
55 <td > 55 <td >
56 {{if obj.qjType == 0}} 56 {{if obj.qjType == 0}}
57 - <button class="uk-button pllbon" data-id="{{obj.id}}"> 批量烂班</button>  
58 - <button class="uk-button hrhc" data-id="{{obj.id}}"> 批量换人换车</button>  
59 - <button class="uk-button lp_change" data-id="{{obj.id}}"> 路牌对调</button>  
60 - <button class="uk-button cxlb" data-id="{{obj.id}}"> 恢复烂班</button> 57 + <button class="uk-button pllbon" data-id="{{obj.id}}"> 班次取消（烂班）工具</button>
  58 + <button class="uk-button hrhc" data-id="{{obj.id}}"> 调整人车工具</button>
  59 + <button class="uk-button lp_change" data-id="{{obj.id}}"> 路牌对调工具</button>
  60 + <button class="uk-button cxlb" data-id="{{obj.id}}"> 撤销班次取消（烂班）工具</button>
61 {{else}} 61 {{else}}
62 计划调度 -> 调度执勤日报 62 计划调度 -> 调度执勤日报
63 {{/if}} 63 {{/if}}
src/main/resources/static/real_control_v2/zndd/type/mz.html
  View file @15f3c16
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <div class="uk-width-1-4"> 23 <div class="uk-width-1-4">
24 <ul data-uk-switcher="{connect:'#tempScheduleContent'}" class="uk-nav uk-nav-side left_tabs_lg"> 24 <ul data-uk-switcher="{connect:'#tempScheduleContent'}" class="uk-nav uk-nav-side left_tabs_lg">
25 <li data-handle="toAndFro"><a>1、往返</a></li> 25 <li data-handle="toAndFro"><a>1、往返</a></li>
26 - <li data-handle="normal"><a>2、临加班次</a></li> 26 + <li data-handle="normal"><a>2、新增临加班次工具</a></li>
27 <!-- <li data-handle="parkToPark"><a>3、场到场</a></li>--> 27 <!-- <li data-handle="parkToPark"><a>3、场到场</a></li>-->
28 </ul> 28 </ul>
29 </div> 29 </div>
src/main/resources/static/real_control_v2/zndd/type/sftz_1.html
  View file @15f3c16
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
166 <div class="uk-grid"> 166 <div class="uk-grid">
167 <div class="uk-width-4-2"> 167 <div class="uk-width-4-2">
168 <div class="uk-form-row"> 168 <div class="uk-form-row">
169 - <h3>实发未发信息</h3> 169 + <h3>实发未发信息（实发调整工具）</h3>
170 </div> 170 </div>
171 </div> 171 </div>
172 </div> 172 </div>
src/main/resources/static/real_control_v2/zndd/type/wd.html
  View file @15f3c16
@@ -348,7 +348,7 @@ @@ -348,7 +348,7 @@
348 </div> 348 </div>
349 <div class="uk-width-1-2"> 349 <div class="uk-width-1-2">
350 <div class="uk-form-row"> 350 <div class="uk-form-row">
351 - <label class="uk-form-label">误点时间(分钟)</label> 351 + <label class="uk-form-label">误点调整工具</label>
352 <div class="uk-form-controls"> 352 <div class="uk-form-controls">
353 <input value="6" name="wdsj" id="wdsj"> 353 <input value="6" name="wdsj" id="wdsj">
354 </div> 354 </div>
@@ -366,7 +366,7 @@ @@ -366,7 +366,7 @@
366 </div> 366 </div>
367 <div class="uk-width-1-2"> 367 <div class="uk-width-1-2">
368 <div class="uk-form-row"> 368 <div class="uk-form-row">
369 - <label class="uk-form-label">待发时间</label> 369 + <label class="uk-form-label">待发调整工具</label>
370 <div class="uk-form-controls"> 370 <div class="uk-form-controls">
371 <input value="{{sch.fcsj}} + {{sch.lateMinute}}" name="wd" id="dfsj" disabled> 371 <input value="{{sch.fcsj}} + {{sch.lateMinute}}" name="wd" id="dfsj" disabled>
372 </div> 372 </div>
src/main/resources/static/real_control_v2/zndd/type/ycsf.html
  View file @15f3c16
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 <div class="uk-grid"> 104 <div class="uk-grid">
105 <div class="uk-width-4-2"> 105 <div class="uk-width-4-2">
106 <div class="uk-form-row"> 106 <div class="uk-form-row">
107 - <h3>异常实发信息</h3> 107 + <h3>异常实发信息（实发撤销工具）</h3>
108 </div> 108 </div>
109 </div> 109 </div>
110 </div> 110 </div>