一件报警地址更换，打电话地址更换，新的流程图

ljq
1 parent cf628373
Showing 52 changed files with 74 additions and 88 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/pages/zndd_yuan/call/assets/css/bootstrap.min.css → src/main/resources/static/real_control_v2/js/call/assets/css/bootstrap.min.css
src/main/resources/static/pages/zndd_yuan/call/assets/css/index.css → src/main/resources/static/real_control_v2/js/call/assets/css/index.css
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.css → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.css
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.eot → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.eot
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.svg → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.svg
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.ttf → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.ttf
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.woff
src/main/resources/static/pages/zndd_yuan/call/assets/font/iconfont.woff2 → src/main/resources/static/real_control_v2/js/call/assets/font/iconfont.woff2
src/main/resources/static/pages/zndd_yuan/call/assets/images/BG.png → src/main/resources/static/real_control_v2/js/call/assets/images/BG.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/Dcall.png → src/main/resources/static/real_control_v2/js/call/assets/images/Dcall.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/Mcalls.png → src/main/resources/static/real_control_v2/js/call/assets/images/Mcalls.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/answer.png → src/main/resources/static/real_control_v2/js/call/assets/images/answer.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/audio_bg.png → src/main/resources/static/real_control_v2/js/call/assets/images/audio_bg.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/call_bg.png → src/main/resources/static/real_control_v2/js/call/assets/images/call_bg.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/changaudio-hover.png → src/main/resources/static/real_control_v2/js/call/assets/images/changaudio-hover.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/chart.png → src/main/resources/static/real_control_v2/js/call/assets/images/chart.png
src/main/resources/static/pages/zndd_yuan/call/assets/images/favicon.ico → src/main/resources/static/real_control_v2/js/call/assets/images/favicon.ico
@@ -101,8 +101,8 @@ public class PilotReport {
                 //报警请求
                 case 0x10:
                     try {
-                        String url = "http://61.169.120.202:13333/prod-api/dataDockingApi/accident/saveAccident?";
-                        url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + "W1F-024";
+                        String url = "http://58.34.52.130:9103/dataDockingApi/accident/saveAccident?";
+                        url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm;
                         logger.info("url===="+url);
                         String res = HttpClientUtils.get(url).toString();
                         JSONObject jsonObject = JSONObject.parseObject(res);
@@ -7,14 +7,12 @@ import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
  
 /**
@@ -75,13 +73,6 @@ public class ScheduleRefreshThread extends Thread{
 						//重载排班数据
 						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
 						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
-						//重新加载车辆执行班次
-						List<ScheduleRealInfo> schList = dayOfSchedule.findByLineCode(lineCode);
-						Set<String> cars = dayOfSchedule.searchAllCars(schList);
-						for (String nbbm : cars) {
-							//车辆 ——> 要执行的班次对照
-							dayOfSchedule.reCalcExecPlan(nbbm);
-						}
 					}
 				}catch (Exception e){
 					logger.error("班次更新失败！！ -" + lineCode, e);
@@ -574,7 +574,7 @@ span.sm-grey{
  
  
 .qtip-img > .qtip-content{
-    width: 600px;
+    width: 800px;
     padding: 0 0;
 }
  
@@ -6,19 +6,19 @@
     <meta name="google" content="notranslate" />
     <title>anyrtc 呼叫邀请DEMO - anyRTC</title>
     <!-- icon -->
-    <link rel="icon" href="/pages/zndd_yuan/call/assets/images/favicon.ico" />
+    <link rel="icon" href="/real_control_v2/js/call/assets/images/favicon.ico" />
     <!-- CSS only -->
-    <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/bootstrap.min.css"/>
-    <link rel="stylesheet" type="text/css" href="/pages/zndd_yuan/call/assets/font/iconfont.css" />
+    <link rel="stylesheet" href="/real_control_v2/js/call/assets/css/bootstrap.min.css"/>
+    <link rel="stylesheet" type="text/css" href="/real_control_v2/js/call/assets/font/iconfont.css" />
     <!-- JS, Popper.js, and jQuery -->
-    <script src="/pages/zndd_yuan/call/assets/js/jquery-3.5.1.min.js"></script>
-    <script src="/pages/zndd_yuan/call/assets/js/bootstrap.min.js"></script>
+    <script src="/real_control_v2/js/call/assets/js/jquery-3.5.1.min.js"></script>
+    <script src="/real_control_v2/js/call/assets/js/bootstrap.min.js"></script>
     <!-- JS, RTC and RTM -->
-    <script src="/pages/zndd_yuan/call/assets/js/latest.js"></script>
-    <script src="/pages/zndd_yuan/call/assets/js/ArRTM@latest.js"></script>
+    <script src="/real_control_v2/js/call/assets/js/latest.js"></script>
+    <script src="/real_control_v2/js/call/assets/js/ArRTM@latest.js"></script>
  
     <!-- 覆盖bootstrap样式 -->
-    <link rel="stylesheet" href="/pages/zndd_yuan/call/assets/css/index.css" />
+    <link rel="stylesheet" href="/real_control_v2/js/call/assets/css/index.css" />
   </head>
  
   <body class="notranslate">
@@ -28,7 +28,7 @@
     <!-- 首页 -->
     <div
       class="page d-flex flex-col justify-content-center align-items-center"
-      id="homePage" style="background-image:url('/pages/zndd_yuan/call/assets/images/yimg.jpg')"
+      id="homePage" style="background-image:url('/real_control_v2/js/call/assets/images/yimg.jpg')"
  
     >
       <!--  -->
@@ -133,7 +133,7 @@
                   <img
                     draggable="false"
                     class="img-responsive setting-video_preview_bg"
-                    src="/pages/zndd_yuan/call/assets/images/chart.png"
+                    src="/real_control_v2/js/call/assets/images/chart.png"
                   />
                   <div
                     id="settingVideoPreview"
@@ -332,7 +332,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
+            <img draggable="false" src="/real_control_v2/js/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -357,7 +357,7 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/pages/zndd_yuan/call/assets/images/hangup.png"
+            src="/real_control_v2/js/call/assets/images/hangup.png"
             id="cancelCallBtn"
           />
           <!-- <button type="button" class="btn btn-danger" >取消</button> -->
@@ -372,7 +372,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/pages/zndd_yuan/call/assets/images/head.png" />
+            <img draggable="false" src="/real_control_v2/js/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -398,21 +398,21 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/pages/zndd_yuan/call/assets/images/changaudio-hover.png"
+            src="/real_control_v2/js/call/assets/images/changaudio-hover.png"
             id="changAudioBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/pages/zndd_yuan/call/assets/images/answer.png"
+            src="/real_control_v2/js/call/assets/images/answer.png"
             id="acceptCallBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/pages/zndd_yuan/call/assets/images/hangup.png"
+            src="/real_control_v2/js/call/assets/images/hangup.png"
             id="refuseCallBtn"
           />
           <!-- 多人 -->
@@ -437,7 +437,7 @@
             <img
               draggable="false"
               class="img-responsive"
-              src="/pages/zndd_yuan/call/assets/images/head.png"
+              src="/real_control_v2/js/call/assets/images/head.png"
             />
           </div>
           <div class="">
@@ -469,7 +469,7 @@
             draggable="false"
             style="width: 100%"
             class="img-responsive"
-            src="/pages/zndd_yuan/call/assets/images/audio_bg.png"
+            src="/real_control_v2/js/call/assets/images/audio_bg.png"
           />
         </div>
       </div>
@@ -492,7 +492,7 @@
               draggable="false"
               style="position: absolute; width: 50%"
               class="img-responsive"
-              src="/pages/zndd_yuan/call/assets/images/logo_title.png"
+              src="/real_control_v2/js/call/assets/images/logo_title.png"
             />
           </div>
           <div class="prompt_little d-flex">
@@ -515,7 +515,7 @@
               draggable="false"
               style="position: absolute; width: 40%"
               class="img-responsive"
-              src="/pages/zndd_yuan/call/assets/images/logo_big.png"
+              src="/real_control_v2/js/call/assets/images/logo_big.png"
             />
           </div>
           <div class="prompt_big meet-control_icon m-3" id="videoDuration">
@@ -587,7 +587,7 @@
             <img
             draggable="false"
             class="img-responsive"
-            src="/pages/zndd_yuan/call/assets/images/logo_big.png"
+            src="/real_control_v2/js/call/assets/images/logo_big.png"
           />
           </div>
  
@@ -724,7 +724,7 @@
       </div>
       <!-- /.modal -->
     </div>
-    <script src="/pages/zndd_yuan/call/assets/js/index.js"></script>
+    <script src="/real_control_v2/js/call/assets/js/index.js"></script>
   </body>
 <script>
   (function() {
@@ -35,6 +35,15 @@ var gb_northToolbar = (function () {
  
             //exit
             $('.north .north-toolbar .exit-system').on('click', function () {
+                //调度员退出时提示未全部完成班次的线路
+                debugger
+                //默认只取一个角色
+              /*  if(currentUser.currentUser[0].codeName == "BSTH_A"){
+                    //提示未完成线路 搜索该用户下所有的线路 判断是否完成
+
+                }
+*/
+
                 //关闭websocket 连接
                 gb_sch_websocket.sock().close(1000, '退出线调');
                 window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
@@ -35,7 +35,7 @@ var gb_klyj = (function () {
         open_modal("/real_control_v2/zndd/type/dkl.html", {
             data: data
         }, {center: true, bgclose: false, modal: true});
-        $(this).parent().remove();
+        gb_dataZndd.removeTimelist(that.data('uuid'));
     });
  
     var close = true; //关闭弹出框的时候不弹出
@@ -27,7 +27,7 @@ var gb_stationcf = (function () {
     $wrap.on('click', '.all', function () {
         var type = $(this).data('ip');
         var calleeId = $(this).data('call')
-        var pageUrl ="/pages/zndd_yuan/call/index.html?calleeId="+calleeId;
+        var pageUrl ="/real_control_v2/js/call/index.html?calleeId="+calleeId;
         //将片段路径写入 localStorage
         window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
         var index = layer.open({
@@ -553,7 +553,7 @@
                     <div class="uk-form-controls">
                         <select name="destroy" class="form-control" id="destroySelect">
                             <option value="0">-- 临加班次 --</option>
-                            <option value="1">&#45;&#45; 修改班次类型 &#45;&#45;</option>
+                            <option value="1">&#45;&#45; 随到随发 &#45;&#45;</option>
                         </select>
                     </div>
                 </div>
@@ -2,7 +2,7 @@
     <div class="uk-modal-dialog" style="width: 1400px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>新增临加班次</h2></div>
+            <h2>新增临加班次<i class="uk-icon-question-circle uk-icon-hover"></i></h2></div>
         <div class="uk-grid uk-width-2-5" style="float: left">
             <div class="uk-width-5-5">
                 <form class="uk-form uk-form-horizontal"> </form>
@@ -464,6 +464,32 @@
                 });
             }
  
+            $(modal).on('mouseenter', '.uk-icon-question-circle', function() {
+
+                debugger
+                $(this).qtip({
+                    show: {
+                        ready: true,
+                        delay: 0
+                    },
+                    content: {
+                        text: function() {
+                            return template('home-icoe-img');
+                        }
+                    },
+                    position: {
+                        viewport: $(window) ,
+                    },
+                    style: {
+                        classes: 'qtip-img'
+                    },
+                    hide: {
+                        fixed: true,
+                        delay: 300
+                    },
+                });
+            });
+
         })();
     </script>
 </div>
@@ -581,6 +607,6 @@
         </div>
     </div>
 </script>
-<script>
-
+<script id="home-icoe-img" type="text/html">
+    <img src="/real_control_v2/zndd/img/dkl.png" style="width: 100%;height: 100%">
 </script>
 \ No newline at end of file
@@ -311,9 +311,9 @@
             </div>
             <div class="uk-width-1-2">
                 <div class="uk-form-row">
-                    <label class="uk-form-label">创新性</label>
+                    <label class="uk-form-label">执行准点率</label>
                     <div class="uk-form-controls">
-                        <input  value="80%"  disabled>
+                        <input  value="20%"  disabled>
                     </div>
                 </div>
             </div>
@@ -362,7 +362,7 @@
                 <label class="uk-form-label">检测效率</label>
                 <div class="uk-form-controls">
                     <i class="icon-user"></i>
-                    <input  value="80%"  disabled>
+                    <input  value="50%"  disabled>
                 </div>
             </div>
         </div>
@@ -376,26 +376,6 @@
             </div>
         </div>
     </div>
-    <div class="uk-grid">
-        <div class="uk-width-1-2">
-            <div class="uk-form-row">
-                <label class="uk-form-label">信息发布准确率</label>
-                <div class="uk-form-controls">
-                    <i class="icon-user"></i>
-                    <input  value="20%"  disabled>
-                </div>
-            </div>
-        </div>
-        <div class="uk-width-1-2">
-            <div class="uk-form-row">
-                <label class="uk-form-label">乘客满意度</label>
-                <div class="uk-form-controls">
-                    <i class="icon-user"></i>
-                    <input  value="10%" disabled>
-                </div>
-            </div>
-        </div>
-    </div>
     <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -412,5 +392,5 @@
 </style>
  
 <script id="home-icoe-img" type="text/html">
-    <img src="/real_control_v2/zndd/img/sftz_0.png" style="width: 100%;height: 100%">
+    <img src="/real_control_v2/zndd/img/sfwf.png" style="width: 100%;height: 100%">
 </script>
@@ -376,7 +376,7 @@
                 <label class="uk-form-label">发现效率</label>
                 <div class="uk-form-controls">
                     <i class="icon-user"></i>
-                    <input  value="80%"  disabled>
+                    <input  value="50%"  disabled>
                 </div>
             </div>
         </div>
@@ -405,7 +405,7 @@
 </style>
  
 <script id="home-icoe-img" type="text/html">
-    <img src="/real_control_v2/zndd/img/wd_0.png" style="width: 100%;height: 100%">
+    <img src="/real_control_v2/zndd/img/wd.png" style="width: 120%;height: 100%">
 </script>
  
  
@@ -267,30 +267,10 @@
     </div>
     <div class="uk-width-1-2">
       <div class="uk-form-row">
-        <label class="uk-form-label">执行准点率</label>
-        <div class="uk-form-controls">
-          <i class="icon-user"></i>
-          <input  value="80%" disabled>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="uk-grid">
-    <div class="uk-width-1-2">
-      <div class="uk-form-row">
-        <label class="uk-form-label">信息发布准确率</label>
-        <div class="uk-form-controls">
-          <i class="icon-user"></i>
-          <input  value="20%"  disabled>
-        </div>
-      </div>
-    </div>
-    <div class="uk-width-1-2">
-      <div class="uk-form-row">
         <label class="uk-form-label">响应速度</label>
         <div class="uk-form-controls">
           <i class="icon-user"></i>
-          <input  value="20%" disabled>
+          <input  value="80%" disabled>
         </div>
       </div>
     </div>
@@ -307,5 +287,5 @@
 </style>
  
 <script id="home-icoe-img" type="text/html">
-    <img src="/real_control_v2/zndd/img/ycsf_0.png" style="width: 100%;height: 100%">
+    <img src="/real_control_v2/zndd/img/ycsf.png" style="width: 100%;height: 100%">
 </script>