diff --git a/src/views/privateOrder/ecosphere/components/componentLeft.vue b/src/views/privateOrder/ecosphere/components/componentLeft.vue index 516cff4..67b3022 100644 --- a/src/views/privateOrder/ecosphere/components/componentLeft.vue +++ b/src/views/privateOrder/ecosphere/components/componentLeft.vue @@ -1504,9 +1504,9 @@ export default { width: 100%; height: 100%; .module-container { - width: 1603px; + width: 100%; height: 100%; - margin: 130px 0 0 50px; + margin: 204px 0 0 50px; display: flex; flex-wrap: wrap; // justify-content: space-between; @@ -1680,13 +1680,14 @@ export default { width: 50%; height: 50%; .three-inventory { + padding: 80px 0; width: 100%; - height: 382px; - margin-top: 30px; + height: calc(100% - 76px); + // margin-top: 30px; display: flex; justify-content: space-around; .three-inventory-item { - width: 200px; + width: 30%; margin: 0 10px; display: flex; flex-direction: column; @@ -1769,7 +1770,8 @@ export default { padding-top: 20px; .firewall-container { - margin-top: 20px; + height: calc(100% - 76px); + // margin-top: 20px; // 顶部卡片区域 .firewall-stats { @@ -1906,7 +1908,7 @@ export default { flex-wrap: wrap; justify-content: space-between; width: 100%; - height: 100%; + height: calc(100% - 72px); padding: 10px; .zoology-icon { @@ -1916,7 +1918,7 @@ export default { flex-direction: column; align-items: center; margin-bottom: 10px; - padding: 35px; + padding: 5px; .icon-bk { width: 100%; height: 100%; @@ -2118,7 +2120,7 @@ export default { text-align: center !important; } .section-object { - height: 364px; + height: calc(100% - 72px); width: 100%; display: flex; // flex-direction: column; diff --git a/src/views/privateOrder/ecosphere/components/componentRight.vue b/src/views/privateOrder/ecosphere/components/componentRight.vue index d88fd44..c1fc689 100644 --- a/src/views/privateOrder/ecosphere/components/componentRight.vue +++ b/src/views/privateOrder/ecosphere/components/componentRight.vue @@ -46,24 +46,26 @@
举报事件年度分类统计 -
-
-
-
-
- {{ getItemPercent(item) }}% +
+
+
+
+
+
+ {{ getItemPercent(item) }}% +
+
{{ item.name }}
-
{{ item.name }}
@@ -662,6 +664,7 @@ export default { labelLine: { show: false, length: 30, + fontSize: 14, }, label: { show: false, @@ -700,6 +703,7 @@ export default { labelLine: { show: true, length: 30, + fontWeight: "bold", }, label: { show: true, @@ -750,8 +754,7 @@ export default { height: 60, x: -5, y: -5, - image: require("@/assets/sentimeent/警告.png") - + image: require("@/assets/sentimeent/警告.png"), }, }, { @@ -762,15 +765,13 @@ export default { height: 100, x: -25, y: -25, - image: require("@/assets/sentimeent/椭圆.png") + image: require("@/assets/sentimeent/椭圆.png"), }, - } + }, ], }; - optionSecond.graphic = [ - warningIcon, - ]; + optionSecond.graphic = [warningIcon]; myChart.setOption(optionSecond, true); echartsJump(myChart, optionSecond); @@ -1138,20 +1139,20 @@ export default { width: 100%; height: 100%; .module-container { - width: 1540px; + width: 100%; height: 100%; // float: right; - margin: 130px 50px 0 0; + margin: 204px 50px 0 0; display: flex; flex-wrap: wrap; // justify-content: space-between; // align-content: space-between; .section { - width:50%; - height:50%; + width: 50%; + height: 50%; .clean-action-table { - margin-top: 20px; - height: 400px; + height: calc(100% - 76px); + width: 100%; .table-header { display: flex; @@ -1256,7 +1257,7 @@ export default { .processflow { // padding-top: 20px; position: relative; - height: 100%; + height: calc(100% - 76px); background: url("~@/assets/sentimeent/举报流程环形图.png") no-repeat center, url("~@/assets/sentimeent/举报流程(环形中间).png") no-repeat center; @@ -1377,15 +1378,7 @@ export default { } } } - #pie { - position: relative; - top: 0px; - left: 5px; - width: 100%; - height: 70%; - // margin-top: 30px; - // background: url("~@/assets/ecosphere/bg-饼图.png") no-repeat; - } + .qlzfsjtj { margin-left: 54px; .qlzf-head { @@ -1630,9 +1623,8 @@ export default { .charts-container { display: flex; flex-direction: column; - height: 400px; - margin-top: 10px; - + height: calc(100% - 76px); + width: 100%; .chart-box { flex: 1; width: 100%; @@ -1660,45 +1652,58 @@ export default { transform: translateX(0px); } } -.labels { - position: relative; - display: flex; - justify-content: space-between; - // margin-top: 80px; - padding: 0 20px; - - .label-item { +.pie-container { + width: 100%; + height: calc(100% - 76px); + #pie { + position: relative; + top: 0px; + left: 5px; + width: 100%; + height: 70%; + // margin-top: 30px; + // background: url("~@/assets/ecosphere/bg-饼图.png") no-repeat; + } + .labels { position: relative; - width: 170px; - height: 65px; - // border: 1px dashed; display: flex; - justify-content: center; - align-items: center; + justify-content: space-between; + // margin-top: 80px; + padding: 0 20px; - .label-content { + .label-item { + position: relative; + width: 170px; + height: 65px; + // border: 1px dashed; display: flex; - flex-direction: column; - align-items: center; justify-content: center; + align-items: center; - .percent { - font-size: 28px; - font-weight: bold; - font-family: Arial; - line-height: 1.2; - margin-top: -10px; - } + .label-content { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; - .name { - font-family: AlibabaPuHuiTiR; - font-size: 20px; - color: #b4f9ff; - line-height: 22px; - text-align: justifyLeft; - font-style: normal; - text-transform: none; - margin-top: 5px; + .percent { + font-size: 28px; + font-weight: bold; + font-family: Arial; + line-height: 1.2; + margin-top: -10px; + } + + .name { + font-family: AlibabaPuHuiTiR; + font-size: 20px; + color: #b4f9ff; + line-height: 22px; + text-align: justifyLeft; + font-style: normal; + text-transform: none; + margin-top: 5px; + } } } } diff --git a/src/views/privateOrder/ecosphere/index.vue b/src/views/privateOrder/ecosphere/index.vue index 56ab227..c1ff272 100644 --- a/src/views/privateOrder/ecosphere/index.vue +++ b/src/views/privateOrder/ecosphere/index.vue @@ -4,69 +4,69 @@
--> -
+
-
+
-
+
diff --git a/src/views/privateOrder/positiveEnergy/index.vue b/src/views/privateOrder/positiveEnergy/index.vue index ef6bf62..636d4e5 100644 --- a/src/views/privateOrder/positiveEnergy/index.vue +++ b/src/views/privateOrder/positiveEnergy/index.vue @@ -23,23 +23,23 @@