潘钊 / bus_park_dispatch · Commits

Commit c6aa227ae65df9ee380c886432a4168a416d3cf3

Authored by panzhaov5
1 parent 43d50364

update...

Inline Side-by-side
Showing 11 changed files with 403 additions and 3 deletions
src/main/java/com/bsth/controller/staff_view/MaintainPlanController.java 0 → 100644
  View file @c6aa227
  1 +package com.bsth.controller.staff_view;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.staff_view.MaintainPlan;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +
  8 +@RestController
  9 +@RequestMapping("maintain")
  10 +public class MaintainPlanController extends BaseController<MaintainPlan, Integer> {
  11 +}
... ...
src/main/java/com/bsth/entity/staff_view/MaintainPlan.java 0 → 100644
  View file @c6aa227
  1 +package com.bsth.entity.staff_view;
  2 +
  3 +import javax.persistence.Entity;
  4 +import javax.persistence.GeneratedValue;
  5 +import javax.persistence.Id;
  6 +import javax.persistence.Table;
  7 +
  8 +/**
  9 + * 保养计划
  10 + */
  11 +@Entity
  12 +@Table(name = "bsth_c_sv_maintain")
  13 +public class MaintainPlan {
  14 +
  15 + @Id
  16 + @GeneratedValue
  17 + private int id;
  18 +
  19 + private String gsbm;
  20 +
  21 + private String fgsbm;
  22 +
  23 + private String lineCode;
  24 +
  25 + private String nbbm;
  26 +
  27 + private String rq;
  28 +
  29 + private String timeStr;
  30 +
  31 + private String level;
  32 +
  33 + private String remarks;
  34 +
  35 + public String getGsbm() {
  36 + return gsbm;
  37 + }
  38 +
  39 + public void setGsbm(String gsbm) {
  40 + this.gsbm = gsbm;
  41 + }
  42 +
  43 + public String getFgsbm() {
  44 + return fgsbm;
  45 + }
  46 +
  47 + public void setFgsbm(String fgsbm) {
  48 + this.fgsbm = fgsbm;
  49 + }
  50 +
  51 + public String getLineCode() {
  52 + return lineCode;
  53 + }
  54 +
  55 + public void setLineCode(String lineCode) {
  56 + this.lineCode = lineCode;
  57 + }
  58 +
  59 + public String getNbbm() {
  60 + return nbbm;
  61 + }
  62 +
  63 + public void setNbbm(String nbbm) {
  64 + this.nbbm = nbbm;
  65 + }
  66 +
  67 + public String getRq() {
  68 + return rq;
  69 + }
  70 +
  71 + public void setRq(String rq) {
  72 + this.rq = rq;
  73 + }
  74 +
  75 + public String getTimeStr() {
  76 + return timeStr;
  77 + }
  78 +
  79 + public void setTimeStr(String timeStr) {
  80 + this.timeStr = timeStr;
  81 + }
  82 +
  83 + public String getLevel() {
  84 + return level;
  85 + }
  86 +
  87 + public void setLevel(String level) {
  88 + this.level = level;
  89 + }
  90 +
  91 + public String getRemarks() {
  92 + return remarks;
  93 + }
  94 +
  95 + public void setRemarks(String remarks) {
  96 + this.remarks = remarks;
  97 + }
  98 +
  99 + public int getId() {
  100 + return id;
  101 + }
  102 +
  103 + public void setId(int id) {
  104 + this.id = id;
  105 + }
  106 +}
... ...
src/main/java/com/bsth/repository/staff_view/MaintainPlanRepository.java 0 → 100644
  View file @c6aa227
  1 +package com.bsth.repository.staff_view;
  2 +
  3 +import com.bsth.entity.staff_view.MaintainPlan;
  4 +import com.bsth.repository.BaseRepository;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +@Repository
  8 +public interface MaintainPlanRepository extends BaseRepository<MaintainPlan, Integer> {
  9 +}
