潘钊 / bsth_control · Commits

Commit 336dcf2a38ddc0579a220b5b5735cd939f5c6aab

Authored by 潘钊
1 parent e660b6ca

update...

Inline Side-by-side
Showing 2 changed files with 34 additions and 4 deletions
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
  View file @336dcf2
@@ -133,13 +133,14 @@ public class RealControlSocketHandler implements WebSocketHandler { @@ -133,13 +133,14 @@ public class RealControlSocketHandler implements WebSocketHandler {
133 WebSocketSession user; 133 WebSocketSession user;
134 while(iterator.hasNext()){ 134 while(iterator.hasNext()){
135 user = iterator.next(); 135 user = iterator.next();
136 - try { 136 + WebSocketPushQueue.put(user, message);
  137 + /*try {
137 if (user.isOpen()) { 138 if (user.isOpen()) {
138 user.sendMessage(message); 139 user.sendMessage(message);
139 } 140 }
140 } catch (Exception e) { 141 } catch (Exception e) {
141 logger.error("sendMessage error ...."+msg); 142 logger.error("sendMessage error ...."+msg);
142 - } 143 + }*/
143 } 144 }
144 } 145 }
145 } 146 }
src/main/resources/static/real_control_v2/js/forms/wrap.html
  View file @336dcf2
@@ -15,6 +15,9 @@ @@ -15,6 +15,9 @@
15 <!-- 日期控件 --> 15 <!-- 日期控件 -->
16 <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css" 16 <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
17 rel="stylesheet" type="text/css"/> 17 rel="stylesheet" type="text/css"/>
  18 + <!-- layer 弹层 插件 -->
  19 + <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
  20 + rel="stylesheet" type="text/css" />
18 21
19 <!-- jQuery --> 22 <!-- jQuery -->
20 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script> 23 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
@@ -28,6 +31,8 @@ @@ -28,6 +31,8 @@
28 <!-- art-template 模版引擎 --> 31 <!-- art-template 模版引擎 -->
29 <script src="/assets/plugins/template.js"></script> 32 <script src="/assets/plugins/template.js"></script>
30 <script src="/pages/forms/statement/js/jquery.PrintArea.js"></script> 33 <script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
  34 + <!-- layer 弹层 -->
  35 + <script src="/assets/plugins/layer-v2.4/layer/layer.js" ></script>
31 36
32 <style> 37 <style>
33 body{ 38 body{
@@ -65,6 +70,21 @@ @@ -65,6 +70,21 @@
65 if($("#ddrbBody").length > 0){ 70 if($("#ddrbBody").length > 0){
66 $("#ddrbBody").height("620px"); 71 $("#ddrbBody").height("620px");
67 } 72 }
  73 +
  74 + //去掉公司和分公司选项
  75 + var company = $('select[name=company]', '.form-page-content');
  76 + var subCompany = $('select[name=subCompany]', '.form-page-content');
  77 + if(company.length > 0){
  78 + company.parent().remove();
  79 + }
  80 + if(subCompany.length > 0){
  81 + subCompany.parent().remove();
  82 + }
  83 +
  84 + //重新构造线路下拉框
  85 + //var lineSelect = $('select[name=line]', '.form-page-content');
  86 + //lineSelect.select2('destory').html('');
  87 + //initPinYinSelect2(lineSelect);
68 }); 88 });
69 89
70 //iframe 自适应高度 90 //iframe 自适应高度
@@ -90,7 +110,7 @@ @@ -90,7 +110,7 @@
90 110
91 function initPinYinSelect2(selector, data, cb) { 111 function initPinYinSelect2(selector, data, cb) {
92 //过滤线路选择框数据 112 //过滤线路选择框数据
93 - if(selector === '#line'){ 113 + /*if(selector === '#line'){
94 var idx = ',' + top.gb_data_basic.line_idx + ','; 114 var idx = ',' + top.gb_data_basic.line_idx + ',';
95 var newData = []; 115 var newData = [];
96 $.each(data, function () { 116 $.each(data, function () {
@@ -98,8 +118,17 @@ @@ -98,8 +118,17 @@
98 newData.push(this); 118 newData.push(this);
99 }); 119 });
100 data = newData; 120 data = newData;
  121 + }*/
  122 + if(selector === '#line'){
  123 + //写死线路下拉框
  124 + data = [];
  125 + $.each(top.gb_data_basic.activeLines, function () {
  126 + data.push({
  127 + id: this.lineCode,
  128 + text: this.name
  129 + });
  130 + });
101 } 131 }
102 -  
103 $.each(data, function () { 132 $.each(data, function () {
104 this.fullChars = pinyin.getFullChars(this.text).toUpperCase(); 133 this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
105 this.camelChars = pinyin.getCamelChars(this.text); 134 this.camelChars = pinyin.getCamelChars(this.text);