潘钊 / bsth_control · Commits

Commit cbfd5fd39b613a9fc649e631781bdb94ecc25fab

Authored by 娄高锋
1 parent d5bd4f54
build: skipped

表格文字居中，调整列宽度

Inline Side-by-side
Showing 10 changed files with 622 additions and 457 deletions
src/main/resources/static/pages/forms/statement/css/lbStatuAnaly.css
  View file @cbfd5fd
1 -  
2 -.table-bordered {  
3 - border: 1px solid; }  
4 -.table-bordered > thead > tr > th,  
5 -.table-bordered > thead > tr > td,  
6 -.table-bordered > tbody > tr > th,  
7 -.table-bordered > tbody > tr > td,  
8 -.table-bordered > tfoot > tr > th,  
9 -.table-bordered > tfoot > tr > td {  
10 - border: 1px solid; }  
11 -.table-bordered > thead > tr > th,  
12 -.table-bordered > thead > tr > td {  
13 - border-bottom-width: 2px; }  
14 -  
15 -.table > tbody + tbody {  
16 - border-top: 1px solid; }  
17 -  
18 -#right_div td{  
19 - min-width: 80px;  
20 - max-width: 80px;  
21 - width: 80px;  
22 -}  
23 -#left_div{  
24 - width:200px;  
25 - float: left;  
26 -}  
27 -#left_div1{  
28 - width: 100%;  
29 -}  
30 -#left_div2{  
31 - width: 100%;  
32 - height: 10px;  
33 - overflow: hidden;  
34 -}  
35 -#right_div{  
36 - width: 100%;  
37 - float: left;  
38 - margin-top: 15px;  
39 -}  
40 -#staticfw{  
41 - width: 100%;  
42 - overflow: hidden;  
43 -}  
44 -#right_divx{  
45 - width:100%;  
46 -}  
47 -#right_div2{  
48 - width:101%;  
49 - overflow: auto;  
50 - margin-top: -20px;  
51 -}  
52 -  
53 -#staticfw::-webkit-scrollbar {  
54 - display:none  
55 -}  
56 -  
57 -#right_divy td{  
58 - min-width: 80px;  
59 - max-width: 80px;  
60 - width: 80px;  
61 -}  
62 -#left_divy{  
63 - width:200px;  
64 - float: left;  
65 -}  
66 -#left_div1y{  
67 - width: 100%;  
68 -}  
69 -#left_div2y{  
70 - width: 100%;  
71 - height: 10px;  
72 - overflow: hidden;  
73 -}  
74 -#right_divy{  
75 - width: 100%;  
76 - float: left;  
77 - margin-top: 15px;  
78 -}  
79 -#staticfwy{  
80 - width: 100%;  
81 - overflow: hidden;  
82 -  
83 -}  
84 -  
85 -#right_divxy{  
86 - width:100%;  
87 -}  
88 -#right_div2y{  
89 - width:101%;  
90 - height:540px;  
91 - overflow: auto;  
92 - margin-top: -65px;  
93 -}  
94 -#right_div2::-webkit-scrollbar {  
95 - display:none  
96 -}  
97 -.tk th{  
98 - min-width: 80px;  
99 - max-width: 80px;  
100 - width:80px;  
101 -} 1 +
  2 +.table-bordered {
  3 + border: 1px solid; }
  4 +.table-bordered > thead > tr > th,
  5 +.table-bordered > thead > tr > td,
  6 +.table-bordered > tbody > tr > th,
  7 +.table-bordered > tbody > tr > td,
  8 +.table-bordered > tfoot > tr > th,
  9 +.table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 +.table-bordered > thead > tr > th,
  12 +.table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 +.table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +
  18 +#left_div{
  19 + width:200px;
  20 + float: left;
  21 +}
  22 +#left_div1{
  23 + width: 100%;
  24 +}
  25 +#left_div2{
  26 + width: 100%;
  27 + height: 10px;
  28 + overflow: hidden;
  29 +}
  30 +#right_div{
  31 + width: 100%;
  32 + float: left;
  33 + margin-top: 15px;
  34 +}
  35 +#staticfw{
  36 + width: 100%;
  37 + overflow: hidden;
  38 +}
  39 +#right_divx{
  40 + width:100%;
  41 +}
  42 +#right_div2{
  43 + width:101%;
  44 + overflow: auto;
  45 + margin-top: -20px;
  46 +}
  47 +
  48 +#staticfw::-webkit-scrollbar {
  49 + display:none
  50 +}
  51 +
  52 +#right_div td{
  53 + min-width: 68px;
  54 + max-width: 68px;
  55 + width: 68px;
  56 +}
  57 +#right_divy td{
  58 + min-width: 68px;
  59 + max-width: 68px;
  60 + width: 68px;
  61 +}
  62 +.tk th{
  63 + min-width: 68px;
  64 + max-width: 68px;
  65 + width:68px;
  66 +}
  67 +
  68 +#left_divy{
  69 + width:200px;
  70 + float: left;
  71 +}
  72 +#left_div1y{
  73 + width: 100%;
  74 +}
  75 +#left_div2y{
  76 + width: 100%;
  77 + height: 10px;
  78 + overflow: hidden;
  79 +}
  80 +#right_divy{
  81 + width: 100%;
  82 + float: left;
  83 + margin-top: 15px;
  84 +}
  85 +#staticfwy{
  86 + width: 100%;
  87 + overflow: hidden;
  88 +
  89 +}
  90 +
  91 +#right_divxy{
  92 + width:100%;
  93 +}
  94 +#right_div2y{
  95 + width:101%;
  96 + height:540px;
  97 + overflow: auto;
  98 + margin-top: -65px;
  99 +}
  100 +#right_div2::-webkit-scrollbar {
  101 + display:none
  102 +}
src/main/resources/static/pages/forms/statement/css/scheduleDaily.css
  View file @cbfd5fd
