Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -232,7 +232,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     return;
                 }
                 var useraccount=$(this).attr('data-useraccount');
-                var dutyTime=$(this).attr('data-dutytime');
+                var dutyTime = $(this).attr('data-dutytime');
+                var dutyDuration = $(this).attr('data-dutyduration');
                 //权限判断
                 var judge=false;
                 //角色
@@ -264,7 +265,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                 }
                 //自己不能调换自己
                 var id = $(this).attr('data-id');
-                exchange(id);
+                exchange(id, dutyTime, dutyDuration);
             });
         }
 
@@ -356,7 +357,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         }
 
         //调换
-        function exchange(id) {
+        function exchange(id, changeDutyTime, changeDutyDuration) {
             layer.open({
                 type: 1 //Page层类型
                 , area: ['40%', '46%']
@@ -384,11 +385,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     form.render();
                 }
                 , yes: function (index, layero) {
+
+                    var changeUserName = '';
+                    var changeUserAccount = '';
                     //调班
-                    if(exchangeSign==1){
+                    if (exchangeSign == 1) {
                         //如果已经选择了调班对象，不能再选择其他对象
-                        var judge=iSExchange(id);
-                        if(!judge){
+                        var judge = iSExchange(id);
+                        if (!judge) {
                             layer.msg('调班过程中不能再次调班!', {icon: 7, time: 3000});
                             return;
                         }
@@ -402,6 +406,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                             if (v.value == changeUserId[0]) {
                                 if (v.code == user) {
                                     flagUser = 1;
+                                } else {
+                                    changeUserName = v.name;
+                                    changeUserAccount = v.code;
                                 }
                             }
                         });
@@ -431,6 +438,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                             if (v.value == changeUserId[0]) {
                                 if (v.code == user) {
                                     flagUser = 1;
+                                } else {
+                                    changeUserName = v.name;
+                                    changeUserAccount = v.code;
                                 }
                             }
                         });
@@ -441,9 +451,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     }
                     var duty = {
                         id: id,
-                        changeUserId: changeUserId[0]?changeUserId[0]:'',
-                        changeDateTimeId:changeDataTime?changeDataTime.toString():'',
-                        exchangeSign:exchangeSign?exchangeSign.toString():''
+                        changeUserId: changeUserId[0] ? changeUserId[0] : '',
+                        changeDateTimeId: changeDataTime ? changeDataTime.toString() : '',
+                        exchangeSign: exchangeSign ? exchangeSign.toString() : '',
+                        changeDutyTime,
+                        changeDutyDuration,
+                        changeUserName,
+                        changeUserAccount
                     }
                     admin.req({
                         url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken,

@@ -661,6 +661,9 @@ layui.define(['view'], function(exports){
         , toBigScreen: function () {
             window.open(sessionStorage.getItem("bigScreen") + '?access_token=' + localStorage.getItem("access_token"));
         }
+        , toSxView: function () {
+            window.open(sessionStorage.getItem("sxView") + '?access_token=' + localStorage.getItem("access_token"));
+        }
 
         //向右滚动页面标签
         , leftPage: function () {

@@ -58,6 +58,9 @@
             <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
                 <a href="javascript:;" layadmin-event="globalSearch"><i class="layui-icon layui-icon-search"></i></a>
             </li>
+            <li class="layui-nav-item" lay-tips="一体化视图">
+                <a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>
+            </li>
             <li class="layui-nav-item" lay-tips="大屏">
                 <a href="javascript:;" layadmin-event="toBigScreen"><i class="layui-icon layui-icon-chart-screen"></i></a>
             </li>

@@ -39,6 +39,7 @@
         sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor);
         sessionStorage.setItem('tingyun', res1[0].tingyun);
         sessionStorage.setItem('bigScreen', res1[0].bigScreen);
+        sessionStorage.setItem('sxView', res1[0].sxView);
         sessionStorage.setItem('workflow', res1[0].workflow);
         sessionStorage.setItem('mp3', res2[0].mp3);
         sessionStorage.setItem('jimuReport', res1[0].jimuReport);

@@ -12,7 +12,7 @@ server:
     key-store-password: Hg0801..
     key-password: Hg0801..
 url:
-  gateway: http://172.16.20.43:8080
+  gateway: http://127.0.0.1:8080
   inspection_web: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   mxgraph_editor: http://127.0.0.1:8085