提交

src/views/AdvertisingEye/AdvertisingEye.vue

@@ -313,4 +313,8 @@ export default {
     color: #1989fa;
     border-color: #1989fa;
 }
+
+.AdvertisingEye .darkRow:nth-child(odd) {
+  background-color: #f3f3f3;
+}
 </style>

src/views/AdvertisingEye/components/allTrend.vue

@@ -189,7 +189,8 @@ export default {
       for (let i = 0; i < len; i++) {
         let o = old[i] || {},
           n = now[i] || {};
-        keys.push(n.name ? n.name : o.name);
+        if (old.length > now.length) keys.push(o.name);
+        else keys.push(n.name);
         o.dt && realKey[0].push(o.dt);
         n.dt && realKey[1].push(n.dt);
         o[key] >= 0 && value[0].push(o[key]);
@@ -234,14 +235,14 @@ export default {
       let c = ["#1b9ade", "#fd5555"];
       var option = {
         title: {
-            text: "硬广趋势",
-            top: 20,
-            left: 50
+          text: "硬广趋势",
+          top: 20,
+          left: 50,
         },
         legend: {
           show: true,
           data: chartData.lendata,
-          top:"10%"
+          top: "10%",
         },
         xAxis: {
           type: "category",
@@ -300,7 +301,7 @@ export default {
           };
         }),
       };
-      console.log(option)
+      console.log(option);
       option && hard_chart.setOption(option);
     },
     trendChart(list) {
@@ -317,14 +318,14 @@ export default {
       let c = ["#1b9ade", "#fd5555"];
       var option = {
         title: {
-            text: "软广趋势",
-            top: 20,
-            left: 50
+          text: "软广趋势",
+          top: 20,
+          left: 50,
         },
         legend: {
           show: true,
           data: chartData.lendata,
-          top:"10%"
+          top: "10%",
         },
         xAxis: {
           type: "category",

src/views/AdvertisingEye/components/allTrendB.vue

@@ -179,7 +179,8 @@ export default {
       for (let i = 0; i < len; i++) {
         let o = old[i] || {},
           n = now[i] || {};
-        keys.push(n.startTime ? n.startTime : o.startTime);
+        if (old.length > now.length) keys.push(o.startTime);
+        else keys.push(n.startTime);
         o.dt && realKey[0].push(o.dt);
         n.dt && realKey[1].push(n.dt);
         o[key] >= 0 && value[0].push(o[key]);

src/views/AdvertisingEye/components/distribution.vue

@@ -43,6 +43,7 @@
               align="center"
               property="name"
               label="栏目主名称"
+              width="180"
             />
             <el-table-column align="center" property="pinci">
               <template #header>
@@ -275,7 +276,7 @@ export default {
 
 <style scoped>
 .customer_list {
-  width: 500px;
+  width: 600px;
   margin: 30px auto;
   border: 1px solid #d2e7fc;
   border-top: 3px solid #40a1f3;

src/views/AdvertisingEye/components/distributionB.vue

@@ -43,6 +43,7 @@
               align="center"
               property="programName"
               label="栏目名称"
+              width="180"
             >
               <template #default="scope">
                 {{ scope.row.programName || "--" }}
@@ -282,7 +283,7 @@ export default {
 
 <style scoped>
 .customer_list {
-  width: 500px;
+  width: 600px;
   margin: 30px auto;
   border: 1px solid #d2e7fc;
   border-top: 3px solid #40a1f3;

src/views/AdvertisingEye/components/focus.vue

@@ -35,6 +35,7 @@
               align="center"
               property="name"
               label="栏目主名称"
+              width="160"
             />
             <el-table-column align="center" property="pinci">
               <template #header>
@@ -303,6 +304,7 @@
               align="center"
               property="name"
               label="栏目主名称"
+              width="180"
             />
             <el-table-column align="center" property="timeSize">
               <template #header>

src/views/AdvertisingEye/components/table.vue

@@ -5,6 +5,7 @@
       ref="singleTableRef"
       :data="tableList"
       header-row-class-name="headStyle"
+      row-class-name="darkRow"
       highlight-current-row
       style="width: 100%"
     >
@@ -56,7 +57,7 @@ export default {
 
 <style scoped>
 .customer_list {
-  width: 500px;
+  width: 600px;
   margin: 30px auto;
   border: 1px solid #d2e7fc;
   border-top: 3px solid #40a1f3;

src/views/AdvertisingEye/components/tranche.vue

@@ -164,6 +164,16 @@ export default {
             top: 10,
             left: 50,
           },
+          {
+            text: "软广",
+            left: '73%',
+            top: 50,
+          },
+          {
+            text: "硬广",
+            left: '23%',
+            top: 50,
+          },
         ],
         tooltip: {
           trigger: "item",

src/views/HardAdvertisement/HardAdvertisement.vue

@@ -135,6 +135,7 @@
             <el-table
               :data="proportionData"
               header-row-class-name="headStyle"
+               row-class-name="darkRow"
               border
               style="width: 100%"
               align="center"
@@ -747,7 +748,7 @@ export default {
       for (let i = 0; i < len; i++) {
         let o = old[i] || {},
           n = now[i] || {},
-          realItem = o.dt ? o : n;
+          realItem = n.dt ? n : o;
         if (keyName === "launch") keys.push(this.getDate(realItem.dt, i));
         if (keyName === "trend") {
           let eT = Number(realItem.hour) + 1;
@@ -1009,7 +1010,7 @@ export default {
           },
           formatter: item => {
             let key = item.name + ": ";
-            return key + item.value.toFixed(2) + "%";
+            return key + item.value.toFixed(2) - 0 + "%";
           },
         },
         yAxis: {
@@ -1243,7 +1244,7 @@ export default {
   font-size: 18px;
   padding-left: 12px;
 }
-.hardAdvertisement .darkRow:nth-child(even) {
+.hardAdvertisement .darkRow:nth-child(odd) {
   background-color: #f3f3f3;
 }
 .hardAdvertisement .customer_list {