Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -337,7 +337,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
             });
             data.subGroupLists = receiveGroupInfoS;
             delete data["sub_send_type"];
-            form.on('submit(add-alarmsubscribe-form)', function () {
+            // form.on('submit(add-alarmsubscribe-form)', function () {
                 var alrmlevels = [], reportTypes = [];
                 $('input[name="reportType"]:checked').each(function () {
                     reportTypes.push($(this).val());
@@ -376,7 +376,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
                     }
                 });
                 return false;//必须要写，解决禁用submit提交，ajax方法才能正确执行，且表单不会自动刷新
-            })
+            // })
         });
 
         //为用户添加资源权限

@@ -35,12 +35,13 @@ layui.define(['element', 'admin', 'view'], function (exports) {
             // debugger
             var hash = window.top.location.hash;
             sessionStorage.setItem("pagePath", hash);
-            sessionStorage.setItem("batchNo", window.generateUUID().replace(/-/g, ""));
+            sessionStorage.setItem("batchNo", that.getOperateUUID());
 
             if (hash == '#/') {
                 sessionStorage.setItem("pageName", "首页");
                 sessionStorage.setItem("menuName", "首页");
                 sessionStorage.setItem("menuPath", "");
+                sessionStorage.setItem("groupId",that.getOperateUUID());
                 return;
             } else if (hash == '#/user/login/redirect=%2F') {
                 sessionStorage.setItem("pageName", "登录");
@@ -138,6 +139,13 @@ layui.define(['element', 'admin', 'view'], function (exports) {
         },
 
         /**
+         * 获取操作
+         */
+        getOperateUUID:() => {
+            return window.generateUUID().replace(/-/g, "") + (new Date()).getTime();
+        },
+
+        /**
          * 渲染完成后初始化函数
          * @returns {[]}
          */
@@ -294,6 +302,7 @@ layui.define(['element', 'admin', 'view'], function (exports) {
                 sessionStorage.setItem("buttonPath", "");
                 sessionStorage.setItem("buttonName", "");
 
+                sessionStorage.setItem("groupId",that.getOperateUUID());
                 //that.sendAjaxData(layHref, text)
                 sessionStorage.setItem("menuName", text);
                 sessionStorage.setItem("menuPath", layHref);
@@ -316,7 +325,7 @@ layui.define(['element', 'admin', 'view'], function (exports) {
          */
         clickEventHandle(thisObj, key) {
             let that = this;
-            sessionStorage.setItem("groupId",window.generateUUID().replace(/-/g, ""));
+            sessionStorage.setItem("groupId",that.getOperateUUID());
 
             let layHref = thisObj.attr('lay-href') ? thisObj.attr('lay-href') : '';
             sessionStorage.setItem("buttonName", thisObj.text());