Commit e968bffbed377c49ce0bdffbb4571b5dca779a95
1 parent
0e3d4c89
update
Showing
3 changed files
with
26 additions
and
3 deletions
src/main/resources/static/pages/control/lineallot/allot.html
| @@ -189,6 +189,10 @@ | @@ -189,6 +189,10 @@ | ||
| 189 | {{each list as line i}} | 189 | {{each list as line i}} |
| 190 | <div class="line" name="line_{{line.lineCode}}" data-id={{line.lineCode}}>{{line.name}}</div> | 190 | <div class="line" name="line_{{line.lineCode}}" data-id={{line.lineCode}}>{{line.name}}</div> |
| 191 | {{/each}} | 191 | {{/each}} |
| 192 | + | ||
| 193 | + {{if list.length == 0}} | ||
| 194 | + <span style="color: #ff4444;font-family: 微软雅黑;"><i class="fa fa-question-circle"></i> 当前用户没有可调度的线路</span> | ||
| 195 | + {{/if}} | ||
| 192 | </script> | 196 | </script> |
| 193 | <script src="/assets/js/eventproxy.js"></script> | 197 | <script src="/assets/js/eventproxy.js"></script> |
| 194 | <script> | 198 | <script> |
| @@ -215,7 +219,11 @@ | @@ -215,7 +219,11 @@ | ||
| 215 | //用户分配的线路 | 219 | //用户分配的线路 |
| 216 | $.get('/realControAuthority/findByCurrentUser', function (t) { | 220 | $.get('/realControAuthority/findByCurrentUser', function (t) { |
| 217 | auth = t; | 221 | auth = t; |
| 218 | - var newArray = [], authArray = t.lineCodeStr.split(','); | 222 | + var newArray = [], authArray = []; |
| 223 | + | ||
| 224 | + try{ | ||
| 225 | + authArray = t.lineCodeStr.split(','); | ||
| 226 | + }catch (e){} | ||
| 219 | 227 | ||
| 220 | $.each(allLine, function () { | 228 | $.each(allLine, function () { |
| 221 | if (this.lineCode && authArray.indexOf(this.lineCode) != -1) { | 229 | if (this.lineCode && authArray.indexOf(this.lineCode) != -1) { |
src/main/resources/static/pages/permission/user/controlAllot.html
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | .select2-container { | 26 | .select2-container { |
| 27 | - z-index: 19891017; | 27 | + z-index: 99891017; |
| 28 | } | 28 | } |
| 29 | </style> | 29 | </style> |
| 30 | 30 | ||
| @@ -121,6 +121,10 @@ | @@ -121,6 +121,10 @@ | ||
| 121 | var code = lineSelect.val(), | 121 | var code = lineSelect.val(), |
| 122 | name = codeNameMap[code]; | 122 | name = codeNameMap[code]; |
| 123 | 123 | ||
| 124 | + if($('.line-list .line-item[data-id='+code+']').length > 0){ | ||
| 125 | + alert(name + '已分配，无法重复操作！'); | ||
| 126 | + return; | ||
| 127 | + } | ||
| 124 | $('.line-list', wrap).append('<span class="line-item" data-id="'+code+'"><i class="fa fa-remove remove-icon"></i>'+name+'</span>'); | 128 | $('.line-list', wrap).append('<span class="line-item" data-id="'+code+'"><i class="fa fa-remove remove-icon"></i>'+name+'</span>'); |
| 125 | }); | 129 | }); |
| 126 | 130 |
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
| @@ -16,6 +16,11 @@ | @@ -16,6 +16,11 @@ | ||
| 16 | "id": 1.52, | 16 | "id": 1.52, |
| 17 | "text": "历史班次维护", | 17 | "text": "历史班次维护", |
| 18 | "event": "history_sch_maintain" | 18 | "event": "history_sch_maintain" |
| 19 | + }, | ||
| 20 | + { | ||
| 21 | + "id": 1.53, | ||
| 22 | + "text": "缓存数据管理", | ||
| 23 | + "event": "cache_data_manage" | ||
| 19 | } | 24 | } |
| 20 | ], | 25 | ], |
| 21 | [ | 26 | [ |
| @@ -88,7 +93,13 @@ | @@ -88,7 +93,13 @@ | ||
| 88 | { | 93 | { |
| 89 | "id": 3, | 94 | "id": 3, |
| 90 | "text": "系统设置", | 95 | "text": "系统设置", |
| 91 | - "children": [{ | 96 | + "children": [ |
| 97 | + { | ||
| 98 | + "id": 3.1, | ||
| 99 | + "text": "线路配置", | ||
| 100 | + "event": "line_config" | ||
| 101 | + } | ||
| 102 | + ,{ | ||
| 92 | "id": 3.2, | 103 | "id": 3.2, |
| 93 | "text": "TTS", | 104 | "text": "TTS", |
| 94 | "event": "tts_config" | 105 | "event": "tts_config" |