1 -  
2 -.table-bordered {  
3 - border: 1px solid; }  
4 -.table-bordered > thead > tr > th,  
5 -.table-bordered > thead > tr > td,  
6 -.table-bordered > tbody > tr > th,  
7 -.table-bordered > tbody > tr > td,  
8 -.table-bordered > tfoot > tr > th,  
9 -.table-bordered > tfoot > tr > td {  
10 - border: 1px solid; }  
11 -.table-bordered > thead > tr > th,  
12 -.table-bordered > thead > tr > td {  
13 - border-bottom-width: 2px; }  
14 -  
15 -.table > tbody + tbody {  
16 - border-top: 1px solid; }  
17 -  
18 -  
19 -.kfc td{  
20 - min-width: 140px;  
21 - max-width: 140px;  
22 - width: 140px;  
23 -}  
24 -  
25 -#right_div td{  
26 - min-width: 140px;  
27 - max-width: 140px;  
28 - width: 140px;  
29 -}  
30 -#left_div{  
31 - width:200px;  
32 - float: left;  
33 -}  
34 -#left_div1{  
35 - width: 100%;  
36 -}  
37 -#left_div2{  
38 - width: 100%;  
39 - height: 10px;  
40 - overflow: hidden;  
41 -}  
42 -#right_div{  
43 - width: 100%;  
44 - float: left;  
45 - margin-top: 15px;  
46 -}  
47 -#staticfw{  
48 - width: 100%;  
49 - overflow: hidden;  
50 -}  
51 -#right_divx{  
52 - width:100%;  
53 -}  
54 -#right_div2{  
55 - width:101%;  
56 - overflow: auto;  
57 - margin-top: -65px;  
58 -}  
59 -  
60 -#staticfw::-webkit-scrollbar {  
61 - display:none  
62 -}  
63 -  
64 -#right_divy td{  
65 - min-width: 140px;  
66 - max-width: 140px;  
67 - width: 140px;  
68 -}  
69 -#left_divy{  
70 - width:200px;  
71 - float: left;  
72 -}  
73 -#left_div1y{  
74 - width: 100%;  
75 -}  
76 -#left_div2y{  
77 - width: 100%;  
78 - height: 10px;  
79 - overflow: hidden;  
80 -}  
81 -#right_divy{  
82 - width: 100%;  
83 - float: left;  
84 - height: 600px;  
85 - margin-top: 15px;  
86 -}  
87 -#staticfwy{  
88 - width: 100%;  
89 - overflow: hidden;  
90 -  
91 -}  
92 -#right_divxy{  
93 - width:100%;  
94 -}  
95 -#right_div2y{  
96 - width:101%;  
97 - height:500px;  
98 - overflow: auto;  
99 - margin-top: -20px;  
100 -}  
101 -#staticfwy::-webkit-scrollbar {  
102 - display:none  
103 -}  
104 -#ddrbBody tr> td >span{  
105 - word-break: keep-all;white-space:nowrap;  
106 -} 1 +
  2 +.table-bordered {
  3 + border: 1px solid; }
  4 +.table-bordered > thead > tr > th,
  5 +.table-bordered > thead > tr > td,
  6 +.table-bordered > tbody > tr > th,
  7 +.table-bordered > tbody > tr > td,
  8 +.table-bordered > tfoot > tr > th,
  9 +.table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 +.table-bordered > thead > tr > th,
  12 +.table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 +.table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +
  18 +
  19 +#left_div{
  20 + width:200px;
  21 + float: left;
  22 +}
  23 +#left_div1{
  24 + width: 100%;
  25 +}
  26 +#left_div2{
  27 + width: 100%;
  28 + height: 10px;
  29 + overflow: hidden;
  30 +}
  31 +#right_div{
  32 + width: 98%;
  33 + float: left;
  34 + margin-top: 15px;
  35 +}
  36 +#staticfw{
  37 + width: 100%;
  38 + overflow: hidden;
  39 +}
  40 +#right_divx{
  41 + width:100%;
  42 +}
  43 +#right_div2{
  44 + width:101%;
  45 + overflow: auto;
  46 + margin-top: -65px;
  47 +}
  48 +
  49 +#staticfw::-webkit-scrollbar {
  50 + display:none
  51 +}
  52 +
  53 +.kfc td{
  54 + min-width: 56px;
  55 + max-width: 56px;
  56 + width: 56px;
  57 + text-align: center;
  58 +}
  59 +
  60 +#right_div td{
  61 + min-width: 56px;
  62 + max-width: 56px;
  63 + width: 56px;
  64 + text-align: center;
  65 +}
  66 +
  67 +#right_divy td{
  68 + min-width: 56px;
  69 + max-width: 56px;
  70 + width: 56px;
  71 + text-align: center;
  72 +}
  73 +
  74 +#left_divy{
  75 + width:200px;
  76 + float: left;
  77 +}
  78 +#left_div1y{
  79 + width: 100%;
  80 +}
  81 +#left_div2y{
  82 + width: 100%;
  83 + height: 10px;
  84 + overflow: hidden;
  85 +}
  86 +#right_divy{
  87 + width: 100%;
  88 + float: left;
  89 + height: 600px;
  90 + margin-top: 15px;
  91 +}
  92 +#staticfwy{
  93 + width: 100%;
  94 + overflow: hidden;
  95 +
  96 +}
  97 +#right_divxy{
  98 + width:100%;
  99 +}
  100 +#right_div2y{
  101 + width:99%;
  102 + height:68%;
  103 + overflow: auto;
  104 + margin-top: -20px;
  105 +}
  106 +#staticfwy::-webkit-scrollbar {
  107 + display:none
  108 +}
  109 +#ddrbBody tr> td >span{
  110 + word-break: keep-all;white-space:nowrap;
  111 +}
src/main/resources/static/pages/forms/statement/css/statisticsDaily.css
  View file @cbfd5fd
1 -  
2 - .table-bordered {  
3 - border: 1px solid; }  
4 -.table-bordered > thead > tr > th,  
5 -.table-bordered > thead > tr > td,  
6 -.table-bordered > tbody > tr > th,  
7 -.table-bordered > tbody > tr > td,  
8 -.table-bordered > tfoot > tr > th,  
9 -.table-bordered > tfoot > tr > td {  
10 - border: 1px solid; }  
11 -.table-bordered > thead > tr > th,  
12 -.table-bordered > thead > tr > td {  
13 - border-bottom-width: 2px; }  
14 -  
15 -.table > tbody + tbody {  
16 - border-top: 1px solid; }  
17 -  
18 -  
19 -  
20 -#right_div td{  
21 - min-width: 80px;  
22 - max-width: 80px;  
23 - width: 80px;  
24 -}  
25 -#left_div{  
26 - width:200px;  
27 - float: left;  
28 -}  
29 -#left_div1{  
30 - width: 100%;  
31 -}  
32 -#left_div2{  
33 - width: 100%;  
34 - height: 10px;  
35 - overflow: hidden;  
36 -}  
37 -#right_div{  
38 - width: 100%;  
39 - float: left;  
40 - margin-top: 15px;  
41 -}  
42 -#staticfw{  
43 - width: 100%;  
44 - overflow: hidden;  
45 -}  
46 -#right_divx{  
47 - width:100%;  
48 -}  
49 -#right_div2{  
50 - width:101%;  
51 - overflow: auto;  
52 - margin-top: -65px;  
53 -}  
54 -  
55 -#staticfw::-webkit-scrollbar {  
56 - display:none  
57 -}  
58 -  
59 -#right_divy td{  
60 - min-width: 80px;  
61 - max-width: 80px;  
62 - width: 80px;  
63 -}  
64 -#left_divy{  
65 - width:200px;  
66 - float: left;  
67 -}  
68 -#left_div1y{  
69 - width: 100%;  
70 -}  
71 -#left_div2y{  
72 - width: 100%;  
73 - height: 10px;  
74 - overflow: hidden;  
75 -}  
76 -#right_divy{  
77 - width: 100%;  
78 - float: left;  
79 - margin-top: 15px;  
80 -}  
81 -#staticfwy{  
82 - width: 100%;  
83 - overflow: hidden;  
84 -  
85 -}  
86 -  
87 -#right_divxy{  
88 - width:100%;  
89 -}  
90 -#right_div2y{  
91 - width:101%;  
92 - height:500px;  
93 - overflow: auto;  
94 - margin-top: -20px;  
95 -}  
96 -#staticfwy::-webkit-scrollbar {  
97 - display:none  
98 -} 1 +
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 +.table-bordered > thead > tr > th,
  5 +.table-bordered > thead > tr > td,
  6 +.table-bordered > tbody > tr > th,
  7 +.table-bordered > tbody > tr > td,
  8 +.table-bordered > tfoot > tr > th,
  9 +.table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 +.table-bordered > thead > tr > th,
  12 +.table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 +.table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +
  18 +
  19 +
  20 +#left_div{
  21 + width:200px;
  22 + float: left;
  23 +}
  24 +#left_div1{
  25 + width: 100%;
  26 +}
  27 +#left_div2{
  28 + width: 100%;
  29 + height: 10px;
  30 + overflow: hidden;
  31 +}
  32 +#right_div{
  33 + width: 100%;
  34 + float: left;
  35 + margin-top: 15px;
  36 +}
  37 +#staticfw{
  38 + width: 100%;
  39 + overflow: hidden;
  40 +}
  41 +#right_divx{
  42 + width:100%;
  43 +}
  44 +#right_div2{
  45 + width:101%;
  46 + overflow: auto;
  47 + margin-top: -65px;
  48 +}
  49 +
  50 +#staticfw::-webkit-scrollbar {
  51 + display:none
  52 +}
  53 +
  54 +#right_div td{
  55 + min-width: 60px;
  56 + max-width: 60px;
  57 + width: 60px;
  58 +}
  59 +
  60 +#right_divy td{
  61 + min-width: 60px;
  62 + max-width: 60px;
  63 + width: 60px;
  64 +}
  65 +#left_divy{
  66 + width:200px;
  67 + float: left;
  68 +}
  69 +#left_div1y{
  70 + width: 100%;
  71 +}
  72 +#left_div2y{
  73 + width: 100%;
  74 + height: 10px;
  75 + overflow: hidden;
  76 +}
  77 +#right_divy{
  78 + width: 100%;
  79 + float: left;
  80 + margin-top: 15px;
  81 +}
  82 +#staticfwy{
  83 + width: 100%;
  84 + overflow: hidden;
  85 +
  86 +}
  87 +
  88 +#right_divxy{
  89 + width:100%;
  90 +}
  91 +#right_div2y{
  92 + width:101%;
  93 + height:500px;
  94 + overflow: auto;
  95 + margin-top: -20px;
  96 + margin-bottom: 20px;
  97 +}
  98 +#staticfwy::-webkit-scrollbar {
  99 + display:none
  100 +}
