diff --git a/src/views/projectAdmin/zjsj/carbon/leftBottom.vue b/src/views/projectAdmin/zjsj/carbon/leftBottom.vue index aa53aff2..37dd635f 100644 --- a/src/views/projectAdmin/zjsj/carbon/leftBottom.vue +++ b/src/views/projectAdmin/zjsj/carbon/leftBottom.vue @@ -136,7 +136,7 @@ export default { x: "10%",//x 偏移量 y: "5%", // y 偏移量 width: "85%", // 宽度 - height: "70%"// 高度 + height: "60%"// 高度 }, xAxis: { type: "category", @@ -208,7 +208,8 @@ export default { .contentBox { width: 100%; height: 100%; - margin-top: 5%; + box-sizing: border-box; + padding-top:5% ; .titleTxt { font-size: 18px; @@ -217,7 +218,8 @@ export default { margin-left: 5px; } .myChart { - margin-top: 5%; + box-sizing: border-box; + padding-top: 5%; width: 100%; height: 90%; } diff --git a/src/views/projectAdmin/zjsj/cim/rightBottom.vue b/src/views/projectAdmin/zjsj/cim/rightBottom.vue index 4a48ecd8..f5462035 100644 --- a/src/views/projectAdmin/zjsj/cim/rightBottom.vue +++ b/src/views/projectAdmin/zjsj/cim/rightBottom.vue @@ -23,7 +23,7 @@ export default { { roseType: 'area', radius: ['58%', '52%'], - color: ['#0B1B35', '#4A8C9C'], + color: ['#182337', '#4A8C9C'], data: [30, 40, 30, 40] }, { diff --git a/src/views/projectAdmin/zjsj/cim/rightTop.vue b/src/views/projectAdmin/zjsj/cim/rightTop.vue index 9ff8e77f..aa6cdb15 100644 --- a/src/views/projectAdmin/zjsj/cim/rightTop.vue +++ b/src/views/projectAdmin/zjsj/cim/rightTop.vue @@ -22,7 +22,7 @@ export default { { roseType: 'area', radius: ['58%', '52%'], - color: ['#0B1B35', '#4A8C9C'], + color: ['#182337', '#4A8C9C'], data: [30, 40, 30, 40] }, { diff --git a/src/views/projectAdmin/zjsj/components/Card.vue b/src/views/projectAdmin/zjsj/components/Card.vue index f69efe8f..fbd682ee 100644 --- a/src/views/projectAdmin/zjsj/components/Card.vue +++ b/src/views/projectAdmin/zjsj/components/Card.vue @@ -32,7 +32,7 @@ export default { background-size: 100% 100%; } .content { - height: calc(100% - 34px); + height: calc(100% - 42px); } } diff --git a/src/views/projectAdmin/zjsj/govComp/Col2.vue b/src/views/projectAdmin/zjsj/govComp/Col2.vue index 1b80949d..63e890a0 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col2.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col2.vue @@ -114,8 +114,9 @@ export default {