Authored by 王涛

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

…eb into master-500-dev
... ... @@ -52,7 +52,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
layer.open({
id:'favorites_name_input',
content:'<div class="layui-col-md10" style="position: relative;top: 24px;left: 24px;">' +
'<input name="favoritesName" placeholder="收藏夹名称" class="layui-input" /></div>',
'<input name="favoritesName" placeholder="收藏夹名称" maxlength="50" class="layui-input" /></div>',
btn: ['确定','取消'],
title:'新建收藏夹',
type:'1',
... ... @@ -214,7 +214,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
text = $('#name_'+id).val();
}
var parentId = $(this).data("pid");
var input = '<input type="text" id="name_'+id+'" class="layui-input favorites-title-input" value="'+text+'">' +
var input = '<input type="text" id="name_'+id+'" class="layui-input favorites-title-input" maxlength="50" value="'+text+'">' +
'<i class="layui-icon layui-icon-ok sumite-favorite-title" title="确认" style="right: 25px"></i>' +
'<i class="layui-icon layui-icon-close sumite-favorite-title" title="取消" style="right: 5px"></i>'; //编辑收藏夹时增加取消按钮 joke add 20200515
$("#title_"+id).html(input);
... ...
... ... @@ -169,17 +169,7 @@ const routes = [{
path: '/alarmsubscribe/excludeKpi',
name: 'alarmSubscribeExcludeKpi',
component: () => myImport('views/alarmsubscribe/index')
},
{
path: '/vue3/ajConfig',
name: 'ajConfig',
component: () => myImport('views/ajConfig/index')
},
{
path: '/ajConfig/view',
name: 'ajConfigView',
component: () => myImport('views/ajConfig/view/index')
},
}
];
// hash模式: createWebHashHistory
... ...