src/main/resources/static/pages/forms/statement/css/waybill.css 0 → 100644
  View file @cbfd5fd
  1 +
  2 +.table-bordered {
  3 + border: 1px solid; }
  4 +.table-bordered > thead > tr > th,
  5 +.table-bordered > thead > tr > td,
  6 +.table-bordered > tbody > tr > th,
  7 +.table-bordered > tbody > tr > td,
  8 +.table-bordered > tfoot > tr > th,
  9 +.table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 +.table-bordered > thead > tr > th,
  12 +.table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 +.table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +
  18 +#right_div td{
  19 + min-width: 80px;
  20 + max-width: 80px;
  21 + width: 80px;
  22 +}
  23 +#left_div{
  24 + width:200px;
  25 + float: left;
  26 +}
  27 +#left_div1{
  28 + width: 100%;
  29 +}
  30 +#left_div2{
  31 + width: 100%;
  32 + height: 10px;
  33 + overflow: hidden;
  34 +}
  35 +#right_div{
  36 + width: 100%;
  37 + float: left;
  38 + margin-top: 15px;
  39 +}
  40 +#staticfw{
  41 + width: 100%;
  42 + overflow: hidden;
  43 +}
  44 +#right_divx{
  45 + width:100%;
  46 +}
  47 +#right_div2{
  48 + width:101%;
  49 + overflow: auto;
  50 + margin-top: -20px;
  51 +}
  52 +
  53 +#staticfw::-webkit-scrollbar {
  54 + display:none
  55 +}
  56 +
  57 +#right_divy td{
  58 + min-width: 80px;
  59 + max-width: 80px;
  60 + width: 80px;
  61 +}
  62 +#left_divy{
  63 + width:200px;
  64 + float: left;
  65 +}
  66 +#left_div1y{
  67 + width: 100%;
  68 +}
  69 +#left_div2y{
  70 + width: 100%;
  71 + height: 10px;
  72 + overflow: hidden;
  73 +}
  74 +#right_divy{
  75 + width: 100%;
  76 + float: left;
  77 + margin-top: 15px;
  78 +}
  79 +#staticfwy{
  80 + width: 100%;
  81 + overflow: hidden;
  82 +
  83 +}
  84 +
  85 +#right_divxy{
  86 + width:100%;
  87 +}
  88 +#right_div2y{
  89 + width:100%;
  90 + height:auto;
  91 + margin-top: -65px;
  92 +}
  93 +#right_divy td{
  94 + min-width: auto;
  95 + max-width: auto;
  96 + width: auto;
  97 +}
  98 +
  99 +#right_div2::-webkit-scrollbar {
  100 + display:none
  101 +}
  102 +.tk th{
  103 + min-width: 80px;
  104 + max-width: 80px;
  105 + width:80px;
  106 +}
src/main/resources/static/pages/forms/statement/jd_daily.html
  View file @cbfd5fd
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 </form> 56 </form>
57 </div> 57 </div>
58 <div class="portlet-body"> 58 <div class="portlet-body">
59 - <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">  
60 - <table class="table table-bordered table-hover table-checkable" id="forms"> 59 + <div class="table-container" style="margin-top: 10px;min-width: 906px;max-width: 100%;text-align: center;">
  60 + <table class="table table-bordered table-hover table-checkable" id="forms" style="background-color:white;">
61 <thead> 61 <thead>
62 <tr> 62 <tr>
63 <th colspan="19">调度班次日报</th> 63 <th colspan="19">调度班次日报</th>
@@ -69,25 +69,25 @@ @@ -69,25 +69,25 @@
69 <td colspan="8"><span id="form_date">&nbsp;</span></td> 69 <td colspan="8"><span id="form_date">&nbsp;</span></td>
70 </tr> 70 </tr>
71 <tr> 71 <tr>
72 - <td><label >线路</label></td>  
73 - <td><label >路牌</label></td>  
74 - <td><label >车辆</label></td>  
75 - <td><label >工号</label></td>  
76 - <td><label >姓名</label></td>  
77 - <td><label >计划班次</label></td>  
78 - <td><label >计划营运里程</label></td>  
79 - <td><label >实际班次</label></td>  
80 - <td><label >实际营运里程</label></td>  
81 - <td><label >空驶里程</label></td>  
82 - <td><label >加油里程</label></td>  
83 - <td><label >总里程</label></td>  
84 - <td><label >总里程(四舍五入)</label></td>  
85 - <td><label >出场存油</label></td>  
86 - <td><label >进场存油</label></td>  
87 - <td><label >加注量</label></td>  
88 - <td><label >油耗</label></td>  
89 - <td><label >加注类别</label></td>  
90 - <td><label >电耗</label></td> 72 + <td style="min-width: 120px"><label >线路</label></td>
  73 + <td style="min-width: 45px"><label >路牌</label></td>
  74 + <td style="min-width: 78px"><label >车辆</label></td>
  75 + <td style="min-width: 67px"><label >工号</label></td>
  76 + <td style="min-width: 64px"><label >姓名</label></td>
  77 + <td style="max-width: 60px">计划班次</td>
  78 + <td style="max-width: 60px">计划营运里程</td>
  79 + <td style="max-width: 60px">实际班次</td>
  80 + <td style="max-width: 60px">实际营运里程</td>
  81 + <td style="max-width: 60px">空驶里程</td>
  82 + <td style="max-width: 60px">加油里程</td>
  83 + <td style="max-width: 60px">总里程</td>
  84 + <td style="max-width: 60px">总里程(四舍五入)</td>
  85 + <td style="max-width: 60px">出场存油</td>
  86 + <td style="max-width: 60px">进场存油</td>
  87 + <td style="max-width: 60px">加注量</td>
  88 + <td style="max-width: 60px">油耗</td>
  89 + <td style="max-width: 60px">加注类别</td>
  90 + <td style="max-width: 60px">电耗</td>
91 </tr> 91 </tr>
92 </thead> 92 </thead>
93 <tbody id="tbody"> 93 <tbody id="tbody">
@@ -192,7 +192,8 @@ @@ -192,7 +192,8 @@
192 var temp = tempData[$("#line").val()].split(":"); 192 var temp = tempData[$("#line").val()].split(":");
193 $("#gsdmDaily").val(temp[0]); 193 $("#gsdmDaily").val(temp[0]);
194 updateCompany(); 194 updateCompany();
195 - $("#fgsdmDaily").val(temp[1]); 195 +// $("#fgsdmDaily").val(temp[1]);
  196 + $("#fgsdmDaily").val(" ");
