monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 58ab176727fa77d19ce7c2a046faee1e8102a009 2 parents 3d40155b dcca383c

Merge branch 'master-mj-joke' into 'master-mj' 

fix:工作日志查看在暗黑模式下柱状图页面提示语为黑色，导致有些字体看不见

fix:工作日志查看在暗黑模式下柱状图页面提示语为黑色，导致有些字体看不见

See merge request !1177
Inline Side-by-side
Showing 2 changed files with 12 additions and 16 deletions
... ... @@ -7,11 +7,13 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
exports('backupDingjia', function () {
var sessions = layui.sessions;
var accessToken = localStorage.getItem("accessToken");
//加载业务
loadConditionSelect();
reloadAllChange();
//加载表格数据
renderBackupDingjiaListTable();
//发送状态
// 下拉框改变搜索
form.on('select(slt-dingjia-biz)', reloadAllChange);
form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable);
// 加载查询条件下拉框
function loadConditionSelect() {
... ... @@ -117,12 +119,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
}
})
}
// 图表，表格重新加载
function reloadAllChange() {
renderBackupDingjiaListTable();
loadConditionSelect();
}
});
});
\ No newline at end of file
... ...
... ... @@ -598,7 +598,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
show: true,
position: 'top',
textStyle: {
color: '#555'
color: '#a3a3a4'
},
formatter: function (data) {
return reportedList[data.dataIndex] + '/' + data.value
... ... @@ -699,7 +699,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
data: xData,
gridIndex: 0,
axisLabel: {
color: '#333',
color: '#a3a3a4',
show: true,
interval: 0,
rotate: 25
... ... @@ -809,7 +809,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
show: true,
position: 'top',
textStyle: {
color: '#555'
color: '#a3a3a4'
},
},
itemStyle: {
... ... @@ -839,7 +839,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
type: 'category',
data: xData,
axisLabel: {
color: '#333',
color: '#a3a3a4',
show: true,
interval: 0,
rotate: 19,
... ... @@ -861,7 +861,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
type: 'value',
gridIndex: 0,
axisLabel: {
color: '#333'
color: '#a3a3a4'
},
splitLine: {
lineStyle: {
... ... @@ -1007,7 +1007,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
val: {
fontSize: 32,
fontWeight: 'bold',
color: '#333333',
color: '#a3a3a4',
}
}
}
... ... @@ -1048,12 +1048,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
name: {
fontSize: 14,
padding: [0, 10, 0, 4],
color: '#666666'
color: '#a3a3a4'
},
value: {
fontSize: 18,
fontWeight: 'bold',
color: '#333333'
color: '#a3a3a4'
}
}
}
... ...