... ...
src/main/java/com/bsth/service/staff_view/MaintainPlanService.java 0 → 100644
  View file @c6aa227
  1 +package com.bsth.service.staff_view;
  2 +
  3 +import com.bsth.entity.staff_view.MaintainPlan;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +public interface MaintainPlanService extends BaseService<MaintainPlan, Integer> {
  7 +}
... ...
src/main/java/com/bsth/service/staff_view/impl/MaintainPlanServiceImpl.java 0 → 100644
  View file @c6aa227
  1 +package com.bsth.service.staff_view.impl;
  2 +
  3 +import com.bsth.entity.staff_view.MaintainPlan;
  4 +import com.bsth.service.impl.BaseServiceImpl;
  5 +import com.bsth.service.staff_view.MaintainPlanService;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +@Service
  9 +public class MaintainPlanServiceImpl extends BaseServiceImpl<MaintainPlan, Integer> implements MaintainPlanService {
  10 +}
... ...
src/main/resources/application.properties
  View file @c6aa227
... ... @@ -13,6 +13,8 @@ multipart.maxRequestSize = -1
13 13  
14 14 server.session.timeout= -1
15 15  
  16 +spring.mvc.favicon.enabled = false
  17 +
16 18 server.compression.enabled=true
17 19 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
18 20  
... ...
src/main/resources/config.properties
  View file @c6aa227
... ... @@ -15,6 +15,6 @@ data.password=6DABD12209BEDAB0808CF7DC967EC2B4C6748277
15 15 led.push.url= http://192.168.0.10:8081/get/
16 16  
17 17 ## 高科西路
18   -tcc.name=金高停车场
19   -tcc.company.id=22
20   -tcc.code=AB7C1101
  18 +tcc.name=高科西路停车场
  19 +tcc.company.id=55
  20 +tcc.code=FFFFFFF9
... ...
src/main/resources/static/assets/css/main.css
  View file @c6aa227
... ... @@ -1095,4 +1095,53 @@ table.plan_s_tab_width a._grey{
1095 1095 }
1096 1096  
1097 1097  
  1098 +.maintain_p_tab_width th:nth-of-type(1), .maintain_p_tab_width td:nth-of-type(1) {
  1099 +}
  1100 +
  1101 +.maintain_p_tab_width th:nth-of-type(2), .maintain_p_tab_width td:nth-of-type(2) {
  1102 + width: 10%;
  1103 +}
  1104 +
  1105 +.maintain_p_tab_width th:nth-of-type(3), .maintain_p_tab_width td:nth-of-type(3) {
  1106 + width: 10%;
  1107 +}
  1108 +
  1109 +.maintain_p_tab_width th:nth-of-type(4), .maintain_p_tab_width td:nth-of-type(4) {
  1110 + width: 8%;
  1111 +}
  1112 +
  1113 +.maintain_p_tab_width th:nth-of-type(5), .maintain_p_tab_width td:nth-of-type(5) {
  1114 + width: 12%;
  1115 +}
  1116 +
  1117 +.maintain_p_tab_width th:nth-of-type(6), .maintain_p_tab_width td:nth-of-type(6) {
  1118 + width: 13%;
  1119 +}
  1120 +
  1121 +.maintain_p_tab_width th:nth-of-type(7), .maintain_p_tab_width td:nth-of-type(7) {
  1122 + width: 12%;
  1123 +}
  1124 +
  1125 +.maintain_p_tab_width th:nth-of-type(8), .maintain_p_tab_width td:nth-of-type(8) {
  1126 + width: 11%;
  1127 +}
1098 1128  
  1129 +.maintain_p_tab_width th:nth-of-type(9), .maintain_p_tab_width td:nth-of-type(9) {
  1130 + width: 11%;
  1131 +}
  1132 +.maintain_p_tab_width th:nth-of-type(10), .maintain_p_tab_width td:nth-of-type(10) {
  1133 + width: 7%;
  1134 +}
  1135 +
  1136 +.maintain_p_tab_width td:nth-of-type(10){
  1137 + color: red;
  1138 +}
  1139 +
  1140 +.maintain_p_tab_width ._green{
  1141 + color: #1e87f0;
  1142 + text-decoration: underline;
  1143 +}
  1144 +
  1145 +.maintain_p_tab_width .ct_grey{
  1146 + color: grey;
  1147 +}
