样式修改

2 years ago · 00c0f06aed
parent c5c3127691
commit 00c0f06aed
17 changed files with 107 additions and 55 deletions
--- a/src/assets/font/Acumin-Pro-Condensed-Black-2.otf
+++ b/src/assets/font/Acumin-Pro-Condensed-Black-2.otf
--- a/src/assets/font/Acumin-Pro-Condensed-Regular-2.otf
+++ b/src/assets/font/Acumin-Pro-Condensed-Regular-2.otf
--- a/src/assets/font/font.css
+++ b/src/assets/font/font.css
@ -3,4 +3,18 @@
  src: url('./IMPACT.TTF');
  font-weight: normal;
  font-style: normal;
+}
+
+@font-face {
+  font-family: "Acumin-Pro-Condensed-Black-2";
+  src: url('./Acumin-Pro-Condensed-Black-2.otf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Acumin-Pro-Condensed-Regular-2";
+  src: url('./Acumin-Pro-Condensed-Regular-2.otf');
+  font-weight: normal;
+  font-style: normal;
 }
--- a/src/views/energySources/component/all.vue
+++ b/src/views/energySources/component/all.vue
@ -371,15 +371,15 @@ export default {
          }

          &>div:nth-child(3) {
-            height: 0.36rem;
-            line-height: 0.36rem;
+            height: 0.4rem;
+            line-height: 0.4rem;
            position: absolute;
            top: 0;
            left: 0;
            background: transparent;
            text-align: center;
            font-size: 0.26rem;
-            font-family: Acumin Variable Concept;
+            font-family: Acumin-Pro-Condensed-Black-2;
            font-weight: bold;
          }
        }
