一件报警修改url，功能对应标书文档

ljq
1 parent b8feebe3
Showing 10 changed files with 76 additions and 29 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
src/main/resources/static/pages/zndd_yuan/DKL.html
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/zndd/type/dkl.html
src/main/resources/static/real_control_v2/zndd/type/fcjg.html
src/main/resources/static/real_control_v2/zndd/type/mz.html
@@ -13,6 +13,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.repository.directive.DC0A4Repository;
+import com.bsth.service.SystemParamService;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.websocket.handler.SendUtils;
@@ -53,6 +54,8 @@ public class PilotReport {
     @Autowired
     GpsStatusManager gpsStatusManager;
+    @Autowired
+    private SystemParamService systemParamService;
     private static ConcurrentHashMap<Integer, D80> d80Maps;
     /**
@@ -101,7 +104,7 @@ public class PilotReport {
                 //报警请求
                 case 0x10:
                     try {
-                        String url = "http://58.34.52.130:9103/dataDockingApi/accident/saveAccident?";
+                        String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
                         url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm;
                         logger.info("url===="+url);
                         String res = HttpClientUtils.get(url).toString();
@@ -38,7 +38,7 @@
 		<div class="actions">
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
+				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 排班诊断</a>
 			</div>
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
 				<a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
@@ -50,7 +50,7 @@
 				<!-- actions 组件START -->
 				<div class="actions">
 					<div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
-						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 统计数据</a>
+						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 排班统计</a>
 					</div>
                     <div class="btn-group btn-group-devided parambtn" data-toggle="buttons">
                         <a class="btn btn-circle blue paramAdd" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 重新生成</a>
@@ -42,7 +42,7 @@ $(&#39;.addBc&#39;).on(&#39;click&#39;,function() {
     var lpData = echartsDrawGTT.getLpData();
     var lpDataCount = echartsDrawGTT.getLpDataCount();
     // 弹出层mobal页面
-    $.get('/pages/base/timesmodel/fragments/addBc.html', function(m){
+    $.get('/pages/base/timesmodel/fragments/addbc.html', function(m){
         $(pjaxContainer).append(m);
         // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
         $('#addBc_mobal').trigger('addBcMobal.show',[lpData,lpDataCount,echartsDrawGTT]);
@@ -192,7 +192,7 @@
                     <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
                     <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
-                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
+                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 排班优化 </a>
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>
@@ -182,8 +182,8 @@
              id: 'card4',
              x: 100,
              y: 400,
-             label: '待发调整',
-             type: "待发调整",
+             label: '待发调整工具',
+             type: "待发调整工具",
              nodes: [{
                  type: "in",
                  level: 0,
@@ -199,13 +199,35 @@
              }
              ],
              titleBarColor: ['#3950e8', '#25f6d0']
-            },
+        },
         {
             id: 'card5',
             x: 100,
             y: 400,
-            label: '班次取消（烂班）',
-            type: "班次取消（烂班）",
+            label: '班次取消（烂班）工具',
+            type: "班次取消（烂班）工具",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card51',
+            x: 100,
+            y: 400,
+            label: '撤销班次取消（烂班）工具',
+            type: "撤销班次取消（烂班）工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -226,8 +248,30 @@
             id: 'card6',
             x: 100,
             y: 400,
-            label: '实发调整',
-            type: "实发调整",
+            label: '实发调整工具',
+            type: "实发调整工具",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card7',
+            x: 100,
+            y: 400,
+            label: '实发撤销工具',
+            type: "实发撤销工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -248,8 +292,8 @@
             id: 'card7',
             x: 100,
             y: 400,
-            label: '实发撤销',
-            type: "实发撤销",
+            label: '发车信息微调工具',
+            type: "发车信息微调工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -270,8 +314,8 @@
             id: 'card8',
             x: 100,
             y: 400,
-            label: '新增临加班次',
-            type: "新增临加班次",
+            label: '新增临加班次工具',
+            type: "新增临加班次工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -292,8 +336,8 @@
             id: 'card9',
             x: 100,
             y: 400,
-            label: '调整人车',
-            type: "调整人车",
+            label: '调整人车工具',
+            type: "调整人车工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -314,8 +358,8 @@
             id: 'card10',
             x: 100,
             y: 400,
-            label: '指令重发',
-            type: "指令重发",
+            label: '指令重发工具',
+            type: "指令重发工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -336,8 +380,8 @@
             id: 'card11',
             x: 100,
             y: 400,
-            label: '路牌对调',
-            type: "路牌对调",
+            label: '路牌对调工具',
+            type: "路牌对调工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -358,8 +402,8 @@
             id: 'card12',
             x: 100,
             y: 400,
-            label: '误点调整',
-            type: "误点调整",
+            label: '误点调整工具',
+            type: "误点调整工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -37,7 +37,7 @@ var gb_northToolbar = (function () {
             $('.north .north-toolbar .exit-system').on('click', function () {
                 //调度员退出时提示未全部完成班次的线路
                 //默认只取一个角色
-                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY" || user.roles[0].codeName == "BSTH_A"){
+                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"){
                     //提示未完成线路 搜索该用户下所有的线路 判断是否完成
                     $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) {
                         if(rs.length > 0){
@@ -432,9 +432,9 @@
                 gb_common.$post('/realSchedule', data, function (rs) {
                     notify_succ('新增临加班次成功');
                     cb && cb(rs);
-                    var folder = '/real_control_v2/zndd/yanshi';
+                    /*var folder = '/real_control_v2/zndd/yanshi';
                     open_modal(folder + '/yanshi.html', {
-                    }, {center: true, bgclose: false, modal: true});
+                    }, {center: true, bgclose: false, modal: true});*/
                 }, err);
             }
@@ -2,7 +2,7 @@
     <div class="uk-modal-dialog" style="width: 920px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>新增临加班次</h2></div>
+            <h2>发车间隔</h2></div>
         <div class="uk-grid uk-width-3-5" style="float: left">
             <div class="uk-width-5-5">
                 <form class="uk-form uk-form-horizontal"> </form>
@@ -448,7 +448,7 @@
         <div class="uk-width-1-1">
             <div class="uk-form-row">
-                <label class="uk-form-label">车内视频：</label>
+                <label class="uk-form-label">车内情况：</label>
             </div>
         </div>
     </div>