Merge branch 'master' of http://124.70.43.205:3000/sunzehao/fd_dwgz_zhyw_nx

src/components/alarm-badge/index.vue

@@ -24,8 +24,8 @@
         <img src="@assets/imgs/wgj1.png" />
       </div>
     </el-badge>
+    <!-- :dialogList="warnList.slice(0, 12)" -->
     <deligo-alarm-list
-        :dialogList="warnList.slice(0, 12)"
       @setConfig="displaySetting = true"
       @confirmed="handleConfirm"
       ref="deligoChild"

src/components/deligoAlarmList/index.vue

@@ -149,11 +149,7 @@ export default {
     };
   },
 
-  created() {
-    this.warnList = this.dialogList.filter(it => {
-        return !it.isClose
-    });
-  },
+  created() {},
   mounted() {},
   computed: {
     warnNum() {
@@ -197,7 +193,9 @@ export default {
       }
     },
     init(list) {
-      this.warnList = list;
+      this.warnList = list.filter((it) => {
+        return !it.endts > 0;
+      });
     },
     tableRowClassName({ row }) {
       if (row.isClose) {
@@ -228,7 +226,7 @@ export default {
         // arr = this.checkedRow.map((item) => {
         //   return { alarmType: item.alarmType, id: item.id };
         // });
-        arr = this.checkedRow
+        arr = this.checkedRow;
 
         confirmAlart(arr).then((res) => {
           if (res.code === 200) {

src/views/economicsOperation/benchmarkingManagement/compontent/bar-line-chart.vue

@@ -58,7 +58,16 @@ export default {
         // "#c531c7",
         // "#ffffff",
         // "#EDEB2F",
-        "#2999a0", "#67b9ff", "#ff6271", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae", "#EDB32F", "#DB5520", "#323E6F"
+        "#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05b2fa",
+        "#0ef167",
+        "#05bb4c",
+        "#4b55ae",
+        "#EDB32F",
+        "#DB5520",
+        "#323E6F",
       ],
     },
     // 每页显示个数
@@ -129,6 +138,24 @@ export default {
               width: "1",
             },
           },
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
+          },
         },
         yAxis: [
           {
@@ -179,7 +206,7 @@ export default {
             axisLabel: {
               show: false,
               textStyle: {
-                color: "#a6c1dd"
+                color: "#a6c1dd",
               },
               // formatter: "{value}",
               // color: partten.getColor("gray"),

src/views/economicsOperation/benchmarkingManagement/loseRate/index.vue

@@ -444,7 +444,7 @@ export default {
       //   this.gerWxssl();
     },
     initialization() {
-      this.dataChange(dataJson.data);
+      //   this.dataChange(dataJson.data);
       companys().then(({ data: res }) => {
         if (res.data) {
           this.company = res.data[0].id;

src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -248,6 +248,19 @@
           show-overflow-tooltip
           sortable
         >
+          <template #header="scope">
+            <div v-if="scope.column.label.indexOf('(') > 0">
+              <div style="font-size: 14px">
+                {{
+                  scope.column.label.slice(0, scope.column.label.indexOf("("))
+                }}
+              </div>
+              <div style="font-size: 12px">
+                {{ scope.column.label.slice(scope.column.label.indexOf("(")) }}
+              </div>
+            </div>
+            <div v-else>{{ scope.column.label }}</div>
+          </template>
         </el-table-column>
       </el-table>
       <div class="pagination-class">
@@ -350,10 +363,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="fdl"
-              label="发电量"
+              label="发电量(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
@@ -371,10 +402,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="gzssdl"
-              label="故障损失"
+              label="故障损失(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
@@ -392,10 +441,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="jxssdl"
-              label="检修损失"
+              label="检修损失(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
@@ -413,10 +480,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="xnssdl"
-              label="性能损失"
+              label="性能损失(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
@@ -434,10 +519,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="xdssdl"
-              label="限电损失"
+              label="限电损失(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
@@ -455,10 +558,28 @@
               header-align="center"
               label-class-name="s-tb-th"
               prop="slssdl"
-              label="受累损失"
+              label="受累损失(万kWh)"
               sortable
               minWidth="65"
             >
+              <template #header="scope">
+                <div v-if="scope.column.label.indexOf('(') > 0">
+                  <div style="font-size: 14px">
+                    {{
+                      scope.column.label.slice(
+                        0,
+                        scope.column.label.indexOf("(")
+                      )
+                    }}
+                  </div>
+                  <div style="font-size: 12px">
+                    {{
+                      scope.column.label.slice(scope.column.label.indexOf("("))
+                    }}
+                  </div>
+                </div>
+                <div v-else>{{ scope.column.label }}</div>
+              </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip

src/views/economicsOperation/homePage/components/barCharts.vue

@@ -233,13 +233,22 @@ export default {
             },
           },
           formatter: function (params) {
-            let tooltipText = params[0].axisValueLabel + "<br/>";
-            params.forEach(function (item) {
-              // 为每个数据项添加单位，假设数值的单位是'元'
-              tooltipText +=
-                item.seriesName + "：" + item.value + " 万kWh<br/>";
-            });
-            return tooltipText;
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
           },
         },
         legend: {

src/views/economicsOperation/homePage/components/pieChart.vue

@@ -41,7 +41,16 @@ export default {
     color: {
       type: Array,
       default: () => [
-        "#2999a0", "#67b9ff", "#ff6271", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae", "#EDB32F", "#DB5520", "#323E6F"
+        "#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05b2fa",
+        "#0ef167",
+        "#05bb4c",
+        "#4b55ae",
+        "#EDB32F",
+        "#DB5520",
+        "#323E6F",
       ],
     },
   },
@@ -143,7 +152,7 @@ export default {
         legend: {
           type: "scroll",
           orient: "vertical",
-          right: '8%',
+          right: "8%",
           top: "middle",
           itemWidth: 8,
           itemHeight: 8,
@@ -194,6 +203,19 @@ export default {
         ],
         tooltip: {
           trigger: "item",
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:2px'>`;
+            var param = params;
+            var seriesName = param.data.name; //图例名称
+            var value = param.data.value; //y轴值
+            var mark = param.marker; //点
+            var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+            htmlStr += mark; //一个点
+            htmlStr += `${seriesName} : ${value != null ? value + unit : "--"}`; //圆点后面显示的文本
+            htmlStr += "</div>";
+            return htmlStr;
+          },
         },
         toolbox: {
           show: true,

src/views/economicsOperation/nxfHomePage/component/multiple-bar-chart.vue

@@ -1,390 +1,427 @@
 <template>
-    <div class="chart" :id="id"></div>
+  <div class="chart" :id="id"></div>
 </template>
 
 <script>
-    import util from "@/helper/util.js";
-    import partten from "@/helper/partten.js";
-    import * as echarts from "echarts";
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
 
-    export default {
-        name: "multiple-bar-charts",
-        componentName: "multiple-bar-chart",
-        props: {
-            width: {
-                type: String,
-                default: "100%",
+export default {
+  name: "multiple-bar-charts",
+  componentName: "multiple-bar-chart",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "13.889vh",
+    },
+    // 传入数据
+    list: {
+      type: Array,
+      default: () => [
+        {
+          title: "日发电量",
+          yAxisIndex: 0,
+          value: [
+            {
+              text: "1日",
+              value: 1,
             },
-            height: {
-                type: String,
-                default: "13.889vh",
-            },
-            // 传入数据
-            list: {
-                type: Array,
-                default: () => [{
-                        title: "日发电量",
-                        yAxisIndex: 0,
-                        value: [{
-                            text: "1日",
-                            value: 1,
-                        }, ],
-                    },
-                    {
-                        title: "上网电量",
-                        yAxisIndex: 0,
-                        value: [{
-                                text: "1日",
-                                value: 1,
-                            },
-                            {
-                                text: "2日",
-                                value: 2,
-                            },
-                            {
-                                text: "3日",
-                                value: 1,
-                            },
-                            {
-                                text: "4日",
-                                value: 3,
-                            },
-                            {
-                                text: "5日",
-                                value: 3,
-                            },
-                            {
-                                text: "6日",
-                                value: 3,
-                            },
-                            {
-                                text: "7日",
-                                value: 3,
-                            },
-                        ],
-                    },
-                    {
-                        title: "购网电量",
-                        yAxisIndex: 0,
-                        value: [{
-                                text: "1日",
-                                value: 1,
-                            },
-                            {
-                                text: "2日",
-                                value: 2,
-                            },
-                            {
-                                text: "3日",
-                                value: 1,
-                            },
-                            {
-                                text: "4日",
-                                value: 3,
-                            },
-                            {
-                                text: "5日",
-                                value: 3,
-                            },
-                            {
-                                text: "6日",
-                                value: 3,
-                            },
-                            {
-                                text: "7日",
-                                value: 3,
-                            },
-                        ],
-                    },
-                    {
-                        title: "风速",
-                        yAxisIndex: 1,
-                        value: [{
-                                text: "1日",
-                                value: 1,
-                            },
-                            {
-                                text: "2日",
-                                value: 2,
-                            },
-                            {
-                                text: "3日",
-                                value: 1,
-                            },
-                            {
-                                text: "4日",
-                                value: 3,
-                            },
-                            {
-                                text: "5日",
-                                value: 3,
-                            },
-                            {
-                                text: "6日",
-                                value: 3,
-                            },
-                            {
-                                text: "7日",
-                                value: 3,
-                            },
-                        ],
-                    },
-                ],
+          ],
+        },
+        {
+          title: "上网电量",
+          yAxisIndex: 0,
+          value: [
+            {
+              text: "1日",
+              value: 1,
             },
-            // 单位
-            units: {
-                type: Array,
-                default: () => ["(万KWh)", "(风速)"],
+            {
+              text: "2日",
+              value: 2,
             },
-            // 显示 legend
-            showLegend: {
-                type: Boolean,
-                default: true,
+            {
+              text: "3日",
+              value: 1,
             },
-            // 颜色#
-            color: {
-                type: Array,
-                default: () => [
-                    "#2999a0", "#67b9ff", "#ff6271", 
-                    "#05bb4c",
-                    "#4b55ae",
-                    "#fa8c16",
-                    "#f8de5b",
-                    "#1a93cf",
-                    "#c531c7",
-                    "#bd3338",
-                ],
+            {
+              text: "4日",
+              value: 3,
             },
-            showAnimation: {
-                type: Boolean,
-                default: true,
+            {
+              text: "5日",
+              value: 3,
             },
-            // 柱子最大宽度
-            barMaxWidth: {
-                type: Number || String,
-                default: 0,
+            {
+              text: "6日",
+              value: 3,
             },
-            // 柱子间距
-            barGap: {
-                type: Number || String,
-                default: 0,
+            {
+              text: "7日",
+              value: 3,
             },
+          ],
         },
-        data() {
-            return {
-                id: "",
-                chart: null,
-                firstAnimation: true,
-            };
+        {
+          title: "购网电量",
+          yAxisIndex: 0,
+          value: [
+            {
+              text: "1日",
+              value: 1,
+            },
+            {
+              text: "2日",
+              value: 2,
+            },
+            {
+              text: "3日",
+              value: 1,
+            },
+            {
+              text: "4日",
+              value: 3,
+            },
+            {
+              text: "5日",
+              value: 3,
+            },
+            {
+              text: "6日",
+              value: 3,
+            },
+            {
+              text: "7日",
+              value: 3,
+            },
+          ],
         },
-        computed: {
-            legend() {
-                return this.list.map((t) => {
-                    return t.title;
-                });
+        {
+          title: "风速",
+          yAxisIndex: 1,
+          value: [
+            {
+              text: "1日",
+              value: 1,
             },
-            xdata() {
-                let result = [];
-                if (this.list && this.list.length > 0 && this.list[0].value.length > 0) {
-                    result = this.list[0].value.map((t) => {
-                        return t.text;
-                    });
-                }
-                return result;
+            {
+              text: "2日",
+              value: 2,
             },
-            ydata() {
-                let result = [];
-                this.units.forEach((value, index) => {
-                    let data = null;
-                    if (index == 0) {
-                        data = {
-                            type: "value",
-                            name: value,
-                            nameTextStyle: {
-                                color: "#a6c1dd"
-                            },
-                            axisLabel: {
-                                formatter: "{value} ",
-                                fontSize: 12,
-                                textStyle: {
-                                    color: this.$store.state.themeName === "dark" ?
-                                        "#a6c1dd" : "#000",
-                                },
-                            },
-                            //分格线
-                            splitLine: {
-                                lineStyle: {
-                                    color: this.$store.state.themeName === "dark" ? "#404d69" : "#000",
-                                    type: "dashed",
-                                },
-                            },
-                        };
-                    } else {
-                        data = {
-                            type: "value",
-                            name: value,
-                            nameTextStyle: {
-                                color: "#a6c1dd"
-                            },
-                            axisLabel: {
-                                formatter: "{value}",
-                                fontSize: 12,
-                                textStyle: {
-                                    color: this.$store.state.themeName === "dark" ?
-                                        "#a6c1dd" : "#000",
-                                },
-                            },
-                            //分格线
-                            splitLine: {
-                                show: false,
-                            },
-                        };
-                    }
-
-                    result.push(data);
-                });
-
-                return result;
+            {
+              text: "3日",
+              value: 1,
             },
-            series() {
-                let result = [];
-                if (this.list && this.list.length > 0) {
-                    this.list.forEach((value, index) => {
-                        let seriesItem = {
-                            name: value.title,
-                            type: "bar",
-                            barWidth: "8%",
-                            animation: this.firstAnimation && this.showAnimation,
-                            yAxisIndex: value.yAxisIndex,
-                            data: value.value.map((t) => {
-                                return t.value;
-                            }),
-                        };
-                        if (this.barMaxWidth) {
-                            seriesItem.barMaxWidth = this.barMaxWidth;
-                        } else {
-                            seriesItem.barWidth = "8%";
-                        }
-
-                        if (this.barGap) {
-                            seriesItem.barGap = this.barGap;
-                        }
-                        result.push(seriesItem);
-                    });
-                }
-                return result;
+            {
+              text: "4日",
+              value: 3,
+            },
+            {
+              text: "5日",
+              value: 3,
             },
+            {
+              text: "6日",
+              value: 3,
+            },
+            {
+              text: "7日",
+              value: 3,
+            },
+          ],
         },
-        methods: {
-            resize() {
-                this.initChart();
+      ],
+    },
+    // 单位
+    units: {
+      type: Array,
+      default: () => ["(万KWh)", "(风速)"],
+    },
+    // 显示 legend
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+    // 颜色#
+    color: {
+      type: Array,
+      default: () => [
+        "#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05bb4c",
+        "#4b55ae",
+        "#fa8c16",
+        "#f8de5b",
+        "#1a93cf",
+        "#c531c7",
+        "#bd3338",
+      ],
+    },
+    showAnimation: {
+      type: Boolean,
+      default: true,
+    },
+    // 柱子最大宽度
+    barMaxWidth: {
+      type: Number || String,
+      default: 0,
+    },
+    // 柱子间距
+    barGap: {
+      type: Number || String,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+      firstAnimation: true,
+    };
+  },
+  computed: {
+    legend() {
+      return this.list.map((t) => {
+        return t.title;
+      });
+    },
+    xdata() {
+      let result = [];
+      if (this.list && this.list.length > 0 && this.list[0].value.length > 0) {
+        result = this.list[0].value.map((t) => {
+          return t.text;
+        });
+      }
+      return result;
+    },
+    ydata() {
+      let result = [];
+      this.units.forEach((value, index) => {
+        let data = null;
+        if (index == 0) {
+          data = {
+            type: "value",
+            name: value,
+            nameTextStyle: {
+              color: "#a6c1dd",
+            },
+            axisLabel: {
+              formatter: "{value} ",
+              fontSize: 12,
+              textStyle: {
+                color:
+                  this.$store.state.themeName === "dark" ? "#a6c1dd" : "#000",
+              },
             },
-            initChart() {
-                let chart = echarts.init(this.$el);
+            //分格线
+            splitLine: {
+              lineStyle: {
+                color:
+                  this.$store.state.themeName === "dark" ? "#404d69" : "#000",
+                type: "dashed",
+              },
+            },
+          };
+        } else {
+          data = {
+            type: "value",
+            name: value,
+            nameTextStyle: {
+              color: "#a6c1dd",
+            },
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              textStyle: {
+                color:
+                  this.$store.state.themeName === "dark" ? "#a6c1dd" : "#000",
+              },
+            },
+            //分格线
+            splitLine: {
+              show: false,
+            },
+          };
+        }
 
-                let option = {
-                    color: this.color,
-                    tooltip: {
-                        trigger: "axis",
-                        backgroundColor: this.$store.state.themeName === "dark" ?
-                            "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
-                        borderColor: this.$store.state.themeName === "dark" ?
-                            partten.getColor("gray") : "#000",
-                        textStyle: {
-                            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
-                            fontSize: 12,
-                        },
-                    },
-                    legend: {
-                        show: this.showLegend,
-                        data: this.legend,
-                        right: 56,
-                        icon: "ract",
-                        itemWidth: 8,
-                        itemHeight: 8,
-                        inactiveColor: this.$store.state.themeName === "dark" ?
-                            partten.getColor("gray") : "#000",
-                        textStyle: {
-                            fontSize: 12,
-                            color: this.$store.state.themeName === "dark" ?
-                                partten.getColor("grayl") : "#000",
-                        },
-                    },
-                    grid: {
-                        top: 32,
-                        left: 25,
-                        right: 30,
-                        bottom: 0,
-                        containLabel: true,
-                    },
-                    xAxis: [{
-                        type: "category",
-                        data: this.xdata,
-                        nameLocation: "center",
-                        axisPointer: {
-                            type: "shadow",
-                        },
-                        axisLabel: {
-                            interval: 0,
-                            fontSize: 12,
-                            textStyle: {
-                                color: this.$store.state.themeName === "dark" ?
-                                    "#a6c1dd" : "#000",
-                            },
-                        },
-                    }, ],
-                    yAxis: this.ydata,
-                    series: this.series,
-                };
+        result.push(data);
+      });
 
-                chart.clear();
-                chart.setOption(option);
+      return result;
+    },
+    series() {
+      let result = [];
+      if (this.list && this.list.length > 0) {
+        this.list.forEach((value, index) => {
+          let seriesItem = {
+            name: value.title,
+            type: "bar",
+            barWidth: "8%",
+            animation: this.firstAnimation && this.showAnimation,
+            yAxisIndex: value.yAxisIndex,
+            data: value.value.map((t) => {
+              return t.value;
+            }),
+          };
+          if (this.barMaxWidth) {
+            seriesItem.barMaxWidth = this.barMaxWidth;
+          } else {
+            seriesItem.barWidth = "8%";
+          }
 
-                this.resize = function () {
-                    chart.resize();
-                };
+          if (this.barGap) {
+            seriesItem.barGap = this.barGap;
+          }
+          result.push(seriesItem);
+        });
+      }
+      return result;
+    },
+  },
+  methods: {
+    resize() {
+      this.initChart();
+    },
+    initChart() {
+      let chart = echarts.init(this.$el);
 
-                window.addEventListener("resize", this.resize);
-            },
-        },
-        created() {
-            this.$nextTick(() => {
-                this.id = "pie-chart-" + util.newGUID();
-            });
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$el.style.width = this.width;
-                this.$el.style.height = this.height;
-                this.initChart();
-                this.firstAnimation = false;
-            });
+      let option = {
+        color: this.color,
+        tooltip: {
+          trigger: "axis",
+          backgroundColor:
+            this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
+          textStyle: {
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
+            fontSize: 12,
+          },
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
+          },
         },
-        updated() {
-            this.$nextTick(() => {
-                this.initChart();
-            });
+        legend: {
+          show: this.showLegend,
+          data: this.legend,
+          right: 56,
+          icon: "ract",
+          itemWidth: 8,
+          itemHeight: 8,
+          inactiveColor:
+            this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
+          textStyle: {
+            fontSize: 12,
+            color:
+              this.$store.state.themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
+          },
         },
-        unmounted() {
-            window.removeEventListener("resize", this.resize);
+        grid: {
+          top: 32,
+          left: 25,
+          right: 30,
+          bottom: 0,
+          containLabel: true,
         },
-
-        watch: {
-            "$store.state.themeName"() {
-                let myChart = echarts.init(document.getElementById(this.id));
-                myChart.dispose();
-                setTimeout(() => {
-                    this.initChart();
-                }, 300);
+        xAxis: [
+          {
+            type: "category",
+            data: this.xdata,
+            nameLocation: "center",
+            axisPointer: {
+              type: "shadow",
             },
-        },
-    };
+            axisLabel: {
+              interval: 0,
+              fontSize: 12,
+              textStyle: {
+                color:
+                  this.$store.state.themeName === "dark" ? "#a6c1dd" : "#000",
+              },
+            },
+          },
+        ],
+        yAxis: this.ydata,
+        series: this.series,
+      };
+
+      chart.clear();
+      chart.setOption(option);
+
+      this.resize = function () {
+        chart.resize();
+      };
+
+      window.addEventListener("resize", this.resize);
+    },
+  },
+  created() {
+    this.$nextTick(() => {
+      this.id = "pie-chart-" + util.newGUID();
+    });
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
+      this.initChart();
+      this.firstAnimation = false;
+    });
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
+
+  watch: {
+    "$store.state.themeName"() {
+      let myChart = echarts.init(document.getElementById(this.id));
+      myChart.dispose();
+      setTimeout(() => {
+        this.initChart();
+      }, 300);
+    },
+  },
+};
 </script>
 
 <style lang="less">
-    .chart {
-        width: 100%;
-        height: 100%;
-        display: inline-block;
-    }
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
 </style>

src/views/economicsOperation/nxfHomePage/component/multiple-y-line-chart-normal.vue

@@ -285,7 +285,18 @@ export default {
     return {
       id: "",
       chart: null,
-      color: ["#2999a0", "#67b9ff", "#ff6271", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae", "#EDB32F", "#DB5520", "#323E6F",  ],
+      color: [
+        "#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05b2fa",
+        "#0ef167",
+        "#05bb4c",
+        "#4b55ae",
+        "#EDB32F",
+        "#DB5520",
+        "#323E6F",
+      ],
     };
   },
   computed: {
@@ -309,7 +320,7 @@ export default {
           nameLocation: p[item.position] % 2 == 0 ? "end" : "start",
           nameGap: 10,
           nameTextStyle: {
-            color: "#a6c1dd"
+            color: "#a6c1dd",
           },
           min: item.min,
           max: item.max,
@@ -320,9 +331,7 @@ export default {
             fontSize: 12,
             textStyle: {
               color:
-                this.$store.state.themeName === "dark"
-                  ? "#a6c1dd"
-                  : "#000",
+                this.$store.state.themeName === "dark" ? "#a6c1dd" : "#000",
             },
           },
           //分格线
@@ -401,6 +410,33 @@ export default {
             color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 12,
           },
+          //   formatter: function (params) {
+          //     let tooltipText = params[0].axisValueLabel + "<br/>";
+          //     params.forEach(function (item) {
+          //       // 为每个数据项添加单位，假设数值的单位是'元'
+          //       tooltipText +=
+          //         item.seriesName + "：" + item.value + " 万kWh<br/>";
+          //     });
+          //     return tooltipText;
+          //   },
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
+          },
         },
         legend: {
           show: this.showLegend,
@@ -433,9 +469,7 @@ export default {
               fontSize: 12,
               textStyle: {
                 color:
-                  this.$store.state.themeName === "dark"
-                    ? "#a6c1dd"
-                    : "#000",
+                  this.$store.state.themeName === "dark" ? "#a6c1dd" : "#000",
               },
             },
             data: this.xdata,

src/views/economicsOperation/nxfHomePage/component/percent-card-2.vue

@@ -1,130 +1,151 @@
 <template>
-    <div class="percent-card">
-        <div class="card-chart">
-            <percent-bar width="13vh" height="13vh" :value="percent" :nameVa="PercentName" :color="color" />
-            <div class="card-title gray">{{ title }}</div>
+  <div class="percent-card">
+    <div class="card-chart">
+      <percent-bar
+        width="13vh"
+        height="13vh"
+        :value="percent"
+        :nameVa="PercentName"
+        :color="color"
+      />
+      <div class="card-title gray">{{ title }}</div>
+    </div>
+    <div class="card-info">
+      <div class="card-value">
+        <span class="value-text newBlue">{{ TotalText }}</span>
+        <div>
+          <span class="newwhite">{{ TotalValue.toFixed(2) }}</span>
+          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
+        </div>
+      </div>
+      <div class="card-value">
+        <span class="value-text newBlue">{{ ActualText }}</span>
+        <!-- <span class="newwhite">{{ ActualValue * 10 }}</span> -->
+        <div>
+          <span class="newwhite">{{ ActualValue }}</span>
+          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
         </div>
-        <div class="card-info">
-            <div class="card-value">
-                <span class="value-text newBlue">{{ TotalText }}</span>
-                <span class="newwhite">{{ TotalValue.toFixed(2) }}</span>
-            </div>
-            <div class="card-value">
-                <span class="value-text newBlue">{{ ActualText }}</span>
-                <!-- <span class="newwhite">{{ ActualValue * 10 }}</span> -->
-                <span class="newwhite">{{ ActualValue }}</span>
-            </div>
-            <div class="card-value">
-                <span class="value-text newBlue">{{ PercentText }}</span>
-                <span class="newwhite">{{ PercentValue ? PercentValue.toFixed(2) : 0 }}</span>
-            </div>
+        <!-- <span class="newwhite">{{ ActualValue }}</span> -->
+      </div>
+      <div class="card-value">
+        <span class="value-text newBlue">{{ PercentText }}</span>
+        <div>
+          <span class="newwhite">{{
+            PercentValue ? PercentValue.toFixed(2) : 0
+          }}</span>
+          <span class="newwhite" style="font-size: 12px">(万kWh)</span>
         </div>
+        <!-- <span class="newwhite"
+          >{{ PercentValue ? PercentValue.toFixed(2) : 0 }}(万kWh)</span
+        > -->
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-    // 百分比card2
-    // 使用位置 驾驶舱首页 计划电量完成情况 中的百分比卡片
-    import PercentBar from "./percent-bar.vue";
-    export default {
-        created() {},
-        components: {
-            PercentBar,
-        },
-        props: {
-            title: {
-                type: String,
-                default: "月计划完成率",
-            },
-            PercentName: {
-                type: String,
-                default: "",
-            },
-            TotalText: {
-                type: String,
-                default: "实际",
-            },
-            TotalValue: {
-                type: Number,
-                String,
-                default: 0,
-            },
-            ActualText: {
-                type: String,
-                default: "计划",
-            },
-            ActualValue: {
-                type: Number,
-                String,
-                default: 0,
-            },
-            PercentText: {
-                type: String,
-                default: "计划",
-            },
-            PercentValue: {
-                type: Number,
-                String,
-                default: 0,
-            },
-            color: {
-                type: String,
-                default: "green",
-            },
-        },
+// 百分比card2
+// 使用位置 驾驶舱首页 计划电量完成情况 中的百分比卡片
+import PercentBar from "./percent-bar.vue";
+export default {
+  created() {},
+  components: {
+    PercentBar,
+  },
+  props: {
+    title: {
+      type: String,
+      default: "月计划完成率",
+    },
+    PercentName: {
+      type: String,
+      default: "",
+    },
+    TotalText: {
+      type: String,
+      default: "实际",
+    },
+    TotalValue: {
+      type: Number,
+      String,
+      default: 0,
+    },
+    ActualText: {
+      type: String,
+      default: "计划",
+    },
+    ActualValue: {
+      type: Number,
+      String,
+      default: 0,
+    },
+    PercentText: {
+      type: String,
+      default: "计划",
+    },
+    PercentValue: {
+      type: Number,
+      String,
+      default: 0,
+    },
+    color: {
+      type: String,
+      default: "green",
+    },
+  },
 
-        computed: {
-            percent() {
-                return this.TotalValue === 0 || this.ActualValue === 0 ?
-                    0 :
-                    parseInt((this.TotalValue / this.ActualValue) * 100);
-            },
-        },
-    };
+  computed: {
+    percent() {
+      return this.TotalValue === 0 || this.ActualValue === 0
+        ? 0
+        : parseInt((this.TotalValue / this.ActualValue) * 100);
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-    .percent-card {
-        display: flex;
+.percent-card {
+  display: flex;
 
-        .card-chart {
-            flex: 1 1 5.926vh;
-        }
+  .card-chart {
+    flex: 1 1 5.926vh;
+  }
 
-        .card-title {
-            text-align: center;
-            width: 100%;
-            margin-top: 1.481vh;
-            font-size: 12px;
-        }
+  .card-title {
+    text-align: center;
+    width: 100%;
+    margin-top: 1.481vh;
+    font-size: 12px;
+  }
 
-        .card-info {
-            flex: auto;
-            align-self: center;
-            margin-left: 10px;
-            margin-top: -0.4vh;
+  .card-info {
+    flex: auto;
+    align-self: center;
+    margin-left: 10px;
+    margin-top: -0.4vh;
 
-            .card-value {
-                font-size: 14px;
-                font-weight: 600;
-                margin-bottom: 1.1111vh;
-                white-space: nowrap;
+    .card-value {
+      font-size: 14px;
+      font-weight: 600;
+      margin-bottom: 1.1111vh;
+      white-space: nowrap;
 
-                .value-text {
-                    margin-right: 10px;
-                    font-family: @font-family-num;
-                }
-                .newBlue{
-                    color: #4d72bb;
-                }
-                .newwhite{
-                    color: #c3e1ff;
-                }
-            }
+      .value-text {
+        margin-right: 10px;
+        font-family: @font-family-num;
+      }
+      .newBlue {
+        color: #4d72bb;
+      }
+      .newwhite {
+        color: #c3e1ff;
+      }
+    }
 
-            .card-text {
-                font-size: @fontsize;
-            }
-        }
+    .card-text {
+      font-size: @fontsize;
     }
+  }
+}
 </style>

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/current-scatter-chart.vue

@@ -101,7 +101,7 @@ export default {
 
     initChart(markItem = {}) {
       const that = this;
-    //   document.getElementById(this.id).removeAttribute("_echarts_instance_");
+      //   document.getElementById(this.id).removeAttribute("_echarts_instance_");
       that.chart = null;
       const theme = sessionStorage.getItem("theme") === "true" ? true : false;
 
@@ -222,6 +222,8 @@ export default {
                                   ele.seriesName
                                 }:<span style="font-weight: 700;margin-left:10px">${
                   ele.value || 0
+                }</span><span>${
+                  ele.seriesName === "平均风速" ? "m/s" : "MW"
                 }</span>
                             </span>
                            </p>

src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -336,42 +336,42 @@ const funSubmit = (params) => {
         },
         {
           prop: "ygsdxz",
-          label: "有功设定限值",
+          label: "有功设定限值(MW)",
           width: 80,
         },
         {
           prop: "sfyg",
-          label: "实发有功",
+          label: "实发有功(MW)",
           width: 80,
         },
         {
           prop: "cz",
-          label: "差值",
+          label: "差值(MW)",
           width: 80,
         },
         {
           prop: "llgl",
-          label: "理论功率",
+          label: "理论功率(MW)",
           width: 80,
         },
         {
           prop: "pcsx",
-          label: "偏差上限",
+          label: "偏差上限(MW)",
           width: 80,
         },
         {
           prop: "pcxx",
-          label: "偏差下限",
+          label: "偏差下限(MW)",
           width: 100,
         },
         {
           prop: "bzgl",
-          label: "保证功率",
+          label: "保证功率(MW)",
           width: 100,
         },
         {
           prop: "pjfs",
-          label: "平均风速",
+          label: "平均风速(m/s)",
           width: 100,
         },
       ];

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/current-scatter-chart.vue

@@ -222,7 +222,7 @@ export default {
                                   ele.seriesName
                                 }:<span style="font-weight: 700;margin-left:10px">${
                   ele.value || 0
-                }</span>
+                }</span><span>${ele.seriesName === "风速" ? "m/s" : "MW"}</span>
                             </span>
                            </p>
                           </p>`;

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue

@@ -261,17 +261,17 @@ const funSubmit = (params) => {
         },
         {
           prop: "fs",
-          label: "风速",
+          label: "风速(m/s)",
           width: 80,
         },
         {
           prop: "sfyg",
-          label: "实发有功",
+          label: "实发有功(MW)",
           width: 80,
         },
         {
           prop: "llgl",
-          label: "理论功率",
+          label: "理论功率(MW)",
           width: 80,
         },
       ];

src/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis/index.vue

@@ -715,6 +715,19 @@ export default {
           textStyle: {
             color: "#fff",
           },
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:2px'>`;
+            var param = params;
+            var seriesName = param.data.name; //图例名称
+            var value = param.data.value; //y轴值
+            var mark = param.marker; //点
+            var unit = `<span style='font-size:12px'>${"万kWh"}</span>`;
+
+            htmlStr += mark; //一个点
+            htmlStr += `${seriesName} : ${value != null ? value + unit : "--"}`; //圆点后面显示的文本
+            htmlStr += "</div>";
+            return htmlStr;
+          },
         },
         toolbox: {
           show: true,

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/index.vue

@@ -168,7 +168,7 @@ import {
 import HistoryDetail from "./historyDetail.vue";
 import utils from "@/utills/downXlsx";
 import dayjs from "dayjs";
-import dataJson from "./dataJson.json"
+import dataJson from "./dataJson.json";
 export default {
   name: "CutInAndOutAnalysis", //切入切出分析
   components: {
@@ -189,33 +189,33 @@ export default {
         { id: -2, name: "光伏" },
       ],
       tableHeader: [
-        { title: "总小风切入", code: "inputSmall" },
-        { title: "总大风切入", code: "inputBig" },
-        { title: "总小风切出", code: "outputSmall" },
-        { title: "总大风切出", code: "outputBig" },
-        { title: "日小风切入", code: "dayInputSmall" },
+        { title: "总小风切入(m/s)", code: "inputSmall" },
+        { title: "总大风切入(m/s)", code: "inputBig" },
+        { title: "总小风切出(m/s)", code: "outputSmall" },
+        { title: "总大风切出(m/s)", code: "outputBig" },
+        { title: "日小风切入(m/s)", code: "dayInputSmall" },
         { title: "日小风切入合格率", code: "dayInputSmallRatio" },
-        { title: "日小风切出", code: "dayOutputSmall" },
+        { title: "日小风切出(m/s)", code: "dayOutputSmall" },
         { title: "日小风切出合格率", code: "dayOutputSmallRatio" },
-        { title: "日大风切入", code: "dayInputBig" },
+        { title: "日大风切入(m/s)", code: "dayInputBig" },
         { title: "日大风切入合格率", code: "dayInputBigRatio" },
-        { title: "日大风切出", code: "dayOutputBig" },
+        { title: "日大风切出(m/s)", code: "dayOutputBig" },
         { title: "日大风切出合格率", code: "dayOutputBigRatio" },
-        { title: "月小风切入", code: "monthInputSmall" },
+        { title: "月小风切入(m/s)", code: "monthInputSmall" },
         { title: "月小风切入合格率", code: "monthInputSmallRatio" },
-        { title: "月大风切入", code: "monthInputBig" },
+        { title: "月大风切入(m/s)", code: "monthInputBig" },
         { title: "月大风切入合格率", code: "monthInputBigRatio" },
-        { title: "月小风切出", code: "monthOutputSmall" },
+        { title: "月小风切出(m/s)", code: "monthOutputSmall" },
         { title: "月小风切出合格率", code: "monthOutputSmallRatio" },
-        { title: "月大风切出", code: "monthOutputBig" },
+        { title: "月大风切出(m/s)", code: "monthOutputBig" },
         { title: "月大风切出合格率", code: "monthOutputBigRatio" },
-        { title: "年小风切入", code: "yearInputSmall" },
+        { title: "年小风切入(m/s)", code: "yearInputSmall" },
         { title: "年小风切入合格率", code: "yearInputSmallRatio" },
-        { title: "年大风切入", code: "yearInputBig" },
+        { title: "年大风切入(m/s)", code: "yearInputBig" },
         { title: "年大风切入合格率", code: "yearInputBigRatio" },
-        { title: "年小风切出", code: "yearOutputSmall" },
+        { title: "年小风切出(m/s)", code: "yearOutputSmall" },
         { title: "年小风切出合格率", code: "yearOutputSmallRatio" },
-        { title: "年大风切出", code: "yearOutputBig" },
+        { title: "年大风切出(m/s)", code: "yearOutputBig" },
         { title: "年大风切出合格率", code: "yearOutputBigRatio" },
       ],
       page: {
@@ -236,7 +236,7 @@ export default {
     } else {
       this.isFullScreen = false;
     }
-    
+
     //   this.cutInAndOutAnalysisData = dataJson.data.data.records;
     //   this.page.total = dataJson.data.data.total;
     this.getCompanyData();

src/views/economicsOperation/windAnalyse/powerSearch/index.vue

@@ -142,14 +142,12 @@ import {
   getApiPerformancecurvefitting,
 } from "@/api/monthlyPerformanceAnalysis";
 
-import {
-  getApiequipmentListByWp2
-} from "@/api/monthlyPerformanceAnalysis";
+import { getApiequipmentListByWp2 } from "@/api/monthlyPerformanceAnalysis";
 import * as echarts from "echarts";
 import partten from "@/helper/partten.js";
 import util from "@/helper/util.js";
 import utils from "@/utills/downXlsx";
-import dataJson from "./dataJson.json"
+import dataJson from "./dataJson.json";
 export default {
   name: "PowerSearch",
   data() {
@@ -174,11 +172,9 @@ export default {
       originData: [],
     };
   },
-  created() {
-  },
-  mounted(){
+  created() {},
+  mounted() {
     this.getCompanyData();
-    
   },
   watch: {},
   methods: {
@@ -224,8 +220,8 @@ export default {
     },
     // 获取公司列表
     async getCompanyData() {
-        // this.powerLinefittingData = dataJson.data.data
-        // this.changeEchartsData(dataJson.data.data);
+      // this.powerLinefittingData = dataJson.data.data
+      // this.changeEchartsData(dataJson.data.data);
 
       this.companyOptions = [];
       this.pickerTimer = this.getchangeTime(new Date());
@@ -273,16 +269,16 @@ export default {
     // 获取风机
     async getWindData() {
       this.windsOptions = [];
-    //   let params = {
-    //     companyId: this.companyVal,
-    //     wpIds: this.stationVal,
-    //     projectIds: "",
-    //     lineIds: "",
-    //     type: 0,
-    //   };
-    let params = {
-        wpid: this.stationVal
-    }
+      //   let params = {
+      //     companyId: this.companyVal,
+      //     wpIds: this.stationVal,
+      //     projectIds: "",
+      //     lineIds: "",
+      //     type: 0,
+      //   };
+      let params = {
+        wpid: this.stationVal,
+      };
       const { data: datas } = await getApiequipmentListByWp2(params);
       if (datas.data.length) {
         this.windsOptions = datas.data;
@@ -302,7 +298,6 @@ export default {
         wtId: this.windVal,
         type: this.tabEvent,
       };
-      
 
       const { data: datas } = await getApiPerformancecurvefitting(params);
 
@@ -357,7 +352,13 @@ export default {
     getChartes(xAxis, lenged, series, showY) {
       let option = {
         color: [
-          "#2999a0", "#67b9ff", "#ff6271", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae"
+          "#2999a0",
+          "#67b9ff",
+          "#ff6271",
+          "#05b2fa",
+          "#0ef167",
+          "#05bb4c",
+          "#4b55ae",
         ],
         tooltip: {
           trigger: "axis",
@@ -367,6 +368,24 @@ export default {
             color: "#fff",
             fontSize: util.vh(16),
           },
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:12px'>${"kW"}</span>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
+          },
         },
         legend: {
           show: true,