update...

潘钊
1 parent e11bc91c
Showing 9 changed files with 211 additions and 103 deletions
src/main/java/com/bsth/controller/sys/RealControAuthorityController.java
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/css/main.css
src/main/resources/static/real_control_v2/electron/lineSelect.html
src/main/resources/static/real_control_v2/fragments/north/nav/cache_data/list.html
src/main/resources/static/real_control_v2/fragments/north/nav/cache_data/nbbm_deviceid.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/north/toolbar.js
@@ -2,12 +2,15 @@ package com.bsth.controller.sys;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.sys.RealControAuthorityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * Created by panzhao on 2017/2/14.
  */
@@ -23,4 +26,9 @@ public class RealControAuthorityController extends BaseController&lt;RealControAuth
         return realControAuthorityService.findByUserId(userId);
     }
+
+    @RequestMapping("findByCurrentUser")
+    public RealControAuthority findByUserId(HttpServletRequest request){
+        return realControAuthorityService.findByUserId(SecurityUtils.getCurrentUser().getId());
+    }
 }
@@ -112,10 +112,10 @@
         margin-bottom: 3px;
     }
-    /** 闵行没有分公司，直接隐藏 */
+    /** 闵行没有分公司，直接隐藏
     .company, .sub-company {
         display: none !important;
-    }
+    } */
 </style>
 <div class="page-head">
@@ -138,6 +138,8 @@
                 class="caption-subject font-green bold uppercase">选择线路</span>
         </div>
     </div>
+    <div class="alert alert-info">
+        <strong>ps</strong> 可选择的线路，进入后是监控还是主调模式。可在 权限管理-> 用户管理里 进行配置。 </div>
     <div class="portlet-body">
         <div class="row" style="margin-bottom: 30px;">
             <div class="col-md-8 col-sm-12 col-md-offset-2" style="text-align: center;">
@@ -162,11 +164,11 @@
                     <div class="selected-body"></div>
                     <div class="lb_panel">
-                        <a href="javascript:;" class="btn btn-lg blue gotoControl red" data-status=1>
-                            <i class="fa fa-power-off"></i> 主调模式 </a>
+                        <a href="javascript:;" class="btn btn-lg blue gotoControl" data-status=1>
+                            <i class="fa fa-power-off"></i> 进入线路调度 </a>
-                        <a href="javascript:;" id="monitor" class="btn btn-lg grey gotoControl" data-status=0>
-                            <i class="fa fa-tv"></i> 监控模式 </a>
+                        <!--<a href="javascript:;" id="monitor" class="btn btn-lg grey gotoControl" data-status=0>
+                            <i class="fa fa-tv"></i> 监控模式 </a>-->
                         &nbsp;
                         <a href="javascript:;" id="resetBtn" style="left: 120px;color: #3598DC;">
                             <i class="fa fa-history"></i> 重置</a>
@@ -184,15 +186,9 @@
 </div>
 <script id="line_select_cont_temp" type="text/html">
-    {{each data as obj company}}
-    <h3 class="company">{{company}}</h3>
-    {{each data[company] as subObj subCompany}}
-    <h5 class="sub-company" style="font-family: 仿宋;">{{company}}_{{subCompany}}</h5>
-    {{each data[company][subCompany] as line i}}
+    {{each list as line i}}
     <div class="line" name="line_{{line.lineCode}}" data-id={{line.lineCode}}>{{line.name}}</div>
     {{/each}}
-    {{/each}}
-    {{/each}}
 </script>
 <script src="/assets/js/eventproxy.js"></script>
 <script>
@@ -213,64 +209,54 @@
         var lineIds = {};
         var storage = window.localStorage;