196 $("#gsdmDaily").attr("disabled", true); 197 $("#gsdmDaily").attr("disabled", true);
197 $("#fgsdmDaily").attr("disabled", true); 198 $("#fgsdmDaily").attr("disabled", true);
198 } 199 }
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @cbfd5fd
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 <table id="left_table2"></table> 110 <table id="left_table2"></table>
111 </div> 111 </div>
112 </div> 112 </div>
113 - <div id="right_div"> 113 + <div id="right_div" style="text-align: center;">
114 <div style="overflow:auto;min-width: 906px;" id="staticfw" > 114 <div style="overflow:auto;min-width: 906px;" id="staticfw" >
115 <div id="right_divx"> 115 <div id="right_divx">
116 <table class="table table-bordered table-hover table-checkable" id="forms"> 116 <table class="table table-bordered table-hover table-checkable" id="forms">
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 </div> 136 </div>
137 </div> 137 </div>
138 138
139 - <div id="right_divy"> 139 + <div id="right_divy" style="text-align: center;">
140 <div style="overflow:auto;min-width: 906px;" id="staticfwy" > 140 <div style="overflow:auto;min-width: 906px;" id="staticfwy" >
141 <div id="right_divxy"> 141 <div id="right_divxy">
142 <table class="table table-bordered table-hover table-checkable" id="fdx2"> 142 <table class="table table-bordered table-hover table-checkable" id="fdx2">
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 </table> 145 </table>
146 </div> 146 </div>
147 </div> 147 </div>
148 - <div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y"> 148 + <div class="table-container" style="overflow:auto;min-width: 906px;margin-bottom: 20px" id="right_div2y">
149 <table class="table table-bordered table-hover table-checkable" id="formsnc"> 149 <table class="table table-bordered table-hover table-checkable" id="formsnc">
150 <tbody class="staticlfwync"> 150 <tbody class="staticlfwync">
151 </tbody> 151 </tbody>
@@ -157,6 +157,12 @@ @@ -157,6 +157,12 @@
157 </div> 157 </div>
158 </div> 158 </div>
159 159
  160 +<style>
  161 +th{
  162 + text-align: center;
  163 +}
  164 +</style>
  165 +
