update

潘钊
1 parent 0e3d4c89
Showing 3 changed files with 26 additions and 3 deletions
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/permission/user/controlAllot.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
@@ -189,6 +189,10 @@
     {{each list as line i}}
     <div class="line" name="line_{{line.lineCode}}" data-id={{line.lineCode}}>{{line.name}}</div>
     {{/each}}
+
+    {{if list.length == 0}}
+    <span style="color: #ff4444;font-family: 微软雅黑;"><i class="fa fa-question-circle"></i> 当前用户没有可调度的线路</span>
+    {{/if}}
 </script>
 <script src="/assets/js/eventproxy.js"></script>
 <script>
@@ -215,7 +219,11 @@
             //用户分配的线路
             $.get('/realControAuthority/findByCurrentUser', function (t) {
                 auth = t;
-                var newArray = [], authArray = t.lineCodeStr.split(',');
+                var newArray = [], authArray = [];
+
+                try{
+                    authArray = t.lineCodeStr.split(',');
+                }catch (e){}
  
                 $.each(allLine, function () {
                     if (this.lineCode && authArray.indexOf(this.lineCode) != -1) {
@@ -24,7 +24,7 @@
         }
  
         .select2-container {
-            z-index: 19891017;
+            z-index: 99891017;
         }
     </style>
  
@@ -121,6 +121,10 @@
                 var code = lineSelect.val(),
                         name = codeNameMap[code];
  
+                if($('.line-list .line-item[data-id='+code+']').length > 0){
+                    alert(name + '已分配，无法重复操作！');
+                    return;
+                }
                 $('.line-list', wrap).append('<span class="line-item" data-id="'+code+'"><i class="fa fa-remove remove-icon"></i>'+name+'</span>');
             });
  
@@ -16,6 +16,11 @@
           "id": 1.52,
           "text": "历史班次维护",
           "event": "history_sch_maintain"
+        },
+        {
+          "id": 1.53,
+          "text": "缓存数据管理",
+          "event": "cache_data_manage"
         }
       ],
       [
@@ -88,7 +93,13 @@
   {
     "id": 3,
     "text": "系统设置",
-    "children": [{
+    "children": [
+      {
+        "id": 3.1,
+        "text": "线路配置",
+        "event": "line_config"
+      }
+    ,{
         "id": 3.2,
         "text": "TTS",
         "event": "tts_config"