提交

src/views/AdvertisingEye/components/allTrendB.vue

@@ -187,14 +187,14 @@ export default {
         n[key] >= 0 && value[1].push(n[key]);
       }
       if (old && old.length) {
-        let sDate = old[0].name,
-          eDate = old[old.length - 1].name;
+        let sDate = old[0].startTime,
+          eDate = old[old.length - 1].startTime;
         if (sDate === eDate) lendata.push(sDate);
         else lendata.push(`${sDate}到${eDate}`);
       }
       if (now && now.length) {
-        let sDate = now[0].name,
-          eDate = now[now.length - 1].name;
+        let sDate = now[0].startTime,
+          eDate = now[now.length - 1].startTime;
         if (sDate === eDate) lendata.push(sDate);
         else lendata.push(`${sDate}到${eDate}`);
       }

src/views/AdvertisingEye/components/distribution.vue

@@ -74,7 +74,7 @@
                 </span>
               </template>
               <template #default="scope">
-                {{ numFor(scope.row.timeSize) }}
+                {{ numFor(scope.row.timeSize, 2) }}
               </template>
             </el-table-column>
             <el-table-column align="center" property="custom" label="">
@@ -257,11 +257,12 @@ export default {
 
       option && this.softAd_chart.setOption(option);
     },
-    numFor(num) {
+    numFor(num, i) {
       if (isNaN(num)) return 0;
-      if (num >= 100000000) return (num / 100000000).toFixed(2) - 0 + "亿";
-      if (num >= 10000) return (num / 10000).toFixed(2) - 0 + "万";
-      return num;
+      //   if (num >= 100000000) return (num / 100000000).toFixed(2) - 0 + "亿";
+      //   if (num >= 10000) return (num / 10000).toFixed(2) - 0 + "万";
+      if (i) return Number(num).toFixed(2);
+      return Number(num).toFixed(2) - 0;
     },
   },
   beforeUnmount: function() {

src/views/AdvertisingEye/components/focus.vue

@@ -19,7 +19,7 @@
     <el-row>
       <el-col :span="12">
         <com-table
-          title="硬广-广告主投放top10"
+          title="软广-广告主投放top10"
           :child="true"
           :tableList="hardMarster"
         >

src/views/AdvertisingEye/components/focusB.vue

@@ -19,7 +19,7 @@
     <el-row>
       <el-col :span="12">
         <com-table
-          title="硬广-品牌投放Top10"
+          title="软广-品牌投放Top10"
           v-if="softBrand && softBrand.length"
           :tableList="softBrand"
           :child="true"
@@ -125,6 +125,16 @@
               label="序号"
               width="50"
             />
+            <el-table-column
+              show-overflow-tooltip
+              align="center"
+              property="brand"
+              label="品牌名称"
+            >
+              <template #default="scope">
+                {{ scope.row.brand || '--' }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" property="timeSize">
               <template #header>
                 <span
@@ -139,16 +149,6 @@
                 {{ numFor(scope.row.timeSize) }}
               </template>
             </el-table-column>
-            <el-table-column
-              show-overflow-tooltip
-              align="center"
-              property="brand"
-              label="品牌名称"
-            >
-              <template #default="scope">
-                {{ scope.row.brand || '--' }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" property="pinci">
               <template #header>
                 <span

src/views/AdvertisingEye/components/tranche.vue

@@ -116,6 +116,8 @@ export default {
             k[v.name] = barGroup.length;
             barGroup.push([]);
           }
+          if (i < 2) v.type = "y";
+          else v.type = "r";
           barGroup[k[v.name]].push(v);
         }
         this.share1Chart(barGroup);
@@ -166,12 +168,12 @@ export default {
           },
           {
             text: "软广",
-            left: '73%',
+            left: "73%",
             top: 50,
           },
           {
             text: "硬广",
-            left: '23%',
+            left: "23%",
             top: 50,
           },
         ],
@@ -190,7 +192,18 @@ export default {
           left: "center",
           bottom: 10,
         },
-        color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#20B2AA'],
+        color: [
+          "#5470c6",
+          "#91cc75",
+          "#fac858",
+          "#ee6666",
+          "#73c0de",
+          "#3ba272",
+          "#fc8452",
+          "#9a60b4",
+          "#ea7ccc",
+          "#20B2AA",
+        ],
         series: list.map((v, i) => {
           return {
             name: i === 0 ? "硬广" : "软广",
@@ -252,13 +265,14 @@ export default {
           label: {
             show: true,
             formatter: item => {
+              if (item.value === 0) return "";
               return item.value + "%";
             },
           },
           emphasis: {
             focus: "series",
           },
-          data: v.map(o => ((o[k] || 0) * 100).toFixed(2) - 0),
+          data: v.reverse().map(o => ((o[k] || 0) * 100).toFixed(2) - 0),
         };
       });
       if (t > -1 && k === "fee") {
@@ -271,16 +285,15 @@ export default {
           },
           label: {
             show: true,
-            formatter: item => {
-              if (t !== -1 && item.dataIndex === t) {
-                return t === 0 ? "硬广无刊例价" : "软广无刊例价";
-              }
+            formatter: () => {
+              if (t === 0) return "硬广无刊例价";
+              if (t === 1) return "软广无刊例价";
             },
           },
-          data: t === 1 ? [0, 100] : [100, 0],
+          data: t === 0 ? [0, 100] : [100, 0],
         });
       }
-
+    console.log(li)
       var option = {
         tooltip: {
           trigger: "item",
@@ -311,13 +324,13 @@ export default {
           type: "value",
           axisLabel: {
             formatter: item => {
-              return item + "%"
+              return item + "%";
             },
           },
         },
         yAxis: {
           type: "category",
-          data: ["硬广", "软广"],
+          data: ["软广", "硬广"],
         },
         series: li,
       };

src/views/AdvertisingEye/components/trancheB.vue

@@ -89,12 +89,12 @@ export default {
       }).then(res => {
         let li = (res || { data: [] }).data || [];
         let y = [
-            ((li[1].hardY || 0) - 0).toFixed(2) - 0,
             ((li[0].softY || 0) - 0).toFixed(2) - 0,
+            ((li[1].hardY || 0) - 0).toFixed(2) - 0,
           ],
           w = [
-            ((li[1].hardW || 0) - 0).toFixed(2) - 0,
             ((li[0].softW || 0) - 0).toFixed(2) - 0,
+            ((li[1].hardW || 0) - 0).toFixed(2) - 0,
           ],
           t = -1;
         if (y[0] + w[0] === 0) t = 0;
@@ -107,6 +107,7 @@ export default {
             label: {
               show: true,
               formatter: item => {
+                if(item.value === 0 ) return "";
                 return item.value + "%";
               },
             },
@@ -122,6 +123,7 @@ export default {
             label: {
               show: true,
               formatter: item => {
+                if(item.value === 0 ) return "";
                 return item.value + "%";
               },
             },
@@ -145,9 +147,9 @@ export default {
             label: {
               show: true,
               formatter: item => {
-                if (t !== -1 && item.dataIndex === t) {
-                  return t === 0 ? "硬广无刊例价" : "软广无刊例价";
-                }
+                if(item.value === 0 ) return "";
+                if (t === 0) return "硬广无刊例价";
+                if (t === 1) return "软广无刊例价";
               },
             },
             data: t === 0 ? [100, 0] : [0, 100],
@@ -200,13 +202,13 @@ export default {
           type: "value",
           axisLabel: {
             formatter: item => {
-              return item + "%"
+              return item + "%";
             },
           },
         },
         yAxis: {
           type: "category",
-          data: ["硬广", "软广"],
+          data: ["软广", "硬广"],
         },
         series: list,
       };

src/views/HardAdvertisement/HardAdvertisement.vue

@@ -135,7 +135,7 @@
             <el-table
               :data="proportionData"
               header-row-class-name="headStyle"
-               row-class-name="darkRow"
+              row-class-name="darkRow"
               border
               style="width: 100%"
               align="center"
@@ -863,19 +863,17 @@ export default {
           borderColor: "#1b9ade",
           borderWidth: 1,
           formatter: item => {
-            let s = item[0] || {},
-              e = item[1] || {};
+            let s = item[0] && item[0].color === "#1b9ade" ? item[0] || {} : item[1] || {},
+              e = item[0] && item[0].color === "#1b9ade" ? item[1] || {} : item[0] || {};
             let bf = list.before || [],
               no = list.now || [];
             let vb = this.numFor(s.value || 0),
               vn = this.numFor(e.value || 0),
               launch_list = this.launch_list[this.launch_act] || {};
-            let out = "";
+            let out = `${launch_list.text}`;
             if (s.dataIndex >= 0) {
               let dt = bf[s.dataIndex] ? bf[s.dataIndex].dt : "";
-              out += `${
-                launch_list.text
-              } <br /> <div style='display:inline-block;width: 10px;height: 10px;border-radius: 50%;background: #1b9ade' ></div> ${dt}： ${vb +
+              out += ` <br /> <div style='display:inline-block;width: 10px;height: 10px;border-radius: 50%;background: #1b9ade' ></div> ${dt}： ${vb +
                 launch_list.unit}`;
             }
             if (e.dataIndex >= 0) {
@@ -933,8 +931,8 @@ export default {
         xAxis: {
           type: "category",
           data: chartData.keys,
-          axisLabel:{
-              rotate: 30, // 旋转30度
+          axisLabel: {
+            rotate: 30, // 旋转30度
           },
           nameTextStyle: {
             align: "right",
@@ -999,8 +997,8 @@ export default {
         xAxis: {
           type: "category",
           data: chartData.keys,
-          axisLabel:{
-              rotate: 30, // 旋转30度
+          axisLabel: {
+            rotate: 30, // 旋转30度
           },
         },
         tooltip: {
@@ -1010,7 +1008,7 @@ export default {
           },
           formatter: item => {
             let key = item.name + ": ";
-            return key + item.value.toFixed(2) - 0 + "%";
+            return key + (item.value.toFixed(2) - 0) + "%";
           },
         },
         yAxis: {