Your Name 2 年之前
父節點
當前提交
7a5c622312

二進制
db/db.mv.db 查看文件


+ 15
- 1
resources/static/css/common.css 查看文件

65
 .chart-card,
65
 .chart-card,
66
 .chart-card::before,
66
 .chart-card::before,
67
 .chart-card::after {
67
 .chart-card::after {
68
+  overflow: hidden;
68
   box-sizing: border-box;
69
   box-sizing: border-box;
69
 }
70
 }
70
 .chart-card.panel .panel-heading {
71
 .chart-card.panel .panel-heading {
72
+  box-sizing: border-box;
73
+  padding: 1em;
74
+}
75
+.chart-card.panel .panel-heading img {
76
+  width: 28px;
77
+  height: 28px;
78
+  vertical-align: middle;
79
+  display: inline-block;
80
+  margin-right: 0.5em;
81
+}
82
+.chart-card.panel .panel-heading span {
71
   font-size: 22px;
83
   font-size: 22px;
72
   font-weight: 500;
84
   font-weight: 500;
73
   color: transparent;
85
   color: transparent;
74
   background-clip: text;
86
   background-clip: text;
75
-  background-image: linear-gradient(180deg, #6F39B9 0%, #1EAED1 100%);
87
+  background-image: linear-gradient(0deg, #6F39B9 0%, #1EAED1 100%);
88
+  vertical-align: middle;
76
 }
89
 }
77
 .chart-card.panel .panel-body {
90
 .chart-card.panel .panel-body {
91
+  padding: 0;
78
   background: #071C51;
92
   background: #071C51;
79
 }
93
 }
80
 @keyframes chart-card-rotate {
94
 @keyframes chart-card-rotate {

二進制
resources/static/images/statistic/人员统计.png 查看文件


二進制
resources/static/images/statistic/任务统计.png 查看文件


二進制
resources/static/images/statistic/军供保障能力.png 查看文件


二進制
resources/static/images/statistic/社会保障机构分类统计.png 查看文件


二進制
resources/static/images/statistic/设备分类统计.png 查看文件


+ 14
- 2
resources/static/js/chart/chart.js 查看文件

38
       },
38
       },
39
       type: 'value'
39
       type: 'value'
40
     },
40
     },
41
+    grid: {
42
+      top: 20,
43
+      left: 50,
44
+      right: 20,
45
+      bottom: 50,
46
+    },
41
     series: [
47
     series: [
42
       {
48
       {
43
         data: seriesData,
49
         data: seriesData,
299
       {
305
       {
300
         type: 'pie',
306
         type: 'pie',
301
         top: '10%',
307
         top: '10%',
302
-        radius: ['50%', '60%'],
308
+        radius: ['60%', '70%'],
303
         label: {
309
         label: {
304
           show: false,
310
           show: false,
305
           position: 'center',
311
           position: 'center',
306
           lineHeight: 28,
312
           lineHeight: 28,
313
+          borderRadius: [100, 100, 100, 100],
314
+          borderColor: '#FD8F00',
315
+          borderWidth: 2,
316
+          padding: 16,
317
+          width: 100,
318
+          height: 100,
307
           formatter: [
319
           formatter: [
308
             '{s1|{d}%}',
320
             '{s1|{d}%}',
309
             '{s2|{b}}',
321
             '{s2|{b}}',
334
           show: false
346
           show: false
335
         },
347
         },
336
         data: data,
348
         data: data,
337
-      }
349
+      },
338
     ]
350
     ]
339
   };
351
   };
340
 }
352
 }

+ 20
- 5
resources/static/less/chart-card.less 查看文件

16
 	padding: 1rem;
16
 	padding: 1rem;
17
 
17
 
18
   &, &::before, &::after {
18
   &, &::before, &::after {
19
+    overflow: hidden;
19
     box-sizing: border-box;
20
     box-sizing: border-box;
20
   }
21
   }
21
 
22
 
