diff --git a/src/views/screen/wsScreen/components/left/EquipItem.vue b/src/views/screen/wsScreen/components/left/EquipItem.vue index 11dc5fa8..d6d3b698 100644 --- a/src/views/screen/wsScreen/components/left/EquipItem.vue +++ b/src/views/screen/wsScreen/components/left/EquipItem.vue @@ -2,13 +2,13 @@
{{ title }}
-
+
-
装备数 (台)
+
装备数 (台)
{{ query.num || 0 }}
-
装备价值 (亿元)
+
装备价值 (亿元)
{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}
@@ -82,7 +82,7 @@ export default { { name: '装备年限', type: 'pie', - radius: '39%', + radius: '55%', avoidLabelOverlap: false, label: { show: true, @@ -91,8 +91,8 @@ export default { }, labelLine: { show: true, - length: 8, // 第一段线 - length2: 5, // 第二段线 + length: 5, // 第一段线 + length2: 3, // 第二段线 }, data: this.pieData, @@ -126,10 +126,15 @@ export default { -webkit-text-fill-color: transparent; } .content { - display: flex; + /* display: flex; */ + .left-wrap { + display: flex; + justify-content: space-between; + } .left-item { - margin-top: 16px; - height: 90px; + width: 48%; + margin-top: 6px; + height: 65px; text-align: center; background-image: url('../../img/equip-item.png'); background-size: 100% 100%; @@ -137,26 +142,26 @@ export default { .left-tip { padding-top: 6px; padding-bottom: 15px; - font-size: 11px; + font-size: 10px; font-weight: 600; - width: 50px; + /* width: 50px; */ } } .right-tip { - margin-left: 10px; - margin-top: 16px; + /* margin-left: 10px; */ + margin-top: 6px; padding: 4px 0; font-size: 11px; font-weight: 600; - width: 100px; + width: 100%; text-align: center; background-image: url('../../img/equip-title.png'); background-size: 100% 100%; } .pie-chart { - width: 120px; - height: 120px; + width: 140px; + height:100px; } } diff --git a/src/views/screen/wsScreen/components/left/EquipStatus.vue b/src/views/screen/wsScreen/components/left/EquipStatus.vue index 857295ca..65e572b2 100644 --- a/src/views/screen/wsScreen/components/left/EquipStatus.vue +++ b/src/views/screen/wsScreen/components/left/EquipStatus.vue @@ -50,9 +50,9 @@ export default { const option = { grid: { - left: '22%', - right: '10%', - top: '20%', + left: '16%', + right: '6%', + top: '16%', bottom: '15%', }, xAxis: { @@ -141,7 +141,7 @@ export default { diff --git a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue index 3c4e50be..d892e2fc 100644 --- a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue +++ b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue @@ -85,10 +85,10 @@ table { th, td { - padding: 10px; + padding: 9px 3px; text-align: center; white-space: nowrap; - border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 + /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */ } th { diff --git a/src/views/screen/wsScreen/components/left/index.vue b/src/views/screen/wsScreen/components/left/index.vue index b3c983b3..8cec0121 100644 --- a/src/views/screen/wsScreen/components/left/index.vue +++ b/src/views/screen/wsScreen/components/left/index.vue @@ -1,6 +1,5 @@