1099 1148 \ No newline at end of file
... ...
src/main/resources/static/favicon.ico 0 → 100644
View file @c6aa227
No preview for this file type
src/main/resources/static/pages/attendance/att_data_main.html
  View file @c6aa227
... ... @@ -2,6 +2,7 @@
2 2  
3 3 <div class="left-menus">
4 4 <ul class="uk-list">
  5 + <li class="ct-btn-link" data-name="maintain_plan" data-page="/pages/attendance/maintain_plan_list.html">保养计划</li>
5 6 <li class="ct-btn-link" data-name="att_list" data-page="/pages/attendance/list.html">签到退记录</li>
6 7 </ul>
7 8 </div>
... ...
src/main/resources/static/pages/attendance/maintain_plan_list.html 0 → 100644
  View file @c6aa227
  1 +<div id="maintain_plan_list_wrap" style="padding: 25px;height: calc(100% - 50px);">
  2 +
  3 + <div class="ct_cont" style="height: 100%;">
  4 + <div class="ct_search_form_wrap">
  5 + <form>
  6 + <div class="ct_field">
  7 + <label>公司：
  8 + <select class="uk-select" name="company_eq">
  9 + </select>
  10 + </label>
  11 + </div>
  12 + <div class="ct_field">
  13 + <label>分公司：
  14 + <select class="uk-select" name="fgsCompany_eq">
  15 + </select>
  16 + </label>
  17 + </div>
  18 + <div class="ct_field">
  19 + <label>线路：
  20 + <select class="" name="lineCode_eq">
  21 + </select>
  22 + </label>
  23 + </div>
  24 + <div class="ct_field">
  25 + <label>车辆自编号：
  26 + <input class="uk-input" name="">
  27 + </label>
  28 + </div>
  29 + <div class="ct_field">
  30 + <label>保养日期：
  31 + <input class="uk-input flatpickr_input" name="">
  32 + </label>
  33 + </div>
  34 + <div class="ct_field">
  35 + <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
  36 + </div>
  37 + <div class="ct_field" style="vertical-align: bottom;">
  38 + <a class="uk-button uk-button-text" id="import_person_excel">添加保养计划</a>
  39 + </div>
  40 + </form>
  41 + </div>
  42 + <div class="ct_table_wrap">
  43 + <table class="uk-table uk-table-small maintain_p_tab_width" style="margin-bottom: 0;">
  44 + <thead>
  45 + <tr>
  46 + <th>序号</th>
  47 + <th>自编号</th>
  48 + <th>保养日期</th>
  49 + <th>时段</th>
  50 + <th>保养等级</th>
  51 + <th>备注</th>
  52 + <th>线路</th>
  53 + <th>分公司</th>
  54 + <th>所属公司</th>
  55 + <th>操作</th>
  56 + </tr>
  57 + </thead>
  58 + </table>
  59 + <div class="t_body_wrap">
  60 + <table class="uk-table uk-table-divider uk-table-hover uk-table-small maintain_p_list_table maintain_p_tab_width">
  61 + <tbody>
  62 + <tr>
  63 + <td>1</td>
  64 + <td><a>S0N-001</a></td>
  65 + <td>2018-04-19</td>
  66 + <td>上午</td>
  67 + <td>一级保养</td>
  68 + <td>
  69 + <small class="_green">04:20小票已出</small>
  70 + </td>
  71 + <td>1003路</td>
  72 + <td>一分公司</td>
  73 + <td>上南公司</td>
  74 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  75 + </tr>
  76 + <tr>
  77 + <td>2</td>
  78 + <td><a>S0N-001</a></td>
  79 + <td>2018-04-19</td>
  80 + <td>上午</td>
  81 + <td>一级保养</td>
  82 + <td>
  83 + <small class="_green">04:20小票已出</small>
  84 + </td>
  85 + <td>1003路</td>
  86 + <td>一分公司</td>
  87 + <td>上南公司</td>
  88 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  89 + </tr>
  90 + <tr>
  91 + <td>3</td>
  92 + <td><a>S0N-001</a></td>
  93 + <td>2018-04-19</td>
  94 + <td>上午</td>
  95 + <td>一级保养</td>
  96 + <td>
  97 + <small class="_green">04:20小票已出</small>
  98 + </td>
  99 + <td>1003路</td>
  100 + <td>一分公司</td>
  101 + <td>上南公司</td>
  102 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  103 + </tr>
  104 + <tr>
  105 + <td>4</td>
  106 + <td><a>S0N-001</a></td>
  107 + <td>2018-04-19</td>
  108 + <td>上午</td>
  109 + <td>一级保养</td>
  110 + <td>
  111 + <small class="_green">04:20小票已出</small>
  112 + </td>
  113 + <td>1003路</td>
  114 + <td>一分公司</td>
  115 + <td>上南公司</td>
  116 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  117 + </tr>
  118 + <tr>
  119 + <td>5</td>
  120 + <td><a>S0N-001</a></td>
  121 + <td>2018-04-19</td>
  122 + <td>上午</td>
  123 + <td>一级保养</td>
  124 + <td>
  125 + <small class="ct_grey">录入时间（2018-04-19 10:20）</small>
  126 + </td>
  127 + <td>1003路</td>
  128 + <td>一分公司</td>
  129 + <td>上南公司</td>
  130 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  131 + </tr>
  132 + <tr>
  133 + <td>6</td>
  134 + <td><a>S0N-001</a></td>
  135 + <td>2018-04-19</td>
  136 + <td>上午</td>
  137 + <td>一级保养</td>
  138 + <td>
  139 + <small class="ct_grey">录入时间（2018-04-19 10:20）</small>
  140 + </td>
  141 + <td>1003路</td>
  142 + <td>一分公司</td>
  143 + <td>上南公司</td>
  144 + <td><a class="delete_icon" uk-icon="icon: trash"></a></td>
  145 + </tr>
  146 + </tbody>
  147 + </table>
  148 + </div>
  149 + <div class="pagination-holder"></div>
  150 + <div class="count_text"></div>
  151 + </div>
  152 + </div>
  153 +
  154 + <script id="maintain_plan_list_body-temp" type="text/html">
  155 +
  156 + </script>
  157 +
  158 + <script>
  159 + (function () {
  160 + var wrap = '#maintain_plan_list_wrap', ps = $('.t_body_wrap', wrap);
  161 +
  162 + var page = 0, pageSize = 14, fs = 'YYYY-MM-DD HH:mm';
  163 + //日期控件
  164 + flatpickr(wrap + ' .flatpickr_input', flatpickrDateTimeConfig);
  165 + //初始化公司——>分公司 ——> 线路级联下拉框
  166 + var comp = $('[name=company_eq]', wrap);
  167 + var fgsComp = $('[name=fgsCompany_eq]', wrap);
  168 + var lineSelect = $('[name=lineCode_eq]', wrap);
  169 + gb_common.companySelect(comp, fgsComp, lineSelect);
  170 +
  171 + query();
  172 +
  173 + function query() {
  174 + var data = $('.ct_search_form_wrap>form', wrap).serializeJSON();
  175 + data.page = page;
  176 + data.size = pageSize;
  177 +
  178 + }
  179 +
  180 + var resetPagination = true;
  181 + var pagination = function (pages, currentPage) {
  182 + //分页
  183 + $('.pagination-holder', wrap).pagination({
  184 + pages: pages,
  185 + currentPage: currentPage,
  186 + cssStyle: 'light-theme',
  187 + onPageClick: function (pageNumber, e) {
  188 + e.stopPropagation();
  189 + page = pageNumber - 1;
  190 + query();
  191 + return false;
  192 + }
  193 + });
  194 + resetPagination = false;
  195 + };
  196 +
  197 + $('.ct_search_form_wrap', wrap).on('submit', function () {
  198 + resetPagination = true;
  199 + page = 0;
  200 + query();
  201 + return false;
  202 + });
  203 + })();
  204 + </script>
  205 +</div>
0 206 \ No newline at end of file
... ...