Browse Source

图表样式调整

duxh 2 years ago
parent
commit
bcbe3d8b15
8 changed files with 90 additions and 73 deletions
  1. 26 9
      css/main.css
  2. 28 28
      data/data35.json
  3. 11 11
      data/data37.json
  4. 2 2
      data/data38.json
  5. 6 6
      data/data39.json
  6. 2 2
      data/data41.json
  7. 3 3
      data/data42.json
  8. 12 12
      data/data43.json

+ 26 - 9
css/main.css

@@ -44,11 +44,12 @@ p {
 	position: relative;
 	z-index: 9999;
 }
-.page_btn_fixed{
+
+.page_btn_fixed {
 	position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
 	z-index: 9999;
 	width: 80%;
 	margin: 0 auto;
@@ -81,12 +82,20 @@ p {
 		width: 100% !important
 	}
 
+	.table.table33_1 {
+		width: 80% !important
+	}
+
+	.table.table34_1 {
+		width: 90% !important
+	}
+
 	.table.table38_1 {
 		width: 50% !important
 	}
 
 	.table.table38_2 {
-		width: 60% !important
+		width: 70% !important
 	}
 
 	.table.table39_1 {
@@ -100,6 +109,12 @@ p {
 	.table.table42_1 {
 		width: 70% !important
 	}
+
+	.table.table43_1 th {
+		/* font-size: 0.925rem !important; */
+		padding: 0.8rem 0rem !important;
+
+	}
 }
 
 @media screen and (min-width:768px) and (max-width:959px) {
@@ -237,14 +252,15 @@ p {
 	border: 0.0625rem solid #444444;
 	font-weight: normal;
 	box-sizing: border-box;
-	padding: 0.8rem 0.5rem;
+	/* padding: 0.8rem 0.5rem; */
 	line-height: 1.875rem;
 	word-wrap: break-word;
-	word-break: keep-all;
+	/* word-break: keep-all; */
 }
 
 .table th {
-	font-size: 1.25rem;
+	font-size: 1.125rem;
+	padding: 0.8rem 0.5rem;
 }
 
 .table td {
@@ -256,7 +272,7 @@ p {
 	/* background-color: transparent; */
 	border-bottom: 0.0625rem solid #444444;
 	border-top: 0.0625rem solid #444444;
-	padding: 0.5625rem;
+	/* padding: 0.5625rem; */
 	box-sizing: border-box;
 }
 
@@ -335,6 +351,7 @@ p {
 	text-align: center;
 	border-left: 0;
 	border-right: 0;
+	word-break: keep-all;
 }
 
 /*-----------主体内容 end-----------*/

+ 28 - 28
data/data35.json

@@ -171,19 +171,19 @@
 						"|",
 						"运力"
 					],
-					"管线<br/>(千米)",
-					"年输送能力<br/>(万吨)",
-					"油库容积<br/>(万立方米)",
-					"自有船舶<br/>(艘)",
-					"自有运力<br/>(万吨)"
+					"管线<br/>(千米)",
+					"年输送能力<br/>(万吨)",
+					"油库<br/>容积<br/>(万立<br/>方米)",
+					"自有<br/>船舶(艘)",
+					"自有<br/>运力<br/>(万吨)"
 				],
 				"style": [
-					"width:20%",
-					"width:16%",
+					"width:26%",
+					"width:14%",
 					"width:16%",
 					"width:16%",
-					"width:16%",
-					"width:16%"
+					"width:14%",
+					"width:14%"
 				],
 				"slash": {
 					"leftText": "bottom:0.7rem;left:1rem",
@@ -238,8 +238,8 @@
 						"业务"
 					],
 					"航油业务",
-					"加油车<br/>产销量<br/>(台)",
-					"油化品<br/>运输量<br/>(万吨)"
+					"加油车<br/>产销量<br/>(台)",
+					"油化品<br/>运输量<br/>(万吨)"
 				],
 				"colSpan": [
 					1,
@@ -266,9 +266,9 @@
 			},
 			{
 				"th": [
-					"水运量<br/>(万吨)",
-					"管输量<br/>(万吨)",
-					"仓储量<br/>(万吨)"
+					"水运量<br/>(万吨)",
+					"管输量<br/>(万吨)",
+					"仓储量<br/>(万吨)"
 				],
 				"style": [
 					"width:16%",
@@ -323,10 +323,10 @@
 						"|",
 						"数量"
 					],
-					"2022年数额",
-					"2021年数额",
-					"2022年增加额",
-					"2022年增长率"
+					"2022年<br/>数额",
+					"2021年<br/>数额",
+					"2022年<br/>增加额",
+					"2022年<br/>增长率"
 				],
 				"style": [
 					"width:20%",
@@ -421,8 +421,8 @@
 				],
 				"style": [
 					"width:10%",
-					"width:36%",
-					"width:36%",
+					"width:30%",
+					"width:42%",
 					"width:10%"
 				]
 			}
@@ -461,18 +461,18 @@
 				],
 				"style": [
 					"width:10%",
-					"width:12%",
-					"width:12%",
-					"width:12%",
-					"width:12%",
-					"width:12%",
-					"width:12%",
+					"width:10%",
+					"width:10%",
+					"width:10%",
+					"width:18%",
+					"width:10%",
+					"width:14%",
 					"width:10%"
 				]
 			},
 			{
 				"td": [
-					"硕士及以上",
+					"硕士<br />及以上",
 					"86",
 					"6.57%",
 					"35岁及以下",
@@ -512,7 +512,7 @@
 			},
 			{
 				"td": [
-					"中专以下",
+					"中专<br />以下",
 					"471",
 					"35.98%",
 					"51至54岁",

+ 11 - 11
data/data37.json

@@ -141,10 +141,10 @@
 					1
 				],
 				"style": [
-					"width:16%",
-					"width:28%",
-					"width:28%",
-					"width:28%"
+					"width:20%",
+					"width:24%",
+					"width:24%",
+					"width:32%"
 				]
 			}
 		],
