Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

失去焦点后保存提示操作失败，接口返回的是code，将resp_code改成code



See merge request !850

@@ -379,6 +379,30 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
                                     '  </span>' +
                                     '  </span>' +
                                     '</div>'
                                     '</div>'
                             }
                             }
+                            //lsq 增加菜单类型列 2022-08-11
+                            , {field: 'type', title: '菜单类型', align: 'center', sort: true,
+                                templet: function (d){
+                                // 1：监控菜单，2：巡检菜单，3：个人工作台，4：系统菜单，5：跳转菜单，6：报表菜单,7：CMDB菜单
+                                    switch (d.type) {
+                                        case 1:
+                                            return '<span class="layui-badge layui-bg-orange">监控菜单</span>';
+                                        case 2:
+                                            return '<span class="layui-badge layui-bg-green">巡检菜单</span>';
+                                        case 3:
+                                            return '<span class="layui-badge layui-bg-cyan">个人工作台</span>';
+                                        case 4:
+                                            return '<span class="layui-badge layui-bg-blue">系统菜单</span>';
+                                        case 5:
+                                            return '<span class="layui-badge layui-bg-black">跳转菜单</span>';
+                                        case 6:
+                                            return '<span class="layui-badge layui-bg-gray">报表菜单</span>';
+                                        case 7:
+                                            return '<span class="layui-badge layui-bg-red">CMDB菜单</span>';
+                                        default:
+                                            return '';
+                                    }
+                                }
+                            }
                             , {field: 'path', title: '路径', align: 'center', sort: true}
                             , {field: 'path', title: '路径', align: 'center', sort: true}
                             , {
                             , {
                                 field: 'hidden',
                                 field: 'hidden',
@@ -428,7 +452,8 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
                             data: JSON.stringify(menu),
                             data: JSON.stringify(menu),
                             contentType: "application/json;charset=utf-8",
                             contentType: "application/json;charset=utf-8",
                             success: function (res) {
                             success: function (res) {
-                                if (res.resp_code == 0) {
+                                //lsq 失去焦点后保存提示操作失败，接口返回的是code，将resp_code改成code 2022-08-11
+                                if (res.code == 0) {
                                     layer.msg('操作成功', {icon: 1, time: 2000});
                                     layer.msg('操作成功', {icon: 1, time: 2000});
                                 } else {
                                 } else {
                                     layer.msg('操作失败', {icon: 2, time: 2000});
                                     layer.msg('操作失败', {icon: 2, time: 2000});