-
+        //线调权限
+        var auth;
         $get('/line/all', {destroy_eq: 0}, function (allLine) {
-            $('#searchLineInput').focus();
-            //按公司分组
-            var companyJson = groupData(allLine, 'company');
-            //按分公司分组
-            for (var company in companyJson) {
-                companyJson[company] = groupData(companyJson[company], 'brancheCompany');
-            }
+            //用户分配的线路
+            $.get('/realControAuthority/findByCurrentUser', function (t) {
+                auth = t;
+                var newArray = [], authArray = t.lineCodeStr.split(',');
+
+                $.each(allLine, function () {
+                    if (this.lineCode && authArray.indexOf(this.lineCode) != -1) {
+                        newArray.push(this);
+                    }
+                });
-            var htmlStr = template('line_select_cont_temp', {data: companyJson});
-            $('.line-select-body').html(htmlStr)
-                    .slimscroll({//滚动条
-                        height: '270px'
-                    });
-
-            //替换公司编码
-            /* 		var gsmap = {};
-             $get('/business/all', null, function(array){
-             $.each(array, function(i, gs){
-             var k = gs.upCode + '_' + gs.businessCode;
-             if(gs.upCode === '88'){
-             k = gs.businessCode;
-             }
-             gsmap[k] = gs.businessName;
-             });
-
-             $.each($('.company,.sub-company'), function(j , e){
-             var k = $(e).text();
-             gsmap[k] &&	$(e).text(gsmap[k]);
-             })
-             }); */
-
-            //映射
-            $.each(allLine, function (s, line) {
-                camelChars[pinyin.getCamelChars(line.name)] = line.lineCode;
-                fullChars[pinyin.getFullChars(line.name).toUpperCase()] = line.lineCode;
-                zhChars[line.name] = line.lineCode;
-                lineIdMap[line.lineCode] = line;
-
-                lineIds[line.lineCode] = line.name;
-            });
-            //合并映射
-            $.extend(allChars, camelChars, fullChars, zhChars);
-
-            //线路选中事件
-            $('.line-select-body .line').on('click', function () {
-                if ($(this).hasClass('active')) {
-                    $(this).removeClass('active');
-                    $('.selected-body .line[name=' + $(this).attr('name') + ']').remove();
-                }
-                else {
-                    $(this).addClass('active');
-                    $('.selected-body').append($(this).clone());
-                }
+                var htmlStr = template('line_select_cont_temp', {list: newArray});
+                $('.line-select-body').html(htmlStr)
+                        .slimscroll({//滚动条
+                            height: '270px'
+                        });
+
+                //映射
+                $.each(allLine, function (s, line) {
+                    camelChars[pinyin.getCamelChars(line.name)] = line.lineCode;
+                    fullChars[pinyin.getFullChars(line.name).toUpperCase()] = line.lineCode;
+                    zhChars[line.name] = line.lineCode;
+                    lineIdMap[line.lineCode] = line;
+
+                    lineIds[line.lineCode] = line.name;
+                });
+                //合并映射
+                $.extend(allChars, camelChars, fullChars, zhChars);
+
+                //线路选中事件
+                $('.line-select-body .line').on('click', function () {
+                    if ($(this).hasClass('active')) {
+                        $(this).removeClass('active');
+                        $('.selected-body .line[name=' + $(this).attr('name') + ']').remove();
+                    }
+                    else {
+                        $(this).addClass('active');
+                        $('.selected-body').append($(this).clone());
+                    }
+                });
+
+                storage.setItem('lineIds', JSON.stringify(lineIds));
             });
-            storage.setItem('lineIds', JSON.stringify(lineIds));
+            $('#searchLineInput').focus();
         });
         //搜索框事件
@@ -304,9 +290,9 @@
             });
             storage.setItem('lineControlItems', JSON.stringify(lsData));
-            var operationMode = $(this).data('status');
+            //ar operationMode = $(this).data('status');
             //监控模式还是主调模式
-            storage.setItem('operationMode', operationMode);
+            storage.setItem('operationMode', auth.pattern);
             var ep = new EventProxy();
             //缓存车辆自编号和设备号对照
@@ -102,6 +102,8 @@
                         });
                         $('.line-list', wrap).html(htmlStr);
+
+                        $('select[name=pattern]', wrap).val(t.pattern);
                     });
                 });
             });
@@ -776,3 +776,12 @@ li.map-panel {
 #schedule-lp_change-modal .ct_table.sch-list.reverse .ct_table_body dl.active dd {
     border-top: 1px solid #ffe2b9;
 }
+
+#cache_data_manage-modal .uk-table td{
+    vertical-align: bottom;
+}
+
+#cache_data_manage-modal .uk-table td,
+#cache_data_manage-modal .uk-table th{
+    padding: 8px 8px 6px;
+}
 \ No newline at end of file
@@ -177,38 +177,52 @@
         var lineIdMap = {};
         var storage = window.localStorage;
