+
@@ -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 @@
-
装备数 (台)
+ 装备数 (台)
{{ query.num || 0 }}
-
装备价值 (亿元)
+ 装备价值 (亿元)
{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}
-
-
+
@@ -168,27 +155,6 @@ export default {
this.list3[2] = item.ten
}
})
- // this.state1.num = data.line.num || 0
- // this.state1.price = data.line.price || 0
- // this.state2.num = data.cable.num || 0
- // this.state2.price = data.cable.price || 0
- // this.state3.num = data.substation.num || 0
- // this.state3.price = data.substation.price || 0
- // this.list1[0] = data.line.five
- // this.list1[1] = data.line.fiveOrTen
- // this.list1[2] = data.line.ten
- // this.list2[0] = data.cable.five
- // this.list2[1] = data.cable.fiveOrTen
- // this.list2[2] = data.cable.ten
- // this.list3[0] = data.substation.five
- // this.list3[1] = data.substation.fiveOrTen
- // this.list3[2] = data.substation.ten
- // console.log('🚀 ~ getEquipList ~ this.list1:', this.list1)
- // console.log('🚀 ~ getEquipList ~ this.list2:', this.list2)
- // console.log('🚀 ~ getEquipList ~ this.list3:', this.list3)
- // console.log('🚀 ~ getEquipList ~ this.state1:', this.state1)
- // console.log('🚀 ~ getEquipList ~ this.state2:', this.state2)
- // console.log('🚀 ~ getEquipList ~ this.state3:', this.state3)
} catch (error) {
console.log('🚀 ~ getEquipList ~ error:', error)
}
@@ -220,7 +186,7 @@ export default {
@@ -34,44 +33,32 @@
-
-
-
-
-
-
+
+
-
-
-
- 单位装备配置
- 更多 >
-
-
-
-
-
- 备注说明:
-
-
- 施工装备配置率=∑ⁿ¹专用装备实际配置率+∑ⁿ¹新型装备实际配置率
- 装备实际配置率=实际装配配置数量÷基本配置标准数量×装备赋值×配置折算率
- 专用装备满分80分,创新装备满分20分,满分100分
-
-
-
-
- 装备状态
- 更多 >
-
-
-
-
-
- 备注说明:再用装备包含于共享装备。
-
+
+
+
+ 单位装备配置
+ 更多 >
+
+
+
+
+
+
+
+ 装备状态
+ 更多 >
+
+
+
+
+
+ 备注说明:再用装备包含于共享装备。
+