提交

src/api/index.js

@@ -561,3 +561,31 @@ export function LastWeekTrend(data) {
     data,
   });
 }
+
+/**
+ * 品牌top
+ * @props {string} dataType
+ * @return {AxjxPromise}
+ */
+export function BrandTop(data) {
+  return ajax({
+    urlType: "adAPI",
+    url: "/ad/index/brand",
+    method: "POST",
+    data,
+  });
+}
+
+/**
+ * 品牌top
+ * @props {string} dataType
+ * @return {AxjxPromise}
+ */
+export function ChannelTop(data) {
+  return ajax({
+    urlType: "adAPI",
+    url: "/ad/index/channel",
+    method: "POST",
+    data,
+  });
+}

src/views/AdvertisingEye/AdvertisingEye.vue

@@ -205,6 +205,11 @@ export default {
   margin: 10px 15px;
   background: #fff;
 }
+.AdvertisingEye .headStyle .cell,
+.AdvertisingEye .headStyle .cell * {
+    color: #000;
+    font-weight: 600;
+}
 .AdvertisingEye .el-card__body {
   padding: 0 0 20px 0;
 }

src/views/AdvertisingEye/components/allTrend.vue

@@ -255,17 +255,23 @@ export default {
         color: ["#1b9ade", "#fd5555"],
         tooltip: {
           trigger: "axis",
+          textStyle: {
+            color: "#000000",
+          },
+          backgroundColor: "rgba(255,255,255,.8)",
+          borderColor: "#1b9ade",
+          borderWidth: 1,
           formatter: m => {
             let out = "";
             for (let i = 0; i < m.length; i++) {
               const v = m[i];
               let time = (v.seriesName.split("到")[0] || "").split("-"),
-                day = v.dataIndex > 9 ? v.dataIndex : "0" + v.dataIndex,
+                day = v.dataIndex > 8 ? v.dataIndex +1 : "0" + (v.dataIndex + 1),
                 val = (v.value - 0)
                   .toFixed(2)
                   .replace(/(?=(\B)(\d{3})+\.)/g, ",");
               out += time[0] + "-" + time[1];
-              this.industryRang + 1 > 2 ? (out += "-" + day) : "";
+              this.industryRang + 1 <= 2 ? (out += "-" + day) : "";
               out += " " + val + this.hard_list[this.hard_act].unit + "<br />";
             }
             return out;
@@ -274,6 +280,7 @@ export default {
         grid: [{ left: 150, top: "10%", buttom: 0, right: 100 }],
         series: chartData.value.map((data, i) => {
           return {
+            showSymbol: false,
             name: chartData.lendata[i],
             data,
             type: "line",
@@ -306,6 +313,12 @@ export default {
         color: ["#1b9ade", "#fd5555"],
         tooltip: {
           trigger: "axis",
+          textStyle: {
+            color: "#000000",
+          },
+          backgroundColor: "rgba(255,255,255,.8)",
+          borderColor: "#1b9ade",
+          borderWidth: 1,
           formatter: m => {
             let out = "";
             for (let i = 0; i < m.length; i++) {
@@ -341,6 +354,7 @@ export default {
         grid: [{ left: 150, top: "10%", buttom: 0, right: 100 }],
         series: chartData.value.map((v, i) => {
           return {
+            showSymbol: false,
             name: chartData.lendata[i],
             data: v,
             type: "line",

src/views/AdvertisingEye/components/allTrendB.vue

@@ -65,8 +65,8 @@ export default {
         },
         {
           text: "费用",
-          proportionType: "fee",
-          unit: "万",
+          proportionType: "feiyong",
+          unit: "万元",
           type: 3,
         },
       ],
@@ -246,6 +246,12 @@ export default {
         },
         tooltip: {
           trigger: "axis",
+          textStyle: {
+            color: "#000000",
+          },
+          backgroundColor: "rgba(255,255,255,.8)",
+          borderColor: "#1b9ade",
+          borderWidth: 1,
           formatter: m => {
             let m0 = m[0] || {},
               m1 = m[1] || undefined;
@@ -260,6 +266,7 @@ export default {
         grid: [{ left: 150, top: "10%", buttom: 0, right: 100 }],
         series: chartData.value.map((data, i) => {
           return {
+            showSymbol: false,
             name: chartData.lendata[i],
             data,
             type: "line",
@@ -293,6 +300,12 @@ export default {
         color: ["#1b9ade", "#fd5555"],
         tooltip: {
           trigger: "axis",
+          textStyle: {
+            color: "#000000",
+          },
+          backgroundColor: "rgba(255,255,255,.8)",
+          borderColor: "#1b9ade",
+          borderWidth: 1,
           formatter: m => {
             let m0 = m[0] || {},
               m1 = m[1] || undefined;
@@ -316,6 +329,7 @@ export default {
         grid: [{ left: 150, top: "10%", buttom: 0, right: 100 }],
         series: chartData.value.map((v, i) => {
           return {
+            showSymbol: false,
             name: chartData.lendata[i],
             data: v,
             type: "line",

src/views/AdvertisingEye/components/distributionB.vue

@@ -77,7 +77,7 @@
                 </span>
               </template>
               <template #default="scope">
-                {{ numFor(scope.row.timeSize) }}
+                {{ numFor(scope.row.timeSize/1000) }}
               </template>
             </el-table-column>
             <el-table-column align="center" property="customer" label="">

src/views/AdvertisingEye/components/structure.vue

@@ -134,6 +134,7 @@ export default {
         ],
         tooltip: {
           trigger: "item",
+          formatter: '{b} {d}%'
         },
         series: [
           {

src/views/AdvertisingEye/components/structureB.vue

@@ -141,6 +141,7 @@ export default {
         ],
         tooltip: {
           trigger: "item",
+          formatter: '{b} {d}%'
         },
         series: li.map((v, i) => {
           let h = Math.floor(i / 2);

src/views/AdvertisingEye/components/tranche.vue

@@ -165,18 +165,7 @@ export default {
         ],
         tooltip: {
           trigger: "item",
-          formatter: obj => {
-            let v = obj.value || 0;
-            if (!isNaN(v)) v = v - 0;
-            return (
-              obj.seriesName +
-              "<br />" +
-              obj.name +
-              "<br />" +
-              v.toFixed(2) +
-              this.share_list[this.share_act].unit
-            );
-          },
+          formatter: '{b} {d}%'
         },
         legend: {
           left: "center",

src/views/HardAdvertisement/HardAdvertisement.vue

@@ -845,7 +845,7 @@ export default {
       if (isNaN(num)) return 0;
       if (num >= 100000000) return (num / 100000000).toFixed(2) - 0 + "亿";
       if (num >= 10000) return (num / 10000).toFixed(2) - 0 + "万";
-      return Number(num).toFixed(2);
+      return Number(num).toFixed(2) - 0;
     },
     launchChart(list) {
       if (!this.$refs.launch) return;
@@ -969,9 +969,8 @@ export default {
             let vb = this.numFor(s.value || 0),
               vn = this.numFor(e.value || 0),
               sele = this.launch_list[this.trend_act];
-            return `${sele.text} <br />${s.seriesName} ${s.name}时 ${vb +
-              (sele.unit || "")} <br />${e.seriesName || ""} ${s.name}时 ${vn +
-              (sele.unit || "")}`;
+            return `${sele.text} <br />${s.name}时 ${vb +
+              (sele.unit || "")} <br />${s.name}时 ${vn + (sele.unit || "")}`;
           },
         },
         yAxis: {
@@ -1071,6 +1070,7 @@ export default {
       var option = {
         tooltip: {
           trigger: "item",
+          formatter: "{b} {d}%",
         },
         legend: {
           left: "center",
@@ -1322,7 +1322,7 @@ export default {
   border-bottom: 1px solid rgb(128, 128, 128);
 }
 .hardAdvertisement .td {
-  padding: 12px 0;
+  padding: 12px 16px;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   text-overflow: ellipsis;