diff --git a/src/views/screen/cityScreen/components/countryMap/index.vue b/src/views/screen/cityScreen/components/countryMap/index.vue index 49aa9c37..b4f787f0 100644 --- a/src/views/screen/cityScreen/components/countryMap/index.vue +++ b/src/views/screen/cityScreen/components/countryMap/index.vue @@ -363,11 +363,13 @@ export default { background-size: 110px 32px; } .mapBox { - margin-top: -70px; + margin-top: -90px; width: 100%; height: 97%; display: flex; position: relative; + // 放大1.2倍 + transform: scale(1.3); #mapEcharts { width: 100%; height: 100%; @@ -471,7 +473,7 @@ export default { .out-city-equip { position: absolute; top: 366px; - right: 95px; + right: 55px; width: 40px; height: 52px; color: #fff; diff --git a/src/views/screen/cityScreen/components/engineerUsing/index.vue b/src/views/screen/cityScreen/components/engineerUsing/index.vue index a52d21e6..85e3e78a 100644 --- a/src/views/screen/cityScreen/components/engineerUsing/index.vue +++ b/src/views/screen/cityScreen/components/engineerUsing/index.vue @@ -188,7 +188,7 @@ export default { line-height: 38px; } .select-view { - width: 15%; + width: 20%; height: 36px; position: absolute; top: 50%; @@ -196,7 +196,7 @@ export default { right: 0; } .select-box { - width: 70%; /*设置宽度确保内容 和 下拉icon的距离*/ + width: 80%; /*设置宽度确保内容 和 下拉icon的距离*/ height: 75%; background: #113f67; color: #ccc; diff --git a/src/views/screen/cityScreen/components/equQuantity/index.vue b/src/views/screen/cityScreen/components/equQuantity/index.vue index 14a9ee4d..1798c876 100644 --- a/src/views/screen/cityScreen/components/equQuantity/index.vue +++ b/src/views/screen/cityScreen/components/equQuantity/index.vue @@ -433,7 +433,7 @@ export default { .item-title { width: 100%; // height: 30%; - padding: 6px 0 6px 10px; + padding: 2px 0 2px 10px; background-image: url('../../../../../assets/cityScreen/equiQuantityTitle.png'); background-size: 100% 100%; font-size: 14px; diff --git a/src/views/screen/cityScreen/components/equUse/index.vue b/src/views/screen/cityScreen/components/equUse/index.vue index 8d53c10e..bd5f229e 100644 --- a/src/views/screen/cityScreen/components/equUse/index.vue +++ b/src/views/screen/cityScreen/components/equUse/index.vue @@ -57,6 +57,7 @@ export default { width: 100%; height: 100%; display: flex; + align-items: center; flex-direction: column; background: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(26, 92, 215, 0.3)); } @@ -80,7 +81,7 @@ export default { left: 18%; } .content-view { - width: 100%; + width: 50%; height: 85%; position: relative; background: url('../../../../../assets/cityScreen/usingBg.png') no-repeat center center; diff --git a/src/views/screen/cityScreen/components/maintenance/index.vue b/src/views/screen/cityScreen/components/maintenance/index.vue index 7e895161..a8481055 100644 --- a/src/views/screen/cityScreen/components/maintenance/index.vue +++ b/src/views/screen/cityScreen/components/maintenance/index.vue @@ -10,17 +10,17 @@
-
序号
-
工序
+
序号
+
工序
设备
维保情况
-
+
{{ index + 1 }}
-
+
{{ item.procedureName }}
@@ -141,7 +141,7 @@ export default { .tableHeader { width: 100%; - height: 12%; + height: 20%; background-color: #082d6e; opacity: 0.8; display: flex; @@ -154,10 +154,10 @@ export default { } .tableTr { width: 100%; - height: 16%; + height: 32%; // background-image: url("../../../../../assets/cityScreen/tableTr2.png"); // background-size: 100% 100%; - border-bottom: 1px dashed #eee; + /* border-bottom: 1px dashed #eee; */ display: flex; cursor: pointer; } diff --git a/src/views/screen/cityScreen/components/retire/index.vue b/src/views/screen/cityScreen/components/retire/index.vue index c7961bcf..3d4e698d 100644 --- a/src/views/screen/cityScreen/components/retire/index.vue +++ b/src/views/screen/cityScreen/components/retire/index.vue @@ -10,23 +10,23 @@
-
序号
+
序号
工序
-
设备
-
预警情况
+
设备
+
预警情况
-
+
{{ index + 1 }}
{{ item.procedureName }}
-
+
{{ item.deviceName }}
-
+
{{ item.situation }}
@@ -139,7 +139,7 @@ export default { .tableHeader { width: 100%; - height: 12%; + height: 20%; background-color: #082d6e; opacity: 0.8; display: flex; @@ -155,11 +155,11 @@ export default { } .tableTr { width: 100%; - height: 16%; + height: 31%; // background-image: url("../../../../../assets/cityScreen/tableTr2.png"); // background-size: 100% 100%; // margin-bottom: 2px; - border-bottom: 1px dashed #eee; + /* border-bottom: 1px dashed #eee; */ display: flex; cursor: pointer; } diff --git a/src/views/screen/cityScreen/index.vue b/src/views/screen/cityScreen/index.vue index 172b981e..96c172fa 100644 --- a/src/views/screen/cityScreen/index.vue +++ b/src/views/screen/cityScreen/index.vue @@ -7,12 +7,16 @@
- - + +
+
+
- - + +
+
+
@@ -23,10 +27,12 @@
- - +
+ +
+
@@ -90,46 +96,50 @@ export default { .left_view { display: grid; - gap: 6px; + gap: 10px; grid-template-rows: repeat(16, 1fr); } .right_view { display: grid; - gap: 6px; + gap: 10px; grid-template-rows: repeat(16, 1fr); } .left_1 { - grid-row: 1 / 4; + grid-row: 1 / 2; grid-column: 1 / 2; } .left_2 { - grid-row: 4 / 10; + grid-row: 2 / 6; + grid-column: 1 / 2; +} +.left_5 { + grid-row: 6 / 10; grid-column: 1 / 2; - display: flex; - gap: 6px; - // background-color: skyblue; } .left_3 { - grid-row: 10 / 17; + grid-row: 10 / 13; + grid-column: 1 / 2; +} +.left_6 { + grid-row: 13 / 17; grid-column: 1 / 2; - display: flex; - gap: 6px; - // background-color: pink; } .right_1 { - grid-row: 1 / 4; + grid-row: 1 / 2; } .right_2 { - grid-row: 4 / 10; + grid-row: 2 / 7; display: flex; - gap: 6px; } .right_3 { - grid-row: 10 / 17; + grid-row: 7 / 12; + display: flex; +} +.right_4 { + grid-row: 12 / 17; display: flex; - gap: 6px; }