diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue index 72d5767..b1e1610 100644 --- a/src/components/common/Home.vue +++ b/src/components/common/Home.vue @@ -52,6 +52,7 @@ export default { width: 100%; height: 40px; font-size: 12px; + line-height: 40px; .logo { display: none; } @@ -99,6 +100,13 @@ export default { top: 41px; //首页 .stritleEchartsPage { + height: 100%; + .exportDialog { + .el-dialog { + margin-top: 140px !important; + width: 80%; + } + } .el-card .el-card__body { padding: 8px; height: calc(100% - 16px); @@ -113,13 +121,14 @@ export default { p { padding: 1.5%; margin: 1.5%; + zoom: 0.8; span { font-size: 12px !important; } } } .chartClass { - zoom: 0.5; + height: calc(100% - 16px); } .dateBox { top: 8px; @@ -146,6 +155,28 @@ export default { } } } + .picSetBox { + .swiperBox { + .title { + height: 20px; + line-height: 20px; + .el-breadcrumb { + height: 20px; + line-height: 20px; + font-size: 12px; + } + } + .thumb-example { + height: calc(100% - 8px); + .picTop { + height: 70%; + } + .picBottom { + height: 30%; + } + } + } + } .picSetBox { .parameterArea { width: 180px; @@ -171,12 +202,14 @@ export default { } .infoDialog { .el-dialog { + width: 80% !important; + margin-top: 120px !important; } } .setTimeDialog { .el-dialog { width: 80% !important; - margin-top: 15vh !important; + margin-top: 120px !important; } } } @@ -207,7 +240,7 @@ export default { .bigpic { position: relative; img { - height: auto; + height: 200px; } .caption { position: absolute; @@ -241,7 +274,7 @@ export default { height: auto; .el-dialog { width: 100% !important; - margin-top: 120px !important; + margin-top: 140px !important; } } } diff --git a/src/views/stritl/chartFiles/pie.vue b/src/views/stritl/chartFiles/pie.vue index d83d069..fa47831 100644 --- a/src/views/stritl/chartFiles/pie.vue +++ b/src/views/stritl/chartFiles/pie.vue @@ -1,87 +1,87 @@ \ No newline at end of file + diff --git a/src/views/stritl/index.vue b/src/views/stritl/index.vue index a1fdfdc..7dd7254 100644 --- a/src/views/stritl/index.vue +++ b/src/views/stritl/index.vue @@ -251,12 +251,14 @@ export default { top: 20, bottom: 20, }, + series: [ { type: "pie", + // minAngle: 15, //最小角度 + startAngle: 150, //起始角度 radius: ["40%", "70%"], avoidLabelOverlap: false, - itemStyle: { borderRadius: 10, borderColor: "#fff", @@ -264,14 +266,14 @@ export default { }, label: { show: true, - fontSize: 16, - fontWeight: "bold", + fontSize: 12, + fontWeight: "normal", formatter: "{b}\n{d}%", }, emphasis: { label: { show: true, - fontSize: 26, + fontSize: 12, fontWeight: "bold", formatter: "{b}\n{d}%", }, @@ -313,7 +315,7 @@ export default { top: "10%", left: "10%", right: "10%", - bottom: "10%", + bottom: "13%", }, xAxis: { type: "category", @@ -413,15 +415,15 @@ export default { }, label: { show: true, - fontSize: 16, - fontWeight: "bold", + fontSize: 14, + fontWeight: "normal", formatter: "{b}\n{d}%", }, emphasis: { label: { show: true, - fontSize: 26, - fontWeight: "bold", + fontSize: 14, + fontWeight: "normal", formatter: "{b}\n{d}%", }, },