160 <script> 166 <script>
161 $(function(){ 167 $(function(){
162 168
@@ -606,11 +612,11 @@ @@ -606,11 +612,11 @@
606 <thead> 612 <thead>
607 <tr> 613 <tr>
608 <th class="hidden"></th> 614 <th class="hidden"></th>
609 - <th rowspan="3" style="min-width: 80px;max-width: 80px;" width="80px" >日期</th>  
610 - <th rowspan="3" style="min-width: 80px;max-width: 80px;" width="80px">时段</th>  
611 - <th rowspan="3" style="min-width: 80px;max-width: 80px;" width="80px">公司</th>  
612 - <th rowspan="3" style="min-width: 80px;max-width: 80px;" width="80px">分公司</th>  
613 - <th rowspan="3" style="min-width: 80px;max-width: 80px;" width="80px">线路</th> 615 + <th rowspan="3" style="min-width: 121px;max-width: 121px; width:121px">日期</th>
  616 + <th rowspan="3" style="min-width: 68px;max-width: 68px; width:68px">时段</th>
  617 + <th rowspan="3" style="min-width: 100px;max-width: 100px; width:100px">公司</th>
  618 + <th rowspan="3" style="min-width: 110px;max-width: 110px; width:110px">分公司</th>
  619 + <th rowspan="3" style="min-width: 110px;max-width: 110px; width:110px">线路</th>
614 <th rowspan="2" colspan="3">总班次</th> 620 <th rowspan="2" colspan="3">总班次</th>
615 <th rowspan="2" colspan="3">总营运公里</th> 621 <th rowspan="2" colspan="3">总营运公里</th>
616 {{if lb != 0}} 622 {{if lb != 0}}
@@ -636,7 +642,9 @@ @@ -636,7 +642,9 @@
636 <tr class="tk"> 642 <tr class="tk">
637 <th class="hidden"></th> 643 <th class="hidden"></th>
638 <th>计划</th><th>实际</th><th>百分比</th> 644 <th>计划</th><th>实际</th><th>百分比</th>
639 - <th>计划</th><th>实际</th><th>百分比</th> 645 + <th style="min-width: 84px;max-width: 84px; width:84px">计划</th>
  646 + <th style="min-width: 84px;max-width: 84px; width:84px">实际</th>
  647 + <th>百分比</th>
640 {{if reason[0].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}} 648 {{if reason[0].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
641 {{if reason[1].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}} 649 {{if reason[1].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
642 {{if reason[2].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}} 650 {{if reason[2].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
@@ -657,17 +665,19 @@ @@ -657,17 +665,19 @@
657 {{each list as obj i}} 665 {{each list as obj i}}
658 <tr> 666 <tr>
659 {{if obj.line!='合计'}} 667 {{if obj.line!='合计'}}
660 - <td>{{obj.date}}</td>  
661 - <td>{{obj.times}}</td>  
662 - <td>{{obj.company}}</td>  
663 - <td>{{obj.subCompany}}</td>  
664 - <td>{{obj.line}}</td> 668 + <td style="min-width: 121px;max-width: 121px; width:121px">{{obj.date}}</td>
  669 + <td style="min-width: 68px;max-width: 68px; width:68px">{{obj.times}}</td>
  670 + <td style="min-width: 100px;max-width: 100px; width:100px">{{obj.company}}</td>
  671 + <td style="min-width: 110px;max-width: 110px; width:110px">{{obj.subCompany}}</td>
  672 + <td style="min-width: 110px;max-width: 110px; width:110px">{{obj.line}}</td>
665 {{/if}} 673 {{/if}}
666 {{if obj.line=='合计'}} 674 {{if obj.line=='合计'}}
667 <td colspan="5">{{obj.line}}</td> 675 <td colspan="5">{{obj.line}}</td>
668 {{/if}} 676 {{/if}}
669 <td>{{obj.jhbc}}</td><td>{{obj.sjbc}}</td><td>{{obj.bcbfb}}</td> 677 <td>{{obj.jhbc}}</td><td>{{obj.sjbc}}</td><td>{{obj.bcbfb}}</td>
670 - <td>{{obj.jhlc}}</td><td>{{obj.sjlc}}</td><td>{{obj.lcbfb}}</td> 678 + <td style="min-width: 84px;max-width: 84px; width:84px">{{obj.jhlc}}</td>
  679 + <td style="min-width: 84px;max-width: 84px; width:84px">{{obj.sjlc}}</td>
  680 + <td>{{obj.lcbfb}}</td>
671 {{if reason[0].checked==true}}{{if obj.lzbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','lz' )">{{obj.lzbc}}</td>{{else}}<td>{{obj.lzbc}}</td>{{/if}}<td>{{obj.lzlc}}</td><td>{{obj.lzbfb}}</td>{{/if}} 681 {{if reason[0].checked==true}}{{if obj.lzbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','lz' )">{{obj.lzbc}}</td>{{else}}<td>{{obj.lzbc}}</td>{{/if}}<td>{{obj.lzlc}}</td><td>{{obj.lzbfb}}</td>{{/if}}
672 {{if reason[1].checked==true}}{{if obj.dmbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','dm' )">{{obj.dmbc}}</td>{{else}}<td >{{obj.dmbc}}</td>{{/if}}<td>{{obj.dmlc}}</td><td>{{obj.dmbfb}}</td>{{/if}} 682 {{if reason[1].checked==true}}{{if obj.dmbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','dm' )">{{obj.dmbc}}</td>{{else}}<td >{{obj.dmbc}}</td>{{/if}}<td>{{obj.dmlc}}</td><td>{{obj.dmbfb}}</td>{{/if}}
673 {{if reason[2].checked==true}}{{if obj.gzbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','gz' )">{{obj.gzbc}}</td>{{else}}<td>{{obj.gzbc}}</td>{{/if}}<td>{{obj.gzlc}}</td><td>{{obj.gzbfb}}</td>{{/if}} 683 {{if reason[2].checked==true}}{{if obj.gzbc > 0 && obj.line!='合计'}}<td style="color: red" onclick="opencalcSheetList2('{{obj.linecode}}','gz' )">{{obj.gzbc}}</td>{{else}}<td>{{obj.gzbc}}</td>{{/if}}<td>{{obj.gzlc}}</td><td>{{obj.gzbfb}}</td>{{/if}}
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @cbfd5fd
@@ -36,12 +36,13 @@ @@ -36,12 +36,13 @@
36 </div> 36 </div>
37 </form> 37 </form>
38 </div> 38 </div>
39 - <div class="portlet-body" id="ddrbBody" style="overflow:auto;height: calc(100% - 40px)"> 39 + <div class="portlet-body" id="ddrbBody" style="overflow:auto;height: calc(100% - 80px)">
40 <div class="table-container" style="margin-top: 10px;min-width: 906px"> 40 <div class="table-container" style="margin-top: 10px;min-width: 906px">
41 <label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label> 41 <label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
42 <br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label> 42 <br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
43 &nbsp;&nbsp;当班调派:<span id="dbdp"></span></label> 43 &nbsp;&nbsp;当班调派:<span id="dbdp"></span></label>
44 - <table class="table table-bordered table-hover table-checkable" id="forms"> 44 + <div style="width: 99%;overflow: auto;">
  45 + <table class="table table-bordered table-hover table-checkable" id="forms" style="margin-bottom:0px">
45 <thead> 46 <thead>
46 <tr> 47 <tr>
47 <th colspan="40"><label id="xlmc"></label>线路调度日报</th> 48 <th colspan="40"><label id="xlmc"></label>线路调度日报</th>
@@ -108,6 +109,7 @@ @@ -108,6 +109,7 @@
108 <td colspan="40">&nbsp;</td> 109 <td colspan="40">&nbsp;</td>
109 </tr> 110 </tr>
110 </table> 111 </table>
  112 + </div>
111 <!-- <tr> 113 <!-- <tr>
112 <td colspan="40">合计</td> 114 <td colspan="40">合计</td>
113 </tr> 115 </tr>
@@ -156,7 +158,8 @@ @@ -156,7 +158,8 @@
156 <tr> 158 <tr>
157 <td colspan="40">&nbsp;</td> 159 <td colspan="40">&nbsp;</td>
158 </tr> --> 160 </tr> -->
159 - <table class="table table-bordered table-hover table-checkable" id="forms_1"> 161 + <div style="width: 99%;overflow: auto;">
  162 + <table class="table table-bordered table-hover table-checkable" id="forms_1" style="margin-bottom:0px;margin-top: 20px;">
160 <tr> 163 <tr>
161 <td colspan="2"><label>路牌</label></td> 164 <td colspan="2"><label>路牌</label></td>
162 <td colspan="2"><label>车号</label></td> 165 <td colspan="2"><label>车号</label></td>
@@ -196,6 +199,7 @@ @@ -196,6 +199,7 @@
196 <td colspan="40">&nbsp;</td> 199 <td colspan="40">&nbsp;</td>
197 </tr> 200 </tr>
198 </table> 201 </table>
  202 + </div>
199 <!-- <table class="table table-bordered table-hover table-checkable" id="forms_2"> 203 <!-- <table class="table table-bordered table-hover table-checkable" id="forms_2">
200 204
201 <tbody class="scheduleDaily_3"> 205 <tbody class="scheduleDaily_3">
@@ -213,23 +217,29 @@ @@ -213,23 +217,29 @@
213 </div> 217 </div>
214 </div> 218 </div>
215 <div id="right_div"> 219 <div id="right_div">
216 - <div style="overflow:auto;min-width: 906px;" id="staticfw" > 220 + <div style="overflow:auto;min-width: 889px;" id="staticfw" >
217 <div id="right_divx"> 221 <div id="right_divx">
218 - <table class="table table-bordered table-hover table-checkable" > 222 + <table class="table table-bordered table-hover table-checkable">
219 <tbody class="stx"> 223 <tbody class="stx">
220 <tr> 224 <tr>
221 - <td rowspan="2">路牌</td>  
222 - <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td> 225 + <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
  226 + <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
  227 + 起点站
  228 + </td>
223 <td colspan="4">到达时间</td> 229 <td colspan="4">到达时间</td>
224 <td colspan="4">发车时间</td> 230 <td colspan="4">发车时间</td>
225 <td colspan="2" rowspan="2">备注</td> 231 <td colspan="2" rowspan="2">备注</td>
226 - <td rowspan="2">路牌</td>  
227 - <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td> 232 + <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
  233 + <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
  234 + 起点站
  235 + </td>
228 <td colspan="4">到达时间</td> 236 <td colspan="4">到达时间</td>
229 <td colspan="4">发车时间</td> 237 <td colspan="4">发车时间</td>
230 <td colspan="2" rowspan="2">备注</td> 238 <td colspan="2" rowspan="2">备注</td>
231 - <td rowspan="2">路牌</td>  
232 - <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td> 239 + <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
  240 + <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
  241 + 起点站
  242 + </td>
233 <td colspan="4">到达时间</td> 243 <td colspan="4">到达时间</td>
234 <td colspan="4">发车时间</td> 244 <td colspan="4">发车时间</td>
235 <td colspan="2" rowspan="2">备注</td> 245 <td colspan="2" rowspan="2">备注</td>
@@ -238,28 +248,28 @@ @@ -238,28 +248,28 @@
238 <tr class="kfc"> 248 <tr class="kfc">
239 <td>应到</td> 249 <td>应到</td>
240 <td>实到</td> 250 <td>实到</td>
241 - <td>快</td>  
242 - <td>慢</td> 251 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  252 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
243 <td>应发</td> 253 <td>应发</td>
244 <td>实发</td> 254 <td>实发</td>
245 - <td>快</td>  
246 - <td>慢</td> 255 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  256 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
247 <td>应到</td> 257 <td>应到</td>
248 <td>实到</td> 258 <td>实到</td>
249 - <td>快</td>  
250 - <td>慢</td> 259 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  260 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
251 <td>应发</td> 261 <td>应发</td>
252 <td>实发</td> 262 <td>实发</td>
253 - <td>快</td>  
254 - <td>慢</td> 263 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  264 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
255 <td>应到</td> 265 <td>应到</td>
256 <td>实到</td> 266 <td>实到</td>
257 - <td>快</td>  
258 - <td>慢</td> 267 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  268 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
259 <td>应发</td> 269 <td>应发</td>
260 <td>实发</td> 270 <td>实发</td>
261 - <td>快</td>  
262 - <td>慢</td> 271 + <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
  272 + <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
263 <td>&nbsp;</td> 273 <td>&nbsp;</td>
264 </tr> 274 </tr>
265 </tbody> 275 </tbody>
@@ -267,7 +277,7 @@ @@ -267,7 +277,7 @@
267 </div> 277 </div>
268 </div> 278 </div>
269 <div id="right_div2"> 279 <div id="right_div2">
270 - <table class="table table-bordered table-hover table-checkable" > 280 + <table class="table table-bordered table-hover table-checkable">
271 <tbody class="staticlfwy"> 281 <tbody class="staticlfwy">
272 </tbody> 282 </tbody>
273 </table> 283 </table>
@@ -644,12 +654,12 @@ @@ -644,12 +654,12 @@
644 {{if i%3 == 0}} 654 {{if i%3 == 0}}
645 <tr> 655 <tr>
646 {{/if}} 656 {{/if}}
647 - <td>{{obj.lpName}}</td>  
648 - <td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td> 657 + <td style="min-width: 47px;max-width: 47px;width: 47px;">{{obj.lpName}}</td>
  658 + <td colspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">{{obj.qdzName}}</td>
649 <td>{{obj.zdsj}}</td> 659 <td>{{obj.zdsj}}</td>
650 <td>{{obj.zdsjActual}}</td> 660 <td>{{obj.zdsjActual}}</td>
651 - <td>{{obj.fast}}</td>  
652 - <td>{{obj.slow}}</td> 661 + <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast}}</td>
  662 + <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow}}</td>
653 <td>{{obj.fcsj}}</td> 663 <td>{{obj.fcsj}}</td>
654 <td>{{obj.fcsjActual}} 664 <td>{{obj.fcsjActual}}
655 {{if obj.bcType== "in"}} 665 {{if obj.bcType== "in"}}
@@ -658,11 +668,9 @@ @@ -658,11 +668,9 @@
658 {{if obj.bcType== "out"}} 668 {{if obj.bcType== "out"}}
659 (出) 669 (出)
660 {{/if}} 670 {{/if}}
661 - </td>  
662 - <td>{{obj.fast0}}</td>  
663 - <td>{{obj.slow0}}  
664 -  
665 </td> 671 </td>
  672 + <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast0}}</td>
  673 + <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow0}}</td>
666 <td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td> 674 <td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td>
667 {{if (i+1)%3 == 0}} 675 {{if (i+1)%3 == 0}}
668 <td>&nbsp;</td> 676 <td>&nbsp;</td>
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @cbfd5fd
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <table id="left_table2"></table> 56 <table id="left_table2"></table>
57 </div> 57 </div>
58 </div> 58 </div>
59 - <div id="right_div"> 59 + <div id="right_div" style="text-align: center;">
60 <div style="overflow:auto;min-width: 906px;" id="staticfw" > 60 <div style="overflow:auto;min-width: 906px;" id="staticfw" >
61 <div id="right_divx"> 61 <div id="right_divx">
62 <table class="table table-bordered table-hover table-checkable" id="fdx"> 62 <table class="table table-bordered table-hover table-checkable" id="fdx">
@@ -65,22 +65,22 @@ @@ -65,22 +65,22 @@
65 <th colspan="45"><label id="tjrq"></label> 线路统计日报</th> 65 <th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
66 </tr> 66 </tr>
67 <tr> 67 <tr>
68 - <td rowspan="3" style="min-width: 80px;max-width: 80px;" width="100px"><span >分公司</span></td>  
69 - <td rowspan="3" style="min-width: 80px;max-width: 80px;" width="100px"><span >路线名</span></td> 68 + <td rowspan="3" style="min-width: 110px;max-width: 110px;" width="110px"><span >分公司</span></td>
  69 + <td rowspan="3" style="min-width: 110px;max-width: 110px;" width="110px"><span >路线名</span></td>
70 <td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td> 70 <td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
71 <td colspan="15">全日营运班次</td> 71 <td colspan="15">全日营运班次</td>
72 <td colspan="9">大间隔情况</td> 72 <td colspan="9">大间隔情况</td>
73 </tr> 73 </tr>
74 <tr> 74 <tr>
75 - <td rowspan="2" style="min-width: 80px;max-width: 80px;"width="80px"><label>计划总</label> 75 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>计划总</label>
76 <label>公里&nbsp;&nbsp;&nbsp;</label></td> 76 <label>公里&nbsp;&nbsp;&nbsp;</label></td>
77 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><label>计划营</label><label>运公里</label></td>  
78 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><label>计划空</label><label>驶公里</label></td>  
79 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><label>实际</label><label>总公里</label></td>  
80 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><label>实际营</label><label>运公里</label></td>  
81 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><label>实际空</label><label>驶公里</label></td>  
82 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><span>少驶公里</span></td>  
83 - <td rowspan="2" style="min-width: 80px;max-width: 80px;" width="80px"><span>少驶班次</span></td> 77 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>计划营</label><label>运公里</label></td>
  78 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>计划空</label><label>驶公里</label></td>
  79 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>实际</label><label>总公里</label></td>
  80 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>实际营</label><label>运公里</label></td>
  81 + <td rowspan="2" style="min-width: 90px;max-width: 90px;" width="90px"><label>实际空</label><label>驶公里</label></td>
  82 + <td rowspan="2" style="min-width: 75px;max-width: 75px;" width="75px"><span>少驶公里</span></td>
  83 + <td rowspan="2"><span>少驶班次</span></td>
84 <td colspan="11">少驶原因（公里）</td> 84 <td colspan="11">少驶原因（公里）</td>
85 <td colspan="2">临加公里</td> 85 <td colspan="2">临加公里</td>
86 <td colspan="3">计划班次</td> 86 <td colspan="3">计划班次</td>
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <td rowspan="2">原因</td> 93 <td rowspan="2">原因</td>
94 </tr> 94 </tr>
95 <tr class="kfc"> 95 <tr class="kfc">
96 - <td style="min-width: 80px;max-width: 80px;"><span>路阻</span></td> 96 + <td><span>路阻</span></td>
97 <td><span>吊慢</span></td> 97 <td><span>吊慢</span></td>
98 <td><span>故障</span></td> 98 <td><span>故障</span></td>
99 <td><span>纠纷</span></td> 99 <td><span>纠纷</span></td>
@@ -104,8 +104,8 @@ @@ -104,8 +104,8 @@
104 <td><span>气候</span></td> 104 <td><span>气候</span></td>
105 <td><span>援外</span></td> 105 <td><span>援外</span></td>
106 <td><span>其他</span></td> 106 <td><span>其他</span></td>
107 - <td><span>营运</span></td>  
108 - <td><span>空驶</span></td> 107 + <td style="min-width: 75px;max-width: 75px;" width="75px"><span>营运</span></td>
  108 + <td style="min-width: 75px;max-width: 75px;" width="75px"><span>空驶</span></td>
109 <td><span>全日</span></td> 109 <td><span>全日</span></td>
110 <td><span>早高峰</span></td> 110 <td><span>早高峰</span></td>
111 <td><span>晚高峰</span></td> 111 <td><span>晚高峰</span></td>
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 </div> 146 </div>
147 </div> 147 </div>
148 148
149 - <div id="right_divy"> 149 + <div id="right_divy" style="text-align: center;">
150 <div style="overflow:auto;min-width: 906px;" id="staticfwy" > 150 <div style="overflow:auto;min-width: 906px;" id="staticfwy" >
151 <div id="right_divxy"> 151 <div id="right_divxy">
152 <table class="table table-bordered table-hover table-checkable" id="fdx2"> 152 <table class="table table-bordered table-hover table-checkable" id="fdx2">
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 </div> 156 </div>
157 </div> 157 </div>
158 <div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y"> 158 <div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y">
159 - <table class="table table-bordered table-hover table-checkable" id="forms"> 159 + <table class="table table-bordered table-hover table-checkable" id="forms" style="background-color: white;">
160 <tbody class="statisticsDaily"> 160 <tbody class="statisticsDaily">
161 </tbody> 161 </tbody>
162 </table> 162 </table>
@@ -398,15 +398,15 @@ @@ -398,15 +398,15 @@
398 <script type="text/html" id="statisticsDaily"> 398 <script type="text/html" id="statisticsDaily">
399 {{each list as obj i}} 399 {{each list as obj i}}
400 <tr {{if obj.zt==1}}style='color: red'{{/if}}> 400 <tr {{if obj.zt==1}}style='color: red'{{/if}}>
401 - <td>{{obj.fgsName}}</td>  
402 - <td>{{obj.xlName}}</td>  
403 - <td>{{obj.jhzlc}}</td>  
404 - <td>{{obj.jhlc}}</td>  
405 - <td>{{obj.jcclc}}</td>  
406 - <td>{{obj.sjzgl}}</td>  
407 - <td>{{obj.sjgl}}</td>  
408 - <td>{{obj.sjksgl}}</td>  
409 - <td>{{obj.ssgl}}</td> 401 + <td style="min-width: 110px;max-width: 110px;" width="110px">{{obj.fgsName}}</td>
  402 + <td style="min-width: 110px;max-width: 110px;" width="110px">{{obj.xlName}}</td>
  403 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.jhzlc}}</td>
  404 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.jhlc}}</td>
  405 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.jcclc}}</td>
  406 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.sjzgl}}</td>
  407 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.sjgl}}</td>
  408 + <td style="min-width: 90px;max-width: 90px;" width="90px">{{obj.sjksgl}}</td>
  409 + <td style="min-width: 75px;max-width: 75px;" width="75px">{{obj.ssgl}}</td>
