diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js b/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js index aa39826..91f947e 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js @@ -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); diff --git a/hg-monitor-web-zj/src/main/resources/static/src/views/ajConfig/index.html b/hg-monitor-web-base/src/main/resources/static/src/views/ajConfig/index.html index 83fdbfe..83fdbfe 100644 --- a/hg-monitor-web-zj/src/main/resources/static/src/views/ajConfig/index.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/ajConfig/index.html diff --git a/hg-monitor-web-zj/src/main/resources/static/src/views/ajConfig/view.html b/hg-monitor-web-base/src/main/resources/static/src/views/ajConfig/view.html index 7df0b62..7df0b62 100644 --- a/hg-monitor-web-zj/src/main/resources/static/src/views/ajConfig/view.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/ajConfig/view.html diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/index.html index fdb64ca..fdb64ca 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/index.html +++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/index.html diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/index.js index 2f143c7..2f143c7 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/index.js +++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/index.js diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/view/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/view/index.html index 18cbe75..18cbe75 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/view/index.html +++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/view/index.html diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/view/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/view/index.js index dd56e41..dd56e41 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/ajConfig/view/index.js +++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/ajConfig/view/index.js diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/router/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/router/index.js index 9e11570..2d0e454 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/router/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/router/index.js @@ -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