@ -388,7 +388,7 @@ export default {
      .card-unit {
        font-size: 0.16rem;
        margin-top: 0.06rem;
-        font-family: Acumin Variable Concept;
+        font-family: Acumin-Pro-Condensed-Black-2;
        font-weight: bold;
        color: rgba($color: #fff, $alpha: 0.6);
      }
--- a/src/views/energySources/component/dmodal.vue
+++ b/src/views/energySources/component/dmodal.vue
@ -163,6 +163,7 @@ export default {

 .equipmentLoadmodal /deep/ .el-table td span {
  font-size: 0.14rem !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .equipmentLoadmodal /deep/ .el-table::before {
--- a/src/views/energySources/component/dosage.vue
+++ b/src/views/energySources/component/dosage.vue
@ -291,6 +291,7 @@ export default {

 .dosage /deep/ .el-table td span {
  font-size: 0.14rem !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .dosage /deep/ .el-table::before {
@ -378,12 +379,11 @@ export default {

  .rank {
    display: inline-block;
-    width: 0.44rem;
-    height: 0.22rem;
+    width: 0.36rem;
+    height: 0.18rem;
    line-height: 0.21rem;
    text-align: center;
    font-size: 0.14rem;
-    font-family: Acumin Variable Concept;
    font-weight: normal;
    color: #FFFFFF;
    border-radius: 0.08rem;
--- a/src/views/energySources/component/emodal.vue
+++ b/src/views/energySources/component/emodal.vue
@ -153,6 +153,7 @@ export default {

 .equipmentLoadmodal /deep/ .el-table td span {
  font-size: 0.14rem !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .equipmentLoadmodal /deep/ .el-table::before {
--- a/src/views/energySources/component/equipmentAnalyze.vue
+++ b/src/views/energySources/component/equipmentAnalyze.vue
@ -120,6 +120,7 @@ export default {

 .equipmentAnalyze /deep/ .el-table td span {
  font-size: 0.14rem !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .equipmentAnalyze /deep/ .el-table::before {
--- a/src/views/energySources/component/equipmentLoad.vue
+++ b/src/views/energySources/component/equipmentLoad.vue
@ -97,11 +97,13 @@ export default {

 .equipmentLoad /deep/ .trOdd td {
  color: #fff;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .equipmentLoad /deep/ .trEven td {
  color: #fff;
  background: rgba($color: #0de5ff, $alpha: 0.1) !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }

 .equipmentLoad /deep/.colorFB5E2D td {
--- a/src/views/energySourcesProvince/component/electricity.vue
+++ b/src/views/energySourcesProvince/component/electricity.vue
@ -45,16 +45,23 @@ export default {
          arr.push({

            value: json[k],
-            label: {
-              offset: [12, 0]
-            }
+            label: {}

          })
        }
+        arr.forEach((e, i) => {
+          if (i == 0) {
+            e.label.offset = [12, 0]
+          } else if (i == arr.length - 1) {
+            e.label.offset = [-12, 0]
+          } else { 
+            e.label.offset = [0, 0]
+          }
+        })
        this.echartsInit(arr, yAxisData)
      })
    },
-    echartsInit(seriesData,yAxisData) {
+    echartsInit(seriesData, yAxisData) {
      const chartDom = document.getElementById('mainElectricity');
      const myChart = this.$echarts.init(chartDom);
      const option = {
@ -70,7 +77,7 @@ export default {
        // },

        grid: {
-          top: "10%",
+          top: "10",
          left: "0",
          right: "10",
          bottom: "0",
@ -166,7 +173,7 @@ export default {
              show: true,
              color: "#fff",
              backgroundColor: "rgba(26, 208, 163, 1)",
-              padding: [2, 4, 2, 4]
+              padding: [4, 4, 2, 4]
            },
            areaStyle: {
              color: {
--- a/src/views/energySourcesProvince/component/emissionAll.vue
+++ b/src/views/energySourcesProvince/component/emissionAll.vue
@ -7,7 +7,7 @@
      <div class="card-num-item" v-for="(item, index) in num" :key="index">
        <div :style="item === '.' ? 'background: transparent' : ''"></div>
        <div :style="item === '.' ? 'background: transparent' : ''"></div>
-        <div style="color: #00FFC6;">
+        <div style="color: #00FFC6;font-family: Acumin-Pro-Condensed-Black-2;">
          {{ item }}
        </div>
      </div>
@ -274,8 +274,8 @@ export default {
      }

      &>div:nth-child(3) {
-        height: 0.36rem;
-        line-height: 0.36rem;
+        height: 0.4rem;
+        line-height: 0.4rem;
        position: absolute;
        top: 0;
        left: 0;
@ -291,7 +291,7 @@ export default {
  .font1 {
    margin-top: 0.2rem;
    font-size: 0.16rem;
-    font-family: Microsoft YaHei;
+    font-family: Acumin-Pro-Condensed-Black-2;
    font-weight: 400;
    color: #FFFFFF;
    opacity: 0.8;
@ -299,7 +299,7 @@ export default {

  .font2 {
    font-size: 0.36rem;
-    font-family: Acumin Variable Concept;
+    font-family: Acumin-Pro-Condensed-Black-2;
    font-weight: bold;
    color: #FFFFFF;
    margin-top: 0.06rem;
@ -307,11 +307,11 @@ export default {
    span {
      line-height: 10px;
      font-size: 0.2rem;
-      font-family: Acumin Variable Concept;
+      font-family: Acumin-Pro-Condensed-Black-2;
      font-weight: bold;
      color: #FFFFFF;
      vertical-align: super;
-      margin-left: -0.06rem;
+      // margin-left: -0.02rem;
    }
  }

--- a/src/views/energySourcesProvince/component/intensity.vue
+++ b/src/views/energySourcesProvince/component/intensity.vue
@ -36,12 +36,19 @@ export default {
        let monthData = datas.map(r => r.currentMonth)
        monthData.sort()
        let xAxisData = monthData.map(r => this.$moment(r).format('M') + '月')
-        let seriesData = datas.map(r => r.intensity)
-        seriesData[0] = {
-          value: seriesData[0], label: {
-            offset: [12, 0]
+        let seriesData = datas.map((r, i) => {
+          let json = {
+            value: r.intensity, label: {}
          }
-        }
+          if (i == 0) {
+            json.label.offset = [12, 0]
+          } else if (i == datas.length - 1) {
+            json.label.offset = [-12, 0]
+          } else {
+            json.label.offset = [0, 0]
+          }
+          return json
+        })
        this.echartsInit(xAxisData, seriesData)
      })
    },
@ -157,7 +164,7 @@ export default {
              show: true,
              color: "#fff",
              backgroundColor: "#63A1FF",
-              padding: [2, 4, 2, 4]
+              padding: [4, 4, 2, 4]
            },
            areaStyle: {
              color: {
--- a/src/views/energySourcesProvince/component/maps.vue
+++ b/src/views/energySourcesProvince/component/maps.vue
@ -146,21 +146,21 @@ export default {

        &>span:nth-child(1) {
          font-size: 0.3rem;
-          font-family: Acumin Variable Concept;
+          font-family: Acumin-Pro-Condensed-Black-2;
          font-weight: bold;
          vertical-align: -webkit-baseline-middle;
        }

        &>span:nth-child(2) {
          font-size: 0.16rem;
-          font-family: Acumin Variable Concept;
+          font-family: Acumin-Pro-Condensed-Black-2;
          font-weight: bold;
          margin-left: 0.04rem;
        }

        &>span:nth-child(3) {
          font-size: 0.16rem;
-          font-family: Acumin Variable Concept;
+          font-family: Acumin-Pro-Condensed-Black-2;
          font-weight: bold;
          color: #149EEE;
          margin-left: 0.1rem;
@ -168,7 +168,7 @@ export default {

        &>span:nth-child(4) {
          font-size: 0.14rem;
-          font-family: Acumin Variable Concept;
+          font-family: Acumin-Pro-Condensed-Black-2;
          font-weight: bold;
          color: #149EEE;
          margin-left: 0.04rem;
--- a/src/views/energySourcesProvince/component/measure.vue
+++ b/src/views/energySourcesProvince/component/measure.vue
@ -214,7 +214,7 @@ export default {

    .font2 {
      font-size: 0.36rem;
-      font-family: Acumin Variable Concept;
+      font-family: Acumin-Pro-Condensed-Black-2;
      font-weight: bold;
      color: #FFFFFF;
      margin-top: 0.06rem;
@ -222,11 +222,11 @@ export default {
      span {
        line-height: 10px;
        font-size: 0.2rem;
-        font-family: Acumin Variable Concept;
+        font-family: Acumin-Pro-Condensed-Black-2;
        font-weight: bold;
        color: #FFFFFF;
        vertical-align: super;
-        margin-left: -0.06rem;
+        // margin-left: -0.06rem;
      }
    }
  }
@ -253,16 +253,17 @@ export default {
      &>div:nth-child(1) {
        font-size: 0.14rem;
        margin-bottom: 0.06rem;
+        font-family: Acumin-Pro-Condensed-Black-2;
      }

      &>div:nth-child(2) {
        font-size: 0.24rem;
        font-weight: bold;
+        font-family: Acumin-Pro-Condensed-Black-2;

        span {
-          vertical-align: super;
+          vertical-align: text-top;
          font-weight: bold;
-          margin-left: -0.04rem;
        }
      }
    }
--- a/src/views/energySourcesProvince/component/pathMap.vue
+++ b/src/views/energySourcesProvince/component/pathMap.vue
@ -192,14 +192,24 @@ export default {
              var lat = points[j].split(',')[1];
              path.push(new BMapGL.Point(lng, lat));
            }
-            var prism = new BMapGL.Prism(path, 5000, {
-              topFillColor: '#5679ea',
-              topFillOpacity: 0.5,
-              sideFillColor: '#5679ea',
+            var prism = new BMapGL.Prism(path, 2000, {
+
+              topFillColor: '#000',
+              topFillOpacity: 0.6,
+              sideFillColor: '#0e2566',
              sideFillOpacity: 0.9

            });
            this.baiduMap.addOverlay(prism);
+            // var prism1 = new BMapGL.Prism(path, 1000, {
+
+            //   topFillColor: '#000',
+            //   topFillOpacity: 0,
+            //   sideFillColor: '#fff',
+            //   sideFillOpacity: 0.9
+
+            // });
+            // this.baiduMap.addOverlay(prism1);
          }
        })

@ -229,13 +239,13 @@ export default {
          <div class="mapslabel-b">
            <div>
              <div>用电量</div>
-              <div class="mapslabel-b-font">${r.electricity}</div>
-              <span style="margin-top:0.08rem;display: inline-block;float: left;">kw·h</span>
+              <div class="mapslabel-b-font" style="color:#11F150;">${r.electricity}</div>
+              <span style="margin-top:0.06rem;display: inline-block;float: left;color:#11F150; font-family: Acumin-Pro-Condensed-Black-2;">kw·h</span>
            </div>
            <div>
              <div>碳排放量</div>
-              <div class="mapslabel-b-font">${r.carbon}</div>
-              <span style="margin-top:0.08rem;display: inline-block;float: left;">t</span>
+              <div class="mapslabel-b-font" style="color:#FBB02D;">${r.carbon}</div>
+              <span style="margin-top:0.06rem;display: inline-block;float: left;color:#FBB02D;font-family: Acumin-Pro-Condensed-Black-2;">t</span>
            </div>
          </div>
        </div>
@ -518,7 +528,7 @@ export default {
  line-height: 0.32rem;
  margin-bottom: 0.14rem;
  font-size: 0.18rem;
-  font-family: Microsoft YaHei;
+  font-family: Acumin-Pro-Condensed-Black-2;
  font-weight: bold;
  color: #FFFFFF;
  text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.41);
@ -546,7 +556,7 @@ export default {

 .mapslabel-b .mapslabel-b-font {
  font-size: 0.24rem;
-  font-family: Acumin Variable Concept;
+  font-family: Acumin-Pro-Condensed-Black-2;
  margin-top: 0.04rem;
  float: left;
 }
@ -701,7 +711,8 @@ export default {
    }
  }
 }
-.mapsbtn{
+
+.mapsbtn {
  position: absolute;
  top: 10px;
  right: 20px;
--- a/src/views/energySourcesProvince/component/statistics.vue
+++ b/src/views/energySourcesProvince/component/statistics.vue
@ -126,6 +126,7 @@ export default {

 .statistics /deep/ .el-table td span{
  font-size: 0.14rem !important;
+  font-family: Acumin-Pro-Condensed-Regular-2;
 }
 .statistics /deep/ .el-table::before {
  height: 0 !important;
@ -180,12 +181,11 @@ export default {

  .rank {
    display: inline-block;
-    width: 0.44rem;
-    height: 0.22rem;
+    width: 0.36rem;
+    height: 0.18rem;
    line-height: 0.21rem;
    text-align: center;
    font-size: 0.14rem;
-    font-family: Acumin Variable Concept;
    font-weight: normal;
    color: #FFFFFF;
    // padding: 0.04rem 0.06rem;
--- a/src/views/energySourcesProvince/component/tendency.vue
+++ b/src/views/energySourcesProvince/component/tendency.vue
@ -35,12 +35,19 @@ export default {
        let monthData = datas.map(r => r.currentMonth)
        monthData.sort()
        let xAxisData = monthData.map(r => this.$moment(r).format('M') + '月')
-        let seriesData = datas.map(r => r.emissions)
-        seriesData[0] = {
-          value: seriesData[0], label: {
-            offset: [12, 0]
+        let seriesData = datas.map((r, i) => {
+          let json = {
+            value: r.emissions, label: {}
          }
-        }
+          if (i == 0) {
+            json.label.offset = [12, 0]
+          } else if (i == datas.length - 1) {
+            json.label.offset = [-12, 0]
+          } else {
+            json.label.offset = [0, 0]
+          }
+          return json
+        })
        this.echartsInit(xAxisData, seriesData)
      })
    },
@ -156,7 +163,7 @@ export default {
              show: true,
              color: "#fff",
              backgroundColor: "#2CBCCE",
-              padding: [2, 4, 2, 4]
+              padding: [4, 4, 2, 4]
            },
            areaStyle: {
              color: {