1

src/views/TAN.vue

@@ -159,16 +159,16 @@
 </template>
 <script>
 // import * as echarts from "echarts";
-const fontSizeRem = (size) => {
-  const clientWidth =
-    window.innerWidth ||
-    document.documentElement.clientWidth ||
-    document.body.clientWidth;
-  if (!clientWidth) return;
-  console.log(clientWidth);
-  let fontSize = clientWidth / 1920; //尺寸大小
-  return size * fontSize;
-};
+// const fontSizeRem = (size) => {
+//   const clientWidth =
+//     window.innerWidth ||
+//     document.documentElement.clientWidth ||
+//     document.body.clientWidth;
+//   if (!clientWidth) return;
+//   console.log(clientWidth);
+//   let fontSize = clientWidth / 1920; //尺寸大小
+//   return size * fontSize;
+// };
 import * as echarts from "echarts";
 // import { fontSizeRem } from "../assets/function";
 export default {
@@ -350,9 +350,7 @@ export default {
               // .072917rem /* 14/192 */
               // fontSize: fontSizeRem(14),
               fontSize: "0.072rem",
-              // .052083rem /* 10/192 */
-              padding: fontSizeRem(10),
-              // padding: "0.052rem",
+              padding: 10,
             },
             axisLabel: {
               show: true,
@@ -375,7 +373,6 @@ export default {
             // .010417rem /* 2/192 */
             lineStyle: {
               width: 2,
-              // width: "0.010rem",
               color: "#29F1FA",
             },
             showSymbol: false,
@@ -484,7 +481,7 @@ export default {
               show: true,
               textStyle: {
                 // fontSize: fontSizeRem(14),
-                fontSize: "0.072rem",
+                fontSize: "0.0729rem",
                 fontFamily: "AlibabaPuHuiTi",
                 fontWeight: 400,
                 color: "rgba(255,255,255,0.8)",
@@ -500,7 +497,7 @@ export default {
             smooth: true,
             lineStyle: {
               // width: fontSizeRem(2),
-              width: "0.01rem",
+              width: 2,
               color: "#FDCC00",
             },
             showSymbol: false,
@@ -1415,10 +1412,38 @@ export default {
                   borderWidth: 2, // 高亮时的边框宽度
                 },
                 label: {
-                  // .0625rem /* 12/192 */
-                  // fontSize: 12, // 选中地图文字字号和字体颜色
-                  fontSize: "0.0625rem", // 选中地图文字字号和字体颜色
-                  color: "#fff",
+                  show: true, //是否显示市
+                  formatter: function (params) {
+                    var name = params.name;
+                    var value = params.value;
+                    var text = ` {fline|${value}}\n{tline|${name}} `;
+                    return text;
+                  },
+                  textStyle: {
+                    color: "#000", //文字颜色
+                    // fontSize: 16, //文字大小
+                    fontSize: "0.0833rem", //文字大小
+                    fontFamily: "微软雅黑",
+                    // backgroundColor: {
+                    //   image: "../assets/客户侧总体用能情况分析/光标.png",
+                    // },
+                    // padding: [15, 20],
+                  },
+                  rich: {
+                    fline: {
+                      padding: [0, 35],
+                      color: "#FDCC00",
+                      // fontSize: 14,
+                      fontSize: "0.0729rem",
+                      fontWeight: 600,
+                    },
+                    tline: {
+                      padding: [0, 27],
+                      color: "#fff",
+                      // fontSize: 12,
+                      fontSize: "0.0625rem",
+                    },
+                  },
                 },
               },
               label: {
@@ -1732,7 +1757,7 @@ export default {
       line-height: 47px;
       letter-spacing: 3px;
       color: #fff;
-      margin-left: 60px;
+      margin-left: 164px;
     }
 
     img:nth-of-type(1) {

src/views/ZHDY.vue

@@ -1037,7 +1037,17 @@ export default {
             console.log(item);
             percent = ((item.value / total) * 100).toFixed(2);
             if (name !== "") {
-              return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}{num|%}`;
+              return (
+                `{name|${name}}` +
+                "\t" +
+                "\t" +
+                "\t" +
+                "\t" +
+                `{num|${percent}}` +
+                "\t" +
+                "\t" +
+                `{name|%}`
+              );
               // return `{name|${name}` + `{num|${percent}}{name|kWh}`;
             } else {
               return "";
@@ -1056,7 +1066,8 @@ export default {
               },
               num: {
                 // fontSize: 12,
-                fontSize: "0.0625rem",
+                fontWeight: 700,
+                fontSize: "0.0833rem",
                 color: color[1],
               },
             },
@@ -1376,7 +1387,7 @@ export default {
       line-height: 47px;
       letter-spacing: 3px;
       color: #fff;
-      margin-left: 60px;
+      margin-left: 128px;
     }
 
     img:nth-of-type(1) {