diff --git a/src/main/resources/database.db b/src/main/resources/database.db index 95dd959..ebc1300 100644 Binary files a/src/main/resources/database.db and b/src/main/resources/database.db differ diff --git a/src/main/resources/webpage/admin/v1/include.html b/src/main/resources/webpage/admin/v1/include.html index dcb6354..c0fdfc8 100644 --- a/src/main/resources/webpage/admin/v1/include.html +++ b/src/main/resources/webpage/admin/v1/include.html @@ -55,7 +55,7 @@
请求配置 + class="fas fa-fw fa-envelope-open-text"> 鉴权配置
diff --git a/src/main/resources/webpage/admin/v1/manage/plan/editCommon.html b/src/main/resources/webpage/admin/v1/manage/plan/editCommon.html index f18d9ce..1bd2349 100644 --- a/src/main/resources/webpage/admin/v1/manage/plan/editCommon.html +++ b/src/main/resources/webpage/admin/v1/manage/plan/editCommon.html @@ -13,6 +13,7 @@
+
- - - - +
@@ -105,28 +103,44 @@ cssPath: '/admin/v1/static/css/cron.css' }); - // 绑定 radio 切换更新类型选择 - layui.form.on('radio(planTypeRadio)', function (obj) { - const planType = obj.value; - const planId = document.querySelector('[name="planId"]').value; - let url = '/admin/v1/manage/plan/edit'; - if (planType == 'SINGLE_INDEX') { - url += 'SingleIndex'; + // 渲染更新类型选择 + var demo2 = xmSelect.render({ + el: '#demo2', + filterable: true, + height: '500px', + radio: true, + layVerify: 'required', + initValue: [document.querySelector('[name="initPlanType"]').value], + data: [ + {name: '辅助数据类', children: [ + {name: '益盟单指标', value: 'SINGLE_INDEX', page:'editSingleIndex'}, + {name: '益盟多指标', value: 'MULTI_INDEX', page: 'editMultiIndex'}, + {name: '益盟个股策略', value: 'STOCK_STRATEGY', page: 'editStockStrategy'}, + ]}, + {name: '股票池类', children: [ + {name: 'Tushare 股票池', value: 4, disabled: true}, + {name: '益盟策略选股', value: 'STOCK_PICKING', disabled: true}, + {name: '同花顺条件选股', value: 6, disabled: true}, + ]}, + ], + on: function (data) { + // 更新类型变化时切换页面 + console.log(data); + const selected = data.arr[0]; + const planId = document.querySelector('[name="planId"]').value; + let url = '/admin/v1/manage/plan/'; + if (selected.page) { + url += selected.page; + } + else { + Dog.error({msg: '未知的计划任务类型'}); + return; + } + if (planId) { + url += '?planId=' + planId; + } + location.href = url; } - else if (planType == 'MULTI_INDEX') { - url += 'MultiIndex'; - } - else if (planType == 'STOCK_STRATEGY') { - url += 'StockStrategy' - } - else { - Dog.error({msg: '未知的计划任务类型'}); - return; - } - if (planId) { - url += '?planId=' + planId; - } - location.href = url; }); }); @@ -185,12 +199,15 @@ success: function (r) { Dog.success({ onClose: function () { + // 非单页调试, 作为计划任务列表界面的 iframe, + // 则刷新列表并关闭弹窗 if (window != top) { top.Dog.reloadTable('plans'); if (top.editLayer) { top.layui.layer.close(top.editLayer); } } + // 单页调试, 直接重载页面 else { location.reload() } diff --git a/src/main/resources/webpage/admin/v1/manage/plan/editSingleIndex.html b/src/main/resources/webpage/admin/v1/manage/plan/editSingleIndex.html index 2d2aa3e..43b5f12 100644 --- a/src/main/resources/webpage/admin/v1/manage/plan/editSingleIndex.html +++ b/src/main/resources/webpage/admin/v1/manage/plan/editSingleIndex.html @@ -10,7 +10,7 @@
-
diff --git a/src/main/resources/webpage/admin/v1/manage/requestInfo/include.html b/src/main/resources/webpage/admin/v1/manage/requestInfo/include.html index 112cba1..508419f 100644 --- a/src/main/resources/webpage/admin/v1/manage/requestInfo/include.html +++ b/src/main/resources/webpage/admin/v1/manage/requestInfo/include.html @@ -132,7 +132,7 @@ if (done && typeof done === 'function') done(r); if (r && r.ok) { window.editLayer = Helper.openR({ - title: `${r.data.id ? '编辑' : '新增'}请求信息`, + title: `${r.data.id ? '编辑' : '新增'}鉴权配置`, btn: ['随机设备信息', '随机 Chrome 版本', r.data.id ? '编辑' : '新增'], btn1: () => refreshDeviceInfo() && !1, btn2: () => refreshChromeVersion() && !1, diff --git a/src/main/resources/webpage/admin/v1/manage/requestInfo/index.html b/src/main/resources/webpage/admin/v1/manage/requestInfo/index.html index 33d585d..e1a0a7e 100644 --- a/src/main/resources/webpage/admin/v1/manage/requestInfo/index.html +++ b/src/main/resources/webpage/admin/v1/manage/requestInfo/index.html @@ -1,6 +1,6 @@ - +