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', @@ -7,11 +7,13 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
7 exports('backupDingjia', function () { 7 exports('backupDingjia', function () {
8 var sessions = layui.sessions; 8 var sessions = layui.sessions;
9 var accessToken = localStorage.getItem("accessToken"); 9 var accessToken = localStorage.getItem("accessToken");
  10 + //加载业务
10 loadConditionSelect(); 11 loadConditionSelect();
11 - reloadAllChange(); 12 + //加载表格数据
  13 + renderBackupDingjiaListTable();
12 //发送状态 14 //发送状态
13 // 下拉框改变搜索 15 // 下拉框改变搜索
14 - form.on('select(slt-dingjia-biz)', reloadAllChange); 16 + form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable);
15 17
16 // 加载查询条件下拉框 18 // 加载查询条件下拉框
17 function loadConditionSelect() { 19 function loadConditionSelect() {
@@ -117,12 +119,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', @@ -117,12 +119,6 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
117 } 119 }
118 }) 120 })
119 } 121 }
120 -  
121 - // 图表，表格重新加载  
122 - function reloadAllChange() {  
123 - renderBackupDingjiaListTable();  
124 - loadConditionSelect();  
125 - }  
126 }); 122 });
127 123
128 }); 124 });
@@ -598,7 +598,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -598,7 +598,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
598 show: true, 598 show: true,
599 position: 'top', 599 position: 'top',
600 textStyle: { 600 textStyle: {
601 - color: '#555' 601 + color: '#a3a3a4'
602 }, 602 },
603 formatter: function (data) { 603 formatter: function (data) {
604 return reportedList[data.dataIndex] + '/' + data.value 604 return reportedList[data.dataIndex] + '/' + data.value
@@ -699,7 +699,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -699,7 +699,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
699 data: xData, 699 data: xData,
700 gridIndex: 0, 700 gridIndex: 0,
701 axisLabel: { 701 axisLabel: {
702 - color: '#333', 702 + color: '#a3a3a4',
703 show: true, 703 show: true,
704 interval: 0, 704 interval: 0,
705 rotate: 25 705 rotate: 25
@@ -809,7 +809,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -809,7 +809,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
809 show: true, 809 show: true,
810 position: 'top', 810 position: 'top',
811 textStyle: { 811 textStyle: {
812 - color: '#555' 812 + color: '#a3a3a4'
813 }, 813 },
814 }, 814 },
815 itemStyle: { 815 itemStyle: {
@@ -839,7 +839,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -839,7 +839,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
839 type: 'category', 839 type: 'category',
840 data: xData, 840 data: xData,
841 axisLabel: { 841 axisLabel: {
842 - color: '#333', 842 + color: '#a3a3a4',
843 show: true, 843 show: true,
844 interval: 0, 844 interval: 0,
845 rotate: 19, 845 rotate: 19,
@@ -861,7 +861,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -861,7 +861,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
861 type: 'value', 861 type: 'value',
862 gridIndex: 0, 862 gridIndex: 0,
863 axisLabel: { 863 axisLabel: {
864 - color: '#333' 864 + color: '#a3a3a4'
865 }, 865 },
866 splitLine: { 866 splitLine: {
867 lineStyle: { 867 lineStyle: {
@@ -1007,7 +1007,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -1007,7 +1007,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
1007 val: { 1007 val: {
1008 fontSize: 32, 1008 fontSize: 32,
1009 fontWeight: 'bold', 1009 fontWeight: 'bold',
1010 - color: '#333333', 1010 + color: '#a3a3a4',
1011 } 1011 }
1012 } 1012 }
1013 } 1013 }
@@ -1048,12 +1048,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -1048,12 +1048,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
1048 name: { 1048 name: {
1049 fontSize: 14, 1049 fontSize: 14,
1050 padding: [0, 10, 0, 4], 1050 padding: [0, 10, 0, 4],
1051 - color: '#666666' 1051 + color: '#a3a3a4'
1052 }, 1052 },
1053 value: { 1053 value: {
1054 fontSize: 18, 1054 fontSize: 18,
1055 fontWeight: 'bold', 1055 fontWeight: 'bold',
1056 - color: '#333333' 1056 + color: '#a3a3a4'
1057 } 1057 }
1058 } 1058 }
1059 } 1059 }