+        var auth;
         gb_common.$get('/line/all', {destroy_eq: 0}, function (list) {
-            var htmlStr = '';
-            $.each(list, function () {
-                htmlStr += '<span class="line-item" data-name="' + this.name + '" data-code="' + this.lineCode + '">' +
-                        ' <input class="i-cbox" type="checkbox"> ' + this.name +
-                        '</span>';
-
-                //拼音首字母
-                this.camelChars = pinyin.getCamelChars(this.name);
-                //全拼
-                this.fullChars = pinyin.getFullChars(this.name).toUpperCase();
-
-                lineIdMap[this.lineCode] = this;
-            });
-            all = list;
-            $('.line-btn-list').html(htmlStr);
+            //用户分配的线路
+            $.get('/realControAuthority/findByCurrentUser', function (t) {
+                auth = t;
+                var newArray = [], authArray = t.lineCodeStr.split(',');
-            $('.line-btn-list .line-item').on('click', function () {
-                var box = $(this).find('input[type=checkbox]')[0];
-                if ($(this).hasClass('active')) {
-                    $(this).removeClass('active');
-                    box.checked = false;
+                $.each(list, function () {
+                    if (this.lineCode && authArray.indexOf(this.lineCode) != -1) {
+                        newArray.push(this);
+                    }
+                });
-                    removeSelected(this);
-                }
-                else {
-                    $(this).addClass('active');
-                    box.checked = true;
+                var htmlStr = '';
+                $.each(newArray, function () {
+                    htmlStr += '<span class="line-item" data-name="' + this.name + '" data-code="' + this.lineCode + '">' +
+                            ' <input class="i-cbox" type="checkbox"> ' + this.name +
+                            '</span>';
-                    addSelected(this);
-                }
+                    //拼音首字母
+                    this.camelChars = pinyin.getCamelChars(this.name);
+                    //全拼
+                    this.fullChars = pinyin.getFullChars(this.name).toUpperCase();
+
+                    lineIdMap[this.lineCode] = this;
+                });
+                all = list;
+
+                $('.line-btn-list').html(htmlStr);
+
+                $('.line-btn-list .line-item').on('click', function () {
+                    var box = $(this).find('input[type=checkbox]')[0];
+                    if ($(this).hasClass('active')) {
+                        $(this).removeClass('active');
+                        box.checked = false;
+
+                        removeSelected(this);
+                    }
+                    else {
+                        $(this).addClass('active');
+                        box.checked = true;
+
+                        addSelected(this);
+                    }
+                });
             });
         });
@@ -278,6 +292,9 @@
                 ep.emitLater('car2DeviceId');
             });
+            //监控模式还是主调模式
+            storage.setItem('operationMode', auth.pattern);
+
             //缓存线路路由
             codeStr = codeStr.substr(0, codeStr.length - 1);
             $.get('/realMap/multiRouteByLine', {codeStr: codeStr}, function (rs) {
+<div class="uk-modal" id="cache_data_manage-modal">
+    <div class="uk-modal-dialog" style="width: 620px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h2>缓存数据管理</h2>
+
+        <div class="uk-overflow-container">
+            <table class="uk-table">
+                <caption>对照数据列表</caption>
+                <tbody>
+                <tr>
+                    <td><strong>车辆信息</strong></td>
+                    <td>车辆自编号和设备号对照数据</td>
+                    <td>
+                        <div class="uk-button-group" style="margin-top: 2px;">
+                            <button data-type="nbbm2DeviceId" class="uk-button uk-button-primary show-data"><i class="uk-icon-search"></i> 查看</button>
+                            <button class="uk-button"><i class="uk-icon-refresh"></i> 刷新数据</button>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>人员信息</strong></td>
+                    <td>人员工号和姓名对照数据</td>
+                    <td>
+                        <div class="uk-button-group" style="margin-top: 2px;">
+                            <button data-type="work2Name" class="uk-button uk-button-primary show-data"><i class="uk-icon-search"></i> 查看</button>
+                            <button class="uk-button"><i class="uk-icon-refresh"></i> 刷新数据</button>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var modal = '#cache_data_manage-modal';
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+
+
+            });
+
+            var showDetailData = {
+                nbbm2DeviceId: function () {
+                    open_modal('/real_control_v2/fragments/north/nav/cache_data/nbbm_deviceid.html', {}, {bgclose: false, modal: false})
+                }
+            };
+            
+            $('.show-data', modal).on('click', function () {
+                var type = $(this).data('type');
+                if(type)
+                    showDetailData[type]();
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div class="uk-modal" id="cache_data_nbbm_deviceid-modal">
+    <div class="uk-modal-dialog" style="width: 480px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h3>车辆自编号和设备号对照数据</h3>
+        <div>
+			
+            <table class="uk-table">
+                <thead>
+                <tr>
+                    <th>自编号</th>
+                    <th>设备号</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>W2b-023</td>
+                    <td>559L0028</td>
+                </tr>
+                </tbody>
+            </table>
+
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var modal = '#cache_data_nbbm_deviceid-modal';
+
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -88,13 +88,7 @@
   {
     "id": 3,
     "text": "系统设置",
-    "children": [
-      {
-        "id": 3.1,
-        "text": "线路配置",
-        "event": "line_config"
-      }
-    ,{
+    "children": [{
         "id": 3.2,
         "text": "TTS",
         "event": "tts_config"
@@ -95,6 +95,9 @@ var gb_northToolbar = (function () {
         },
         line_config: function () {
             open_modal('/real_control_v2/fragments/north/nav/line_config/line_config.html', {}, modal_opts);
+        },
+        cache_data_manage: function () {
+            open_modal('/real_control_v2/fragments/north/nav/cache_data/list.html', {}, modal_opts);
         }
     };