410 <td>{{obj.ssbc}}</td> 410 <td>{{obj.ssbc}}</td>
411 <td>{{obj.ssgl_lz}}</td> 411 <td>{{obj.ssgl_lz}}</td>
412 <td>{{obj.ssgl_dm}}</td> 412 <td>{{obj.ssgl_dm}}</td>
@@ -419,8 +419,8 @@ @@ -419,8 +419,8 @@
419 <td>{{obj.ssgl_qh}}</td> 419 <td>{{obj.ssgl_qh}}</td>
420 <td>{{obj.ssgl_yw}}</td> 420 <td>{{obj.ssgl_yw}}</td>
421 <td>{{obj.ssgl_other}}</td> 421 <td>{{obj.ssgl_other}}</td>
422 - <td>{{obj.ljgl}}</td>  
423 - <td>{{obj.ljks}}</td> 422 + <td style="min-width: 75px;max-width: 75px;" width="75px">{{obj.ljgl}}</td>
  423 + <td style="min-width: 75px;max-width: 75px;" width="75px">{{obj.ljks}}</td>
424 <td>{{obj.jhbc}}</td> 424 <td>{{obj.jhbc}}</td>
425 <td>{{obj.jhbc_m}}</td> 425 <td>{{obj.jhbc_m}}</td>
426 <td>{{obj.jhbc_a}}</td> 426 <td>{{obj.jhbc_a}}</td>
src/main/resources/static/pages/forms/statement/waybill.html
  View file @cbfd5fd