@@ -172,13 +172,13 @@
 					1
 				],
 				"style": [
-					"width:16%",
-					"width:14%",
-					"width:14%",
-					"width:14%",
-					"width:14%",
-					"width:14%",
-					"width:14%"
+					"width:20%",
+					"width:12%",
+					"width:12%",
+					"width:12%",
+					"width:12%",
+					"width:20%",
+					"width:12%"
 				]
 			},
 			{

+ 2 - 2
data/data38.json

@@ -171,9 +171,9 @@
 					"员工数量"
 				],
 				"style": [
-					"width:36%",
+					"width:40%",
 					"width:32%",
-					"width:32%"
+					"width:28%"
 				]
 			}
 		],

+ 6 - 6
data/data39.json

@@ -162,18 +162,18 @@
 						"全日制学历"
 					],
 					"大学本科<br/>及以下",
-					"硕士研究生",
+					"硕士<br/>研究生",
 					"初级职称",
 					"中级职称",
 					"高级职称"
 				],
 				"style": [
 					"width:30%",
-					"width:14%",
-					"width:14%",
-					"width:14%",
-					"width:14%",
-					"width:14%"
+					"width:18%",
+					"width:16%",
+					"width:12%",
+					"width:12%",
+					"width:12%"
 				]
 			}
 		],

+ 2 - 2
data/data41.json

@@ -133,8 +133,8 @@
 				"数值"
 			],
 			"style": [
-				"width:50%",
-				"width:50%"
+				"width:60%",
+				"width:40%"
 			]
 		}],
 		"tableBody": [{

+ 3 - 3
data/data42.json

@@ -195,10 +195,10 @@
 					"员工占比"
 				],
 				"style": [
-					"width:30%",
+					"width:34%",
 					"width:26%",
-					"width:22%",
-					"width:22%"
+					"width:20%",
+					"width:20%"
 				]
 			}
 		],

+ 12 - 12
data/data43.json

@@ -86,23 +86,23 @@
 		"tableHead": [
 			{
 				"th": [
-					"管理服务资产",
-					"所在城市",
-					"投运时间",
-					"业务范围",
-					"建筑面积<br/>(平方米)",
-					"可出租面积<br/>(平方米)",
-					"已出租面积<br/>(平方米)",
+					"管理<br/>服务<br/>资产",
+					"所在<br/>城市",
+					"投运<br/>时间",
+					"业务<br/>范围",
+					"建筑<br/>面积<br/>(平方米)",
+					"可出租<br/>面积<br/>(平方米)",
+					"已出租<br/>面积<br/>(平方米)",
 					"出租率"
 				],
 				"style": [
 					"width:14%",
+					"width:8%",
 					"width:12%",
-					"width:13%",
-					"width:15%",
-					"width:12%",
-					"width:12%",
-					"width:12%",
+					"width:14%",
+					"width:14%",
+					"width:14%",
+					"width:14%",
 					"width:10%"
 				]
 			}