liyongli 3 年之前
父节点
当前提交
1e14656aff
共有 1 个文件被更改,包括 18 次插入8 次删除
  1. 18 8
      src/views/HardAdvertisement/HardAdvertisement.vue

+ 18 - 8
src/views/HardAdvertisement/HardAdvertisement.vue

@@ -812,12 +812,12 @@ export default {
           value[1].push(key === "timeSize" ? n[key] / 60000 : n[key]);
       }
       if (old && old.length) {
-        if (old[0].dt === old[old.length - 1].dt) lendata.push(`${old[0].dt}`);
-        else lendata.push(`${old[0].dt}到${old[old.length - 1].dt}`);
+        if (old[0].dts === old[old.length - 1].dte) lendata.push(`${old[0].dt}`);
+        else lendata.push(`${old[0].dts}到${old[old.length - 1].dte}`);
       }
       if (now && now.length) {
-        if (now[0].dt === now[now.length - 1].dt) lendata.push(`${now[0].dt}`);
-        else lendata.push(`${now[0].dt}到${now[now.length - 1].dt}`);
+        if (now[0].dts === now[now.length - 1].dte) lendata.push(`${now[0].dt}`);
+        else lendata.push(`${now[0].dts}到${now[now.length - 1].dte}`);
       }
       return {
         keys,
@@ -875,6 +875,7 @@ export default {
         },
         yAxis: {
           type: "value",
+          name: this.launch_list[this.launch_act].text + '(' + this.launch_list[this.launch_act].unit + ')',
           scale: true,
           axisLabel: {
             formatter: arr => {
@@ -900,11 +901,15 @@ export default {
               vn = this.numFor(e.value || 0),
               launch_list = this.launch_list[this.launch_act] || {};
             let out = "";
-            if (s.dataIndex >= 0)
-              out += `${launch_list.text} <br /> ${bf[s.dataIndex].dt} ${vb +
+            if (s.dataIndex >= 0) {
+              let dt = no[s.dataIndex] ? no[s.dataIndex].dt : "";
+              out += `${launch_list.text} <br /> ${dt} ${vb +
                 launch_list.unit}`;
-            if (e.dataIndex >= 0)
-              out += `<br />${no[e.dataIndex].dt} ${vn + launch_list.unit}`;
+            }
+            if (e.dataIndex >= 0) {
+              let dt = bf[e.dataIndex] ? bf[e.dataIndex].dt : "";
+              out += `<br />${dt} ${vn + launch_list.unit}`;
+            }
             return out;
           },
         },
@@ -1180,6 +1185,11 @@ export default {
   margin: 10px 15px;
   background: #fff;
 }
+.hardAdvertisement .headStyle .cell,
+.hardAdvertisement .headStyle .cell * {
+    color: #000;
+    font-weight: 600;
+}
 .hardAdvertisement .el-card__body {
   padding: 0 0 20px 0;
 }