1 -<link rel="stylesheet" type="text/css" href="css/lbStatuAnaly.css" /> 1 +<link rel="stylesheet" type="text/css" href="css/waybill.css" />
2 2
3 3
4 <div class="page-head"> 4 <div class="page-head">
@@ -39,12 +39,12 @@ @@ -39,12 +39,12 @@
39 </div> 39 </div>
40 <div class="portlet-body"> 40 <div class="portlet-body">
41 <div class="row"> 41 <div class="row">
42 - <div class="col-md-3"> 42 + <div class="col-md-3" style="width: 24%">
43 <div class="" id="left_height" style="margin-top: 10px;overflow:auto;"> 43 <div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
44 <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info"> 44 <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
45 <thead> 45 <thead>
46 <tr class="hidden"> 46 <tr class="hidden">
47 - <th class="rypx" style="cursor:pointer ">人员</th> 47 + <th class="rypx" style="cursor:pointer;width:120px">人员</th>
48 <th class="zbhpx" style="cursor:pointer ">自编号</th> 48 <th class="zbhpx" style="cursor:pointer ">自编号</th>
49 <th class="lppx" style="cursor:pointer ">路牌</th> 49 <th class="lppx" style="cursor:pointer ">路牌</th>
50 </tr> 50 </tr>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 </table> 55 </table>
56 </div> 56 </div>
57 </div> 57 </div>
58 - <div class="col-md-9" id="printArea"> 58 + <div class="col-md-9" style="width: 76%" id="printArea">
59 <!-- <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;"> 59 <!-- <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
60 <table class="table table-bordered table-checkable" id="forms"> 60 <table class="table table-bordered table-checkable" id="forms">
61 <tbody class="ludan_1"> 61 <tbody class="ludan_1">
@@ -82,8 +82,9 @@ @@ -82,8 +82,9 @@
82 <table id="left_table2"></table> 82 <table id="left_table2"></table>
83 </div> 83 </div>
84 </div> 84 </div>
85 - <div id="right_div">  
86 - <div style="overflow:auto;min-width: 906px;" id="staticfw" > 85 +<!-- overflow:auto;min-width: 906px; -->
  86 + <div style="width: 100%;">
  87 + <div style="" id="staticfw" >
87 <div id="right_divx"> 88 <div id="right_divx">
88 <table class="table table-bordered table-hover table-checkable" id="forms"> 89 <table class="table table-bordered table-hover table-checkable" id="forms">
89 <tbody class="ludan_1"> 90 <tbody class="ludan_1">
@@ -110,7 +111,7 @@ @@ -110,7 +111,7 @@
110 </div> 111 </div>
111 112
112 <div id="right_divy"> 113 <div id="right_divy">
113 - <div style="overflow:auto;min-width: 906px;" id="staticfwy" > 114 + <div id="staticfwy" >
114 <div id="right_divxy"> 115 <div id="right_divxy">
115 <table class="table table-bordered table-hover table-checkable" id="fdx2"> 116 <table class="table table-bordered table-hover table-checkable" id="fdx2">
116 <tbody class="stx"> 117 <tbody class="stx">
@@ -118,22 +119,63 @@ @@ -118,22 +119,63 @@
118 </table> 119 </table>
119 </div> 120 </div>
120 </div> 121 </div>
121 - <div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y">  
122 - <table class="table table-bordered table-hover table-checkable" id="formsnc">  
123 - <tbody class="ludan_2">  
124 -  
125 - </tbody>  
126 - <tbody class="ludan_3">  
127 -  
128 - </tbody>  
129 - <tbody class="ludan_4">  
130 -  
131 - </tbody> 122 + <div class="table-container" id="right_div2y">
  123 + <table class="table table-bordered table-hover table-checkable" id="headTable"
  124 + style="margin-bottom: 0px;display: none;">
  125 + <thead>
  126 + <tr>
  127 + <td rowspan="2" style="min-width:20px;max-width:20px;">车次</td>
  128 + <td colspan="2">工号</td>
  129 + <td rowspan="2" style="min-width:30px;max-width:30px;">公里耗油</td>
  130 + <td colspan="2">起讫站</td>
  131 + <td colspan="4">时间</td>
  132 + <td colspan="2">误点</td>
  133 + <td rowspan="2" style="min-width:50px;max-width:50px;">里程(公里)计划</td>
  134 + <td rowspan="2" style="min-width:70px;max-width:70px;">备注</td>
  135 + </tr>
  136 + <tr>
  137 + <td colspan="1" style="min-width:110px;max-width:110px;">司&nbsp;机</td>
  138 + <td colspan="1" style="min-width:110px;max-width:110px;">售&nbsp;票</td>
  139 + <td colspan="1" style="min-width:124px;max-width:124px;">起点</td>
  140 + <td colspan="1" style="min-width:124px;max-width:124px;">终点</td>
  141 + <td colspan="1" style="min-width:50px;max-width:50px;">计发</td>
  142 + <td colspan="1" style="min-width:50px;max-width:20px;">实发</td>
  143 + <td colspan="1" style="min-width:50px;max-width:50px;">应到</td>
  144 + <td colspan="1" style="min-width:50px;max-width:50px;">实到</td>
  145 + <td colspan="1" style="min-width:26px;max-width:26px;">快</td>
  146 + <td colspan="1" style="min-width:26px;max-width:26px;">慢</td>
  147 + </tr>
  148 + </thead>
132 </table> 149 </table>
  150 + <div id="overDiv" style="overflow: auto;max-height: 500px">
  151 + <table class="table table-bordered table-hover table-checkable" id="formsnc" style="margin-bottom: 0px">
  152 + <tbody class="ludan_2">
  153 +
  154 + </tbody>
  155 + <!-- <tbody class="ludan_3"> -->
  156 +
  157 + <!-- </tbody> -->
  158 + <!-- <tbody class="ludan_4"> -->
  159 +
  160 + <!-- </tbody> -->
  161 + </table>
  162 + </div>
133 </div> 163 </div>
134 164
135 </div> 165 </div>
136 166
  167 + <div style="width: 100%;">
  168 + <div>
  169 + <div>
  170 + <table class="table table-bordered table-hover table-checkable" id="formsBottom">
  171 + <tbody class="ludan_3">
  172 +
  173 + </tbody>
  174 + </table>
  175 + </div>
  176 + </div>
  177 + </div>
  178 +
137 </div> 179 </div>
138 </div> 180 </div>
139 </div> 181 </div>
@@ -366,10 +408,21 @@ @@ -366,10 +408,21 @@
366 var ludan_2 = template('ludan_2',{list:result}); 408 var ludan_2 = template('ludan_2',{list:result});
367 // 把渲染好的模版html文本追加到表格中 409 // 把渲染好的模版html文本追加到表格中
368 $('#formsnc .ludan_2').html(ludan_2); 410 $('#formsnc .ludan_2').html(ludan_2);
  411 +
  412 + $("#headTable").show();
  413 + var width = $("#forms").width() + 2;//加2是边框
  414 + var height = $("#formsnc").css('height');
  415 + var maxHeight = $("#overDiv").css('max-height');
  416 + console.log(width);
  417 + if(height > maxHeight){
  418 + $("#overDiv").css('width', width + 17 + "px");
  419 + } else {
  420 + $("#overDiv").css('width', width + "px");
  421 + }
369 }); 422 });
370 $get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ 423 $get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
371 var ludan_3 = template('ludan_3',result); 424 var ludan_3 = template('ludan_3',result);
372 - $('#formsnc .ludan_3').html(ludan_3); 425 + $('#formsBottom .ludan_3').html(ludan_3);
373 $("#info tbody tr").css('background-color', ''); 426 $("#info tbody tr").css('background-color', '');
374 obj.css('background-color', '#99CCFF'); 427 obj.css('background-color', '#99CCFF');
375 }); 428 });
@@ -527,53 +580,32 @@ @@ -527,53 +580,32 @@
527 <td colspan="1">&nbsp;</td> 580 <td colspan="1">&nbsp;</td>
528 <td colspan="1">&nbsp;</td> 581 <td colspan="1">&nbsp;</td>
529 </tr> 582 </tr>
530 - <tr>  
531 - <td rowspan="2">车次</td>  
532 - <td colspan="2">工号</td>  
533 - <td rowspan="2">公里耗油</td>  
534 - <td colspan="2">起讫站</td>  
535 - <td colspan="4">时间</td>  
536 - <td colspan="2">误点</td>  
537 - <td rowspan="2" width="66px">里程(公里)计划</td>  
538 - <td rowspan="2">备注</td>  
539 - </tr>  
540 - <tr>  
541 - <td colspan="1" width="60px">司&nbsp;机</td>  
542 - <td colspan="1" width="60px">售&nbsp;票</td>  
543 - <td colspan="1">起点</td>  
544 - <td colspan="1">终点</td>  
545 - <td colspan="1">计发</td>  
546 - <td colspan="1">实发</td>  
547 - <td colspan="1">应到</td>  
548 - <td colspan="1">实到</td>  
549 - <td colspan="1">快</td>  
550 - <td colspan="1">慢</td>  
551 - </tr>  
552 </script> 583 </script>
553 <script type="text/html" id="ludan_2"> 584 <script type="text/html" id="ludan_2">
554 {{each list as obj i}} 585 {{each list as obj i}}
555 <tr> 586 <tr>
556 - <td>{{obj.adjustExps}}</td>  
557 - <td>{{obj.jGh}}{{obj.jName}}</td>  
558 - <td>{{if obj.sGh !=null}} 587 + <td style="min-width:20px;max-width:20px">{{obj.adjustExps}}</td>
  588 + <td style="min-width:110px;max-width:110px">{{obj.jGh}}{{obj.jName}}</td>
  589 + <td style="min-width:110px;max-width:110px">
  590 + {{if obj.sGh !=null}}
559 {{obj.sGh}}{{obj.sName}} 591 {{obj.sGh}}{{obj.sName}}
560 {{/if}} 592 {{/if}}
561 </td> 593 </td>
562 - <td>&nbsp;</td>  
563 - <td>{{obj.qdzName}}</td>  
564 - <td>{{obj.zdzName}}</td>  
565 - <td>{{obj.fcsj}}</td>  
566 - <td>{{obj.fcsjActual}}</td>  
567 - <td>{{obj.zdsj}}</td>  
568 - <td>{{obj.zdsjActual}}</td>  
569 - <td>{{obj.fast}}</td>  
570 - <td>{{obj.slow}}</td>  
571 - <td> 594 + <td style="min-width:30px;max-width:30px">&nbsp;</td>
  595 + <td style="min-width:124px;max-width:124px">{{obj.qdzName}}</td>
  596 + <td style="min-width:124px;max-width:124px">{{obj.zdzName}}</td>
  597 + <td style="min-width:50px;max-width:50px">{{obj.fcsj}}</td>
  598 + <td style="min-width:50px;max-width:50px">{{obj.fcsjActual}}</td>
  599 + <td style="min-width:50px;max-width:50px">{{obj.zdsj}}</td>
  600 + <td style="min-width:50px;max-width:50px">{{obj.zdsjActual}}</td>
  601 + <td style="min-width:26px;max-width:26px">{{obj.fast}}</td>
  602 + <td style="min-width:26px;max-width:26px">{{obj.slow}}</td>
  603 + <td style="min-width:50px;max-width:50px">
572 {{if obj.zdsjActual!=null}} 604 {{if obj.zdsjActual!=null}}
573 {{obj.jhlc}} 605 {{obj.jhlc}}
574 {{/if}} 606 {{/if}}
575 </td> 607 </td>
576 - <td> 608 + <td style="min-width:70px;max-width:70px;">
577 {{obj.remarks}} 609 {{obj.remarks}}
578 </td> 610 </td>
579 </tr> 611 </tr>
src/main/resources/static/pages/mforms/singledatas/singledata.html
  View file @cbfd5fd
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 </div> 91 </div>
92 </form> 92 </form>
93 </div> 93 </div>
94 - <div class="portlet-body"> 94 + <div class="portlet-body" style="text-align: center;">
95 <div class="kw" style="margin-top: 10px;overflow:auto;min-width: 906px"> 95 <div class="kw" style="margin-top: 10px;overflow:auto;min-width: 906px">
96 <table class="table table-bordered table-hover table-checkable" id=""> 96 <table class="table table-bordered table-hover table-checkable" id="">
97 <thead> 97 <thead>