monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4546fee2a145567801fed33ae2a2adec64fa3345 2 parents 76ebcc76 ded494ba

Merge branch 'master-huijiaxu' into 'master' 

值班管理消息提醒



See merge request !7
Inline Side-by-side
Showing 5 changed files with 31 additions and 10 deletions
@@ -232,7 +232,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -232,7 +232,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
232 return; 232 return;
233 } 233 }
234 var useraccount=$(this).attr('data-useraccount'); 234 var useraccount=$(this).attr('data-useraccount');
235 - var dutyTime=$(this).attr('data-dutytime'); 235 + var dutyTime = $(this).attr('data-dutytime');
  236 + var dutyDuration = $(this).attr('data-dutyduration');
236 //权限判断 237 //权限判断
237 var judge=false; 238 var judge=false;
238 //角色 239 //角色
@@ -264,7 +265,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -264,7 +265,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
264 } 265 }
265 //自己不能调换自己 266 //自己不能调换自己
266 var id = $(this).attr('data-id'); 267 var id = $(this).attr('data-id');
267 - exchange(id); 268 + exchange(id, dutyTime, dutyDuration);
268 }); 269 });
269 } 270 }
270 271
@@ -356,7 +357,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -356,7 +357,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
356 } 357 }
357 358
358 //调换 359 //调换
359 - function exchange(id) { 360 + function exchange(id, changeDutyTime, changeDutyDuration) {
360 layer.open({ 361 layer.open({
361 type: 1 //Page层类型 362 type: 1 //Page层类型
362 , area: ['40%', '46%'] 363 , area: ['40%', '46%']
@@ -384,11 +385,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -384,11 +385,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
384 form.render(); 385 form.render();
385 } 386 }
386 , yes: function (index, layero) { 387 , yes: function (index, layero) {
  388 +
  389 + var changeUserName = '';
  390 + var changeUserAccount = '';
387 //调班 391 //调班
388 - if(exchangeSign==1){ 392 + if (exchangeSign == 1) {
389 //如果已经选择了调班对象，不能再选择其他对象 393 //如果已经选择了调班对象，不能再选择其他对象
390 - var judge=iSExchange(id);  
391 - if(!judge){ 394 + var judge = iSExchange(id);
  395 + if (!judge) {
392 layer.msg('调班过程中不能再次调班!', {icon: 7, time: 3000}); 396 layer.msg('调班过程中不能再次调班!', {icon: 7, time: 3000});
393 return; 397 return;
394 } 398 }
@@ -402,6 +406,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -402,6 +406,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
402 if (v.value == changeUserId[0]) { 406 if (v.value == changeUserId[0]) {
403 if (v.code == user) { 407 if (v.code == user) {
404 flagUser = 1; 408 flagUser = 1;
  409 + } else {
  410 + changeUserName = v.name;
  411 + changeUserAccount = v.code;
405 } 412 }
406 } 413 }
407 }); 414 });
@@ -431,6 +438,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -431,6 +438,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
431 if (v.value == changeUserId[0]) { 438 if (v.value == changeUserId[0]) {
432 if (v.code == user) { 439 if (v.code == user) {
433 flagUser = 1; 440 flagUser = 1;
  441 + } else {
  442 + changeUserName = v.name;
  443 + changeUserAccount = v.code;
434 } 444 }
435 } 445 }
436 }); 446 });
@@ -441,9 +451,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -441,9 +451,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
441 } 451 }
442 var duty = { 452 var duty = {
443 id: id, 453 id: id,
444 - changeUserId: changeUserId[0]?changeUserId[0]:'',  
445 - changeDateTimeId:changeDataTime?changeDataTime.toString():'',  
446 - exchangeSign:exchangeSign?exchangeSign.toString():'' 454 + changeUserId: changeUserId[0] ? changeUserId[0] : '',
  455 + changeDateTimeId: changeDataTime ? changeDataTime.toString() : '',
  456 + exchangeSign: exchangeSign ? exchangeSign.toString() : '',
  457 + changeDutyTime,
  458 + changeDutyDuration,
  459 + changeUserName,
  460 + changeUserAccount
447 } 461 }
448 admin.req({ 462 admin.req({
449 url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken, 463 url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken,
@@ -661,6 +661,9 @@ layui.define(['view'], function(exports){ @@ -661,6 +661,9 @@ layui.define(['view'], function(exports){
661 , toBigScreen: function () { 661 , toBigScreen: function () {
662 window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token")); 662 window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token"));
663 } 663 }
  664 + , toSxView: function () {
  665 + window.open(sessionStorage.getItem("sxView") + '?access_token=' + localStorage.getItem("access_token"));
  666 + }
664 667
665 //向右滚动页面标签 668 //向右滚动页面标签
666 , leftPage: function () { 669 , leftPage: function () {
@@ -58,6 +58,9 @@ @@ -58,6 +58,9 @@
58 <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索"> 58 <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
59 <a href="javascript:;" layadmin-event="globalSearch"><i class="layui-icon layui-icon-search"></i></a> 59 <a href="javascript:;" layadmin-event="globalSearch"><i class="layui-icon layui-icon-search"></i></a>
60 </li> 60 </li>
  61 + <li class="layui-nav-item" lay-tips="一体化视图">
  62 + <a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>
  63 + </li>
61 <li class="layui-nav-item" lay-tips="大屏"> 64 <li class="layui-nav-item" lay-tips="大屏">
62 <a href="javascript:;" layadmin-event="toBigScreen"><i class="layui-icon layui-icon-chart-screen"></i></a> 65 <a href="javascript:;" layadmin-event="toBigScreen"><i class="layui-icon layui-icon-chart-screen"></i></a>
63 </li> 66 </li>
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor); 39 sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor);
40 sessionStorage.setItem('tingyun', res1[0].tingyun); 40 sessionStorage.setItem('tingyun', res1[0].tingyun);
41 sessionStorage.setItem('bigScreen', res1[0].bigScreen); 41 sessionStorage.setItem('bigScreen', res1[0].bigScreen);
  42 + sessionStorage.setItem('sxView', res1[0].sxView);
42 sessionStorage.setItem('workflow', res1[0].workflow); 43 sessionStorage.setItem('workflow', res1[0].workflow);
43 sessionStorage.setItem('mp3', res2[0].mp3); 44 sessionStorage.setItem('mp3', res2[0].mp3);
44 sessionStorage.setItem('jimuReport', res1[0].jimuReport); 45 sessionStorage.setItem('jimuReport', res1[0].jimuReport);
@@ -12,7 +12,7 @@ server: @@ -12,7 +12,7 @@ server:
12 key-store-password: Hg0801.. 12 key-store-password: Hg0801..
13 key-password: Hg0801.. 13 key-password: Hg0801..
14 url: 14 url:
15 - gateway: http://172.16.20.43:8080 15 + gateway: http://127.0.0.1:8080
16 inspection_web: http://127.0.0.1:8082 16 inspection_web: http://127.0.0.1:8082
17 assetsweb: http://127.0.0.1:8082 17 assetsweb: http://127.0.0.1:8082
18 mxgraph_editor: http://127.0.0.1:8085 18 mxgraph_editor: http://127.0.0.1:8085