diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html index 18a86edb8..b3a0eb07f 100644 --- a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -72,6 +72,7 @@ var removeFlag = [[${@permission.hasPermi('bps:expsubspushresp:remove')}]]; var companyDatas = [[${@dict.getType('express_company')}]]; var statsDatas = [[${@dict.getType('express_stats')}]]; + var monitorStats=[[${@dict.getType('express_monitor_stats')}]]; var prefix = ctx + "bps/expsubspushresp"; $(function() { @@ -90,19 +91,19 @@ title: 'SID', visible: false }, - /*{ + { field: 'status', - title: '监控状态' + title: '监控状态', + formatter: function(value, row, index) { + return $.table.selectDictLabel(monitorStats, value); + } }, { field: 'billStatus', - title: '状态' + title: '状态', + visible: false }, - { - field: 'message', - title: '监控状态消息' - }, - { + /*{ field: 'autoCheck', title: '快递公司编码是否出错' }, @@ -159,7 +160,12 @@ formatter:function (value,row,index){ return value.replace(/(\r\n)|(\n)/g,'
'); } - },/* + }, + /* + { + field: 'message', + title: '监控状态消息' + }, { field: 'destResultMessage', title: '目的国快递消息' diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 0c7535d6b..cdc620e0a 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -71,8 +71,8 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 + login-username: admin + login-password: bps2019 filter: stat: enabled: true diff --git a/ruoyi-admin/src/main/resources/static/bps.png b/ruoyi-admin/src/main/resources/static/bps.png new file mode 100644 index 000000000..71c4a6854 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/bps.png differ diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index c328254af..edc7839d3 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -302,7 +302,7 @@ diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index d69f81a66..3e14ce14f 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -26,7 +26,8 @@ diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 38981a9e2..fbd68f398 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -65,7 +65,7 @@ diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 51da49571..ef324c721 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -16,7 +16,7 @@

BPS后台管理系统

- 当前版本:若依 v[[${version}]] + 版本:若依 v[[${version}]]

diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index 0566e9ac4..51d7a5928 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -23,10 +23,10 @@