22
   &.panel {
23
   &.panel {
23
     .panel-heading {
24
     .panel-heading {
24
-      font-size: 22px;
25
-      font-weight: 500;
26
-      color: transparent;
27
-      background-clip: text;
28
-      background-image: linear-gradient(180deg, #6F39B9 0%, #1EAED1 100%);
25
+      box-sizing: border-box;
26
+      padding: 1em 1em 0 1em;
27
+
28
+      img {
29
+        width: 28px;
30
+        height: 28px;
31
+        vertical-align: middle;
32
+        display: inline-block;
33
+        margin-right: .5em;
34
+      }
35
+      span {
36
+        font-size: 22px;
37
+        font-weight: 500;
38
+        color: transparent;
39
+        background-clip: text;
40
+        background-image: linear-gradient(0deg, #6F39B9 0%, #1EAED1 100%);
41
+        vertical-align: middle;
42
+      }
29
     }
43
     }
30
 
44
 
31
     .panel-body {
45
     .panel-body {
46
+      padding: 0;
32
       background: @chart-card-bg;
47
       background: @chart-card-bg;
33
     }
48
     }
34
   }
49
   }

+ 30
- 15
resources/templates/main.html 查看文件

39
 	</div>
39
 	</div>
40
 
40
 
41
 	<div class="panelGroup" style="padding-bottom:0;">
41
 	<div class="panelGroup" style="padding-bottom:0;">
42
-		<div class="panel panel-row-2">
43
-			<div class="panel-heading">任务统计</div>
44
-			<div class="panel-body chart-card">
42
+		<div class="panel panel-row-2 chart-card">
43
+			<div class="panel-heading">
44
+				<img th:src="@{/images/statistic/任务统计.png}" />
45
+				<span>任务统计</span>
46
+			</div>
47
+			<div class="panel-body">
45
 				<div class="selectGroup">
48
 				<div class="selectGroup">
46
 					<label>选择年份</label>
49
 					<label>选择年份</label>
47
 					<select class="" id="selYear" onchange="taskTimeReport()">
50
 					<select class="" id="selYear" onchange="taskTimeReport()">
48
 			        </select>
51
 			        </select>
49
 				</div>
52
 				</div>
50
-				<div class="text-center" style="height:240px;overflow: hidden;">
51
-					<div class="text-center" style="height:300px;margin-top: -30px;" id="taskChart"></div>
53
+				<div class="text-center">
54
+					<div class="text-center" style="height:300px;" id="taskChart"></div>
52
 				</div>
55
 				</div>
53
 			</div>
56
 			</div>
54
 		</div>
57
 		</div>
55
 		<div class="panel-row-2" style="width: 50%;">
58
 		<div class="panel-row-2" style="width: 50%;">
56
-			<div class="panel panel-row-2">
57
-				<div class="panel-heading">设备分类统计</div>
58
-				<div class="panel-body chart-card">
59
+			<div class="panel panel-row-2 chart-card">
60
+				<div class="panel-heading">
61
+					<img th:src="@{/images/statistic/设备分类统计.png}" />
62
+					<span>设备分类统计</span>
63
+				</div>
64
+				<div class="panel-body">
59
 					<div class="text-center" style="height:260px;" id="devChart"></div>
65
 					<div class="text-center" style="height:260px;" id="devChart"></div>
60
 				</div>
66
 				</div>
61
 			</div>
67
 			</div>
62
-			<div class="panel panel-row-2">
63
-				<div class="panel-heading">军供保障能力</div>
64
-				<div class="panel-body chart-card" style="overflow-y: auto;">
68
+			<div class="panel panel-row-2 chart-card">
69
+				<div class="panel-heading">
70
+					<img th:src="@{/images/statistic/军供保障能力.png}" />
71
+					<span>军供保障能力</span>
72
+				</div>
73
+				<div class="panel-body" style="overflow-y: auto;">
65
 					<div class="info-text">
74
 					<div class="info-text">
66
 						
75
 						
67
 					</div>
76
 					</div>
78
 		</div>
87
 		</div>
79
 	</div>
88
 	</div>
80
 	<div class="panelGroup">
89
 	<div class="panelGroup">
81
-		<div class="panel panel-row-2">
82
-			<div class="panel-heading">社会保障机构分类统计</div>
83
-			<div class="panel-body chart-card">
90
+		<div class="panel panel-row-2 chart-card">
91
+			<div class="panel-heading">
92
+				<img th:src="@{/images/statistic/社会保障机构分类统计.png}" />
93
+				<span>社会保障机构分类统计</span>
94
+			</div>
95
+			<div class="panel-body">
84
 				<div class="text-center" id="guaChart" style="height:320px;margin-top: -40px;"></div>
96
 				<div class="text-center" id="guaChart" style="height:320px;margin-top: -40px;"></div>
85
 			</div>
97
 			</div>
86
 		</div>
98
 		</div>
87
 		<div class="panel panel-row-2 chart-card">
99
 		<div class="panel panel-row-2 chart-card">
88
-			<div class="panel-heading">人员统计</div>
100
+			<div class="panel-heading">
101
+				<img th:src="@{/images/statistic/人员统计.png}" />
102
+				<span>人员统计</span>
103
+			</div>
89
 			<div class="panel-body">
104
 			<div class="panel-body">
90
 				<div class="col-sm-6 text-center" id="eduChart" style="height:300px;margin-top: -15px;">
105
 				<div class="col-sm-6 text-center" id="eduChart" style="height:300px;margin-top: -15px;">
91
 				</div>
106
 				</div>