Merge remote-tracking branch 'origin/master-mj' into master-mj

@@ -12,8 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
     var upload = layui.upload; //上传
 
     exports('dutyIndex', function () {
-        var sessions = layui.sessions;
-        var accessToken = sessions.getToken()['access_token'];
+        //var sessions = layui.sessions;
+        var accessToken = localStorage.getItem("accessToken");
         var domainName = common.domainName;
         var user = localStorage.getItem("lgn");
         var roles = sessionStorage.getItem('roles');
@@ -40,13 +40,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         $('.table-duty-title-text').text(yearNew + '年' + monthNew + '月');
 
         loadTable();
-
+        var param = {"accessToken": accessToken}
         //渲染上传组件
         var uploadIndex = upload.render({
             elem: '#btn-duty-dutyImport'
-            , url: domainName + '/api-web/manage/duty/importFromTemplate?access_token=' + accessToken
-            , accept: 'file',
-            before: function () {
+            , url: domainName + '/api-web/manage/duty/importFromTemplate?accessToken=' + accessToken
+            ,data: param
+            ,accept: 'file' //允许上传的文件类型
+            ,exts:'xlsx'
+            ,multiple:true
+            ,before: function () {
                 loadIndex = layer.load(1, {shade: [0.6], content: '正在导入，请稍后...'});
             }
             , done: function (res) {
@@ -306,7 +309,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     var paramMonth = $('#duty-calendar-export-month').val();
                     if (paramYear || paramMonth) {
                         var params = {};
-                        params.access_token = accessToken;
+                        params.accessToken = accessToken;
                         params.year = paramYear;
                         params.month = paramMonth;
                         layer.closeAll();
@@ -343,7 +346,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     var param = $('#dutyYearMonth').val();
                     if (param) {
                         var params = {};
-                        params.access_token = accessToken;
+                        params.accessToken = accessToken;
                         params.year = param.split("-")[0];
                         params.month = param.split("-")[1];
                         window.open(domainName + '/api-web/manage/duty/template?' + $.param(params));
@@ -460,7 +463,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                         changeUserAccount
                     }
                     admin.req({
-                        url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken,
+                        url: domainName + '/api-web/manage/duty/save?accessToken=' + accessToken,
                         type: 'POST',
                         async: false,
                         contentType: 'application/json',
@@ -486,7 +489,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function iSExchange(id) {
             var value = false;
             admin.req({
-                url: domainName + '/api-web/manage/duty/queryExchange?access_token=' + accessToken,
+                url: domainName + '/api-web/manage/duty/queryExchange?accessToken=' + accessToken,
                 async: false,
                 data: {id: id},
             }).done(function (response) {
@@ -502,7 +505,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function iSExchangeClass(id) {
             var value = false;
             admin.req({
-                url: domainName + '/api-web/manage/duty/queryExchangeClass?access_token=' + accessToken,
+                url: domainName + '/api-web/manage/duty/queryExchangeClass?accessToken=' + accessToken,
                 async: false,
                 data: {id: id},
             }).done(function (response) {
@@ -582,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function obtain() {
             //获取用户数据
             $.ajax({
-                url: common.domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                url: common.domainName + '/mj/user/getAll?accessToken=' + accessToken,
                 async: false,
                 data: {name: ''},
                 success: function (data) {
@@ -642,12 +645,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             if (arr && arr.length == 1) {
                 changeUserId = arr[0].value;
             }
-            if (changeUserId == '') {
+            if (changeUserId == '') {d
                 return;
             }
             //获取时间段数据
             $.ajax({
-                url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&access_token=' + accessToken,
+                url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&accessToken=' + accessToken,
                 async: false,
                 success: function (data) {
                     data = data.data;

@@ -169,7 +169,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
                             tagIds.push($(this).attr("id"))
                         }
                         $("#selectTagIds").val(tagIds)
-                        console.log(tagIds);
                     });
 
                 }

@@ -94,7 +94,7 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
             // 跳转地址
             var url = getUrlParam("url").split('#/')[0];
             var map = getUrlParamMap();
-
+            localStorage.setItem("page_url","zhjk/monitor-web/#/"+url);
             let arr = [];
             if(map){
                 Object.keys(map).map(_ => arr.push(`${_}=${map[_]}`));

@@ -20,6 +20,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
         var resource_view = '';
         var biz_view = '';
         var collTypeSelect = '';
+        var tagIds = [];
         //传递参数
         let resTypes = data && data.resTypes ? data.resTypes : [];
         let showType = data && data.showType == 0 ? data.showType : 1;
@@ -433,6 +434,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
 
                         // 如果是编辑，回显数据
                         if (actionType === 'edit') {
+                            var oldResTypeCode  = resType.resTypeCode;
                             // 获取关联表信息
                             admin.req({
                                 url: domainName + '/api-web/manage/restypeProtocol/restype/' + resType.resTypeCode
@@ -509,6 +511,11 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
                                 })
                             }
                             refreshProtocolItems();
+                            // 获取标签
+                            getTags(oldResTypeCode);
+                        }else{
+                            // 获取标签
+                            getTags()
                         }
 
                     });
@@ -737,6 +744,7 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
                             layer.closeAll();
                             layer.msg(response.msg, {icon: 1, time: 3000});
                             loadResTypeTable();
+                            saveResTypeTagRel(resType.resTypeCode);
                         } else {
                             layer.msg(actionName + '失败!', {icon: 2, time: 3000});
                         }
@@ -749,6 +757,62 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
             }
         };
 
+        //保存标签关系
+        function saveResTypeTagRel(resTypeCode){
+
+            var selectTagIds = $("#selectResTypeTagIds").val();
+
+            var parmas = {
+                id:resTypeCode,
+                tags:selectTagIds,
+                type:"RESTYPE"
+            }
+            admin.req({
+                url: common.domainName + '/api-web/systag/save',
+                method: 'get',
+                data : parmas,
+                sync: false,
+                success: function (res) {
+                    console.log("标签保存成功！")
+                }
+            });
+        }
+        function getTags(resType) {
+            tagIds = [];
+            admin.req({
+                url: common.domainName + '/api-web/systag/list?type=RESTYPE&id='+resType,
+                type: 'get',
+                sync: false,
+                success: function (res) {
+                    var html = '';
+                    if(res.data && res.data.length > 0){
+                        var activeTag = "";
+                        res.data.forEach((v, i) => {
+                            if(v.selTag){
+                                tagIds.push(v.id);
+                                activeTag = "activeTag";
+                            }else{
+                                activeTag = "";
+                            }
+                            html += ` <span class="tag ${activeTag}" id="${v.id}">${v.name}</span>`;
+                        });
+                    }
+                    $("#restype-tags").html(html);
+                    //添加点击事件
+                    $("#restype-tags").find(".tag").on("click",function () {
+                        if($(this).hasClass("activeTag")){
+                            $(this).removeClass("activeTag");
+                            tagIds.splice($(this).attr('id'), 1);
+                        }else{
+                            $(this).addClass("activeTag");
+                            tagIds.push($(this).attr("id"))
+                        }
+                        $("#selectResTypeTagIds").val(tagIds)
+                    });
+
+                }
+            });
+        }
         //查找子节点
         function getChilds(resTypeCode) {
             $.each($('.ew-tree-table').find('table tbody tr'), function () {

@@ -119,6 +119,14 @@ layui.define(['laytpl', 'layer'], function (exports) {
         //     // : (layui.data(setter.tableName)[request.tokenName] || '');
         // }
 
+        let userId = localStorage.getItem("userId");
+        let userName = localStorage.getItem("lgn");
+        let nickName = localStorage.getItem("nickName");
+        let hash = btoa(localStorage.getItem("page_url"));
+
+        options.data['MjUserId'] = userId;
+        options.data['MjUserName'] = userName;
+        options.data['MjHash'] = hash;
 
         if(options.method == 'post' || options.method == 'POST' || options.type == 'post' || options.type == 'POST'
             || options.type == 'delete' || options.method == 'delete' || options.type == 'DELETE' || options.method == 'DELETE'){
@@ -127,6 +135,9 @@ layui.define(['laytpl', 'layer'], function (exports) {
                 let tokenVal = common.getMjToken();
                 let  tokenKey = common.getMjTokenKey();
                 options.headers['AuthorizationMj'] = "BearerMj " + tokenVal;
+                options.headers['MjUserId'] = userId;
+                options.headers['MjUserName'] = userName;
+                options.headers['MjHash'] = hash;
             });
         } else if (request.tokenName) {
             let tokenVal =  options.data[request.tokenName];

@@ -238,7 +238,8 @@ html {
     margin: -16px -15px;
     font-size: 30px;
     color: #c2c2c2;
-    background: url(/start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
+    /*background: url(/start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;*/
+    background: url(data:image/gif;base64,R0lGODlhEAAQAPfgAP////39/erq6uvr6+jo6Pn5+dPT0/v7+/X19efn5/Pz8/j4+Pf39/r6+vz8/MzMzO/v7/b29svLy/7+/unp6e7u7kJCQtnZ2fHx8a+vr4mJid7e3s/PzyYmJrOzs/Dw8NLS0vT09Le3t9ra2tvb25CQkKOjo2tra9DQ0KysrM3Nza2traurq729vezs7M7OzuHh4fLy8rq6und3d6CgoIGBgYCAgGRkZGJiYsPDw8fHx4eHh+Dg4J+fn6KiooiIiG9vb6enp9fX18DAwOXl5d3d3e3t7WBgYJmZmZOTk9/f30VFRebm5jQ0NBUVFQQEBNjY2ISEhOTk5K6urtzc3D8/P2dnZ8LCwpubm8jIyLm5uZqamiEhIcTExC0tLbCwsIyMjNXV1dHR0VxcXOPj40lJSTw8PGxsbExMTCwsLF9fXxAQEMnJyRYWFpSUlCIiIhsbGwgICAsLC11dXVhYWJGRkba2try8vMbGxr+/v7i4uDs7O76+vmFhYYaGho2NjbW1tZeXl4qKiiQkJKmpqYODg0ZGRk9PT3Z2dgkJCTo6OkFBQY+Pjx8fH3l5eRMTEw8PDyoqKrGxsWhoaHNzcwcHB7KysqGhoYKCgkpKSmVlZXFxcaioqE1NTeLi4p2dnaampqSkpJ6ensXFxVNTU7S0tFZWVjExMVlZWaWlpVRUVDAwMCgoKFBQUKqqqg0NDUNDQxkZGT09PUdHR3p6ehISEgICAsHBwURERDU1NZKSkm1tbTk5OWlpaRwcHFJSUtTU1DMzMyAgIH5+fiMjI3JycnR0dA4ODkhISMrKynx8fJiYmAYGBnV1dU5OTgMDA4WFhR4eHgoKCpycnC8vL1paWmNjYzc3N7u7u4uLiycnJ3t7e15eXhoaGjY2NkBAQP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAADgACwAAAAAEAAQAAAIpQDBCRxIsGDBF1FwOQEQwEEAg+B6XJMT5wmAAwwiFCjo480jTVOYAJhQAEMFBgPFLOomyCADAQI2gqvDBQhEcBVgVBA4p4OImyFIeBIoy4uAmwcMhBFoocmAmw0kcBB4Yk+emwJyGBDYw8KPmyhkbBB4wUonTgYNTBnyYaCeMaiQqMCg4EILGimKFLzj6MYZRDY0JGFxAaISD0lqaEil4+jNxwIDAgAh+QQFAADgACwBAAEADgAOAAAImwDBCTRQx1SkDmj8qBDIkIUzbVzgOFkj59QWhhmqrJohggKBLzgqrQEADsocRRcZCqwBIMAEHxaiqFQZoMCBGWWuzGQYAAGDOa0q7BQ44cOHG3QgDAUXQMCAHUckLEVAZoClSTSWJqBSAcYOY3d2EhFThAE4HTVsWBqBIAKTMKNeuGD4AAkYN5+CfNGSjMDMBDokgVqRY0QMhgEBACH5BAUAAOAALAEAAQAOAA4AAAiZAMEJHOEDCDILOJKAEMhQxpkyFvY08dLBkAmGfPqo+nPFxQAtlBp1oAGOhzI1KRgy/NOG1wtAk6apVGnlGDQ3QDjMZJgh0RJMM2LsFJjgSRsNNhQMBQegaaofUJYGOOAATwkZSxdEOECBExYUOxFUUBAAnBBQQSQkKNAAgwAiAxYwJCHDg4wcEgyQYIJgJoQRKrJwKOJCrsCAACH5BAUAAOAALAEAAQAOAA4AAAiZAMEJhOFBg5UjtExAEcgwy48TN8aoQrNETQaGDwrNMKECQoUufsx8YwEuwZYafBgyxHLqkAEdYDyoVDmjQ50MSUbMZChCmCkTWBDsFEghFitCJiIMBUfg0aA8LKQszfAqkxAPKJYeiRPlw6gWPHZOsOXlATgieLLwwOAgQIMCDQIsY0ghDIgLPBIYUbAgwEwEAqSQoYChL8OAACH5BAUAAOAALAEAAQAOAA4AAAiZAMEJFMDGFSMNSPTAEMjwwopAJX7YmAGkxhCGRVJcykNCgQIQlzRZuQPuQ4sUBhgyzIAKCAkqdl6oVFkCTSgOLQjMZJhjySY2XQrsFOjCTBkOEhoMBTegiQUqIDAs1ZKmz4ALOoduGqRrARkYMXYKggMLBLgQCQSEODABwAprtd74YMjgA4YIBwA8SeStx0wHBQrktVBIBcOAACH5BAUAAOAALAEAAQAOAA4AAAibAMEJjEFFR6kVIh5QEMiQwIMWdjIE6RHIBwqGLl7gEUKAQQQl2MCAeQCOAQkURBgyzGGjBBkjF1KqZEiIkggCGxTMZIjixJ8EUhzsFPgBx4kBAgIMBQeBzo0YEBos7XJo24IQBZb6MRQqQIECE3Zu2aMGCrgAAQBwm5KAAKBm1KpkYAggDTNpkJz4ItaJxcwHhWZx6UCqhAGGAQEAIfkEBQAA4AAsAQABAA4ADgAACJkAwQksYAQGMA4GlGAQyBABgQ0XQEjo0uKKEoYLBjBxoeBAgwEGPEgiAc5BDCMIGDIUEuTLgAYhIqhUeQWLhAYMHMxkWCQJCwcHAOwUGEJDCQBIh4JTYEPDoicplIpBhARTHBxKRZ0RoSIYpB87UxwZxgOcqEZtdtkRMGBItl99+DCkUSXaoDRNzCzpJWOmmBJjzFg4QWMEw4AAIfkEBQAA4AAsAQABAA4ADgAACJkAwQmc0AABhAEDICwQyHCCAwYhIAiQsmFDBYZIAAQ44GBCgAgUwhgQAO6Bl2cAGDIkIIGDgiiVjqhUOWLIhjJypsxkSEFLljdrEuwUuOALoA5OCAwFFyHIClJwSi3d8EkEIy7FlupxIwFEpkiBdg7Z0UMpIUW5atwyAuGBCUc7XjBcUa2KoUN0cJwQxGamEBqIxtzY4cETw4AAOw==) no-repeat center !important;;
     background-size: 100% 100%;
     width: 70px;
     height: 70px;

@@ -7329,7 +7329,10 @@ div.x86_bmc_detail div article.page-container div.page-panel {
 .layui-table-init .loading-mj {
     width: 70px;
     height: 70px;
+    /*
     background: url(../../../start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
+    */
+    background: url(data:image/gif;base64,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) no-repeat center !important;;
     background-size: 70px 70px;
     animation: sk-chase-dot 2.0s infinite ease-in-out both;
     opacity: 0.65;
@@ -7338,7 +7341,10 @@ div.x86_bmc_detail div article.page-container div.page-panel {
 .layui-layer.layui-layer-loading .layui-layer-content.layui-layer-loadingmj {
     width: 70px;
     height: 70px;
+    /*
     background: url(../../../start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
+    */
+    background: url(data:image/gif;base64,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) no-repeat center !important;;
     background-size: 70px 70px;
     animation: sk-chase-dot 2.0s infinite ease-in-out both;
     opacity: 0.65;

@@ -122,6 +122,14 @@
             <input type="hidden" id='input-restype-options' name="options" required lay-verify="required"
                    placeholder="请输入配置信息" class="layui-input">
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">标签:</label>
+            <div class="layui-input-block input-with-prefix">
+                <div id="restype-tags" style="line-height: 40px"></div>
+            </div>
+            <input type="hidden" id="selectResTypeTagIds">
+        </div>
+
         <button id="btn-restype-submit" class="hide" lay-submit lay-filter="res-type-submit">提交</button>
     </form>
     <form class="layui-form form-edit layui-form-pane" onsubmit="return false;">

@@ -81,14 +81,14 @@
                             </div>
                         </form>
                         <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create">
-                            <i class="layui-icon">&#xe624;</i>新增
+                           新增
                         </button>
                         <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_download" >
-                            <i class="layui-icon">&#xe601;</i>下载
+                            下载
                         </button>
                         <button class="layui-btn layui-btn-sm layui-btn-normal active"
                                 id="recoveryverify-export-excel">
-                            <i class="layui-icon">&#xe60a;</i>导出到Excel
+                            导出到Excel
                         </button>
                     </div>
                     <table id="recoveryverify-table" class="layui-table" lay-filter="recoveryverify-table"></table>

@@ -284,6 +284,7 @@
                         if(res && res.data){
                             let d = res.data;
                             localStorage.setItem("mj-user-info",JSON.stringify(d))
+                            localStorage.setItem("userId",d.userId)
                             if(d.user){
                                 localStorage.setItem("lgn", d.user.username);
                                 session.putUser(d.user.username);

@@ -177,7 +177,8 @@ custom-class="config-dialog"
 .el-loading-spinner {
     width: 70px;
     height: 70px;
-    background: url(../../../start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;
+    /*background: url(../../../start/layui/css/modules/layer/default/loading-mj.png) no-repeat center;*/
+    background: url(data:image/gif;base64,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) no-repeat center !important;;
     background-size: 70px 70px;
     animation: sk-chase-dot 2.0s infinite ease-in-out both;
     opacity: 0.65;

@@ -89,7 +89,7 @@
         </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <div style='text-align: left;background-color: white' v-if="showPage">
+    <div class="cm-table-page" style='display: flex; justify-content: end;' v-if="showPage">
         <el-pagination
                 :current-page="currentPage"
                 :layout="layout"

@@ -51,7 +51,7 @@
         </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <div style='text-align: left;background-color: white' v-if="showPage">
+    <div class="cm-table-page" style='display: flex; justify-content: end;' v-if="showPage">
         <el-pagination
                 @size-change="handleSizeChange"
                 @prev-click="prePage"