Commit 4b214f69a6788422eef707946798aaeaa5944b8a
1 parent
af98851a
update...
Showing
2 changed files
with
6 additions
and
1 deletions
src/main/resources/static/real_control_v2/js/forms/form_embed.js
| @@ -53,6 +53,10 @@ var gb_embed_form_hanlde = (function () { | @@ -53,6 +53,10 @@ var gb_embed_form_hanlde = (function () { | ||
| 53 | area: ['1093px', '600px'], | 53 | area: ['1093px', '600px'], |
| 54 | moveOut: true, | 54 | moveOut: true, |
| 55 | content: wrapUrl, | 55 | content: wrapUrl, |
| 56 | + zIndex: layer.zIndex, | ||
| 57 | + success: function(layero){ | ||
| 58 | + layer.setTop(layero); | ||
| 59 | + }, | ||
| 56 | end: function () { | 60 | end: function () { |
| 57 | 61 | ||
| 58 | } | 62 | } |
src/main/resources/static/real_control_v2/js/main.js
| @@ -170,7 +170,8 @@ function showUpdateDescription() { | @@ -170,7 +170,8 @@ function showUpdateDescription() { | ||
| 170 | //更新说明 | 170 | //更新说明 |
| 171 | var updateDescription = { | 171 | var updateDescription = { |
| 172 | date: '2017-05-18', | 172 | date: '2017-05-18', |
| 173 | - text: '<h5>现在自定义子任务，勾选是否烂班后，烂班原因必填。</h5><h5>修复了在驾驶员请求出场时，误下发分班出场指令的问题</h5>' | 173 | + text: '<h5>现在自定义子任务，勾选是否烂班后，烂班原因必填。</h5><h5>修复了在驾驶员请求出场时，误下发分班出场指令的问题</h5>' + |
| 174 | + '<h5>调整了报表的弹出窗口<br>1、取消了窗口遮罩，可同时打开多个报表窗口，窗口堆叠时，点击窗口title切换堆叠顺序<br>2、鼠标按住窗口右下角，可随意改变窗口大小。<br>3、拖动窗口时，允许拖出页面之外<br><br>注意：将窗口和窗口title拖出页面外时，会面临窗口丢失的风险，过多丢失的窗口会影响到页面性能，你可以刷新页面以重置！</h5>' | ||
| 174 | }; | 175 | }; |
| 175 | 176 | ||
| 176 | var storage = window.localStorage | 177 | var storage = window.localStorage |