From 962085eaf7d25f3f626b40a501c7d540dee20c59 Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Wed, 4 Jan 2023 22:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F=E6=AF=94?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bigscreen1/css/style.css | 49 ++++++++++++++++++++-------------------- bigscreen1/index.html | 17 +++++++------- bigscreen1/js/js.js | 29 ++++-------------------- 3 files changed, 37 insertions(+), 58 deletions(-) diff --git a/bigscreen1/css/style.css b/bigscreen1/css/style.css index b0dc5f0..7a0d40a 100644 --- a/bigscreen1/css/style.css +++ b/bigscreen1/css/style.css @@ -279,7 +279,7 @@ i { .nav2>li { float: left; border-left: 1px solid rgba(7, 118, 181, .2); - height: 240px; + /*height: 180px;*/ padding: 0 10px 10px 10px; } @@ -296,8 +296,7 @@ i { } .ftechart { - height: 200px; - ; + height: 140px; } @@ -350,12 +349,12 @@ i { } .mapnav div span { - font-size: 30px; + font-size: 20px; opacity: .6 } .mapnav div p { - font-size: 60px; + font-size: 40px; letter-spacing: 6px; font-weight: bold; padding-top: 30px; @@ -483,7 +482,7 @@ i { .tagcloud { width: 100%; - height: 90% !important; + height: 100% !important; overflow: hidden; position: relative; @@ -509,8 +508,8 @@ i { } .b02 { - width: 80px; - height: 80px; + width: 60px; + height: 60px; } .b03 { @@ -662,7 +661,7 @@ i { } .nenghaozonglan { - margin-top: 20px; + margin-top: 15px; margin-left: 0px; } @@ -679,7 +678,7 @@ i { } .nenghaozonglan p { - font-size: 30px; + font-size: 25px; font-weight: bold; padding-top: 10px; color: #cc192e; @@ -688,20 +687,20 @@ i { .hangjingzonglan { - padding-top: 20px; - padding-left: 20px; - height: 200px; + padding-top: 10px; + padding-left: 10px; + height: 150px; float: left; width: 50%; } .hangjingzonglan li { font-size: 16px; - line-height: 230%; + line-height: 150%; } .hangjingzonglantagcloud { - height: 220px; + height: 150px; float: left; width: 50% } @@ -709,7 +708,7 @@ i { .jindu li { width: 50%; float: left; - height: 170px; + height: 150px; } .jindu div { @@ -723,19 +722,19 @@ i { } .marquee { - height: 200px; + height: 120px; overflow: hidden; - margin-left: 50px; + margin-left: 10px; } .pth{ - margin-top: 10px; - margin-bottom: 10px; - margin-left: 50px; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 10px; } .marquee li p { - line-height: 300%; + line-height: 160%; font-size: 20px; - line-height: 20px; + line-height: 15px; height: 35px; margin: 5px; } @@ -764,12 +763,12 @@ i { .marquee li p span:nth-child(3), .pth span:nth-child(3) { - width: 10% + width: 20% } .marquee li p span:nth-child(4), .pth span:nth-child(4) { - width: 40% + width: 30% } .pth span { diff --git a/bigscreen1/index.html b/bigscreen1/index.html index 5f6470b..ee86bed 100644 --- a/bigscreen1/index.html +++ b/bigscreen1/index.html @@ -23,7 +23,7 @@
  • 厕所总览
    -
    +
    厕所总数量
    560
    @@ -42,7 +42,7 @@
    • -
    +
    • @@ -55,7 +55,7 @@
    • -
      +
      • @@ -72,7 +72,7 @@
      • 能耗总览
        -
        +
        今日能耗
          @@ -102,15 +102,15 @@
      -
      +
      • 坑位状态
        -
        +
      • 驿站流量
        -

        序号 驿站名称 厕所数量 当前流量

        +

        序号 驿站名称 厕所数量当前流量

        • @@ -146,9 +146,10 @@
        • +
      • 环境总览
        -
        +
        diff --git a/bigscreen1/js/js.js b/bigscreen1/js/js.js index bd34788..58f1b8f 100644 --- a/bigscreen1/js/js.js +++ b/bigscreen1/js/js.js @@ -50,7 +50,7 @@ function echarts_1() { }, color: ['#20b9cf', '#2089cf', '#205bcf'], legend: { //图例组件，颜色和名字 - x: '70%', + x: '60%', y: 'center', orient: 'vertical', itemGap: 12, //图例每项之间的间隔 @@ -66,12 +66,12 @@ function echarts_1() { } }, series: [{ - name: '行业占比', + name: '各占比例', type: 'pie', clockwise: false, //饼图的扇区是否是顺时针排布 minAngle: 20, //最小的扇区角度（0 ~ 360） - center: ['35%', '50%'], //饼图的中心（圆心）坐标 - radius: [40, 100], //饼图的半径 + center: ['30%', '50%'], //饼图的中心（圆心）坐标 + radius: [30, 70], //饼图的半径 // avoidLabelOverlap: true, ////是否启用防止标签重叠 itemStyle: { //图形样式 normal: { @@ -96,27 +96,6 @@ function echarts_1() { } }, data: data - }, { - name: '', - type: 'pie', - clockwise: false, - silent: true, - minAngle: 20, //最小的扇区角度（0 ~ 360） - center: ['35%', '50%'], //饼图的中心（圆心）坐标 - radius: [0, 100], //饼图的半径 - itemStyle: { //图形样式 - normal: { - borderColor: '#1e2539', - borderWidth: 1.5, - opacity: 0.5, - } - }, - label: { //标签的位置 - normal: { - show: false, - } - }, - data: data }] };