提交

src/views/AdvertisingEye/components/allTrend.vue

@@ -189,7 +189,7 @@ export default {
       for (let i = 0; i < len; i++) {
         let o = old[i] || {},
           n = now[i] || {};
-        keys.push(n.name ? n.name : o.name)
+        keys.push(n.name ? n.name : o.name);
         o.dt && realKey[0].push(o.dt);
         n.dt && realKey[1].push(n.dt);
         o[key] >= 0 && value[0].push(o[key]);
@@ -264,13 +264,13 @@ export default {
             for (let i = 0; i < m.length; i++) {
               const v = m[i];
               let time = (v.seriesName.split("到")[0] || "").split("-"),
-                day = v.dataIndex > 8 ? v.dataIndex +1 : "0" + (v.dataIndex + 1),
-                val = (v.value - 0)
-                  .toFixed(2)
-                  .replace(/(?=(\B)(\d{3})+\.)/g, ",");
+                day =
+                  v.dataIndex > 8 ? v.dataIndex + 1 : "0" + (v.dataIndex + 1),
+                val = (v.value - 0).toFixed(2) - 0;
               out += time[0] + "-" + time[1];
               this.industryRang + 1 <= 2 ? (out += "-" + day) : "";
-              out += " " + val + this.hard_list[this.hard_act].unit + "<br />";
+              out +=
+                "： " + val + this.hard_list[this.hard_act].unit + "<br />";
             }
             return out;
           },
@@ -322,20 +322,13 @@ export default {
             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,
-                val = (v.value - 0)
-                  .toFixed(2)
-                  .replace(/(?=(\B)(\d{3})+\.)/g, ",");
+                day =
+                  v.dataIndex > 8 ? v.dataIndex + 1 : "0" + (v.dataIndex + 1),
+                val = (v.value - 0).toFixed(2) - 0;
+              out += time[0] + "-" + time[1];
+              this.industryRang + 1 <= 2 ? (out += "-" + day) : "";
               out +=
-                time[0] +
-                "-" +
-                time[1] +
-                "-" +
-                day +
-                " " +
-                val +
-                this.hard_list[this.hard_act].unit +
-                "<br />";
+                "： " + val + this.soft_list[this.soft_act].unit + "<br />";
             }
             return out;
           },

src/views/AdvertisingEye/components/allTrendB.vue

@@ -255,9 +255,13 @@ export default {
               m1 = m[1] || undefined;
             let tnow = list.now[m0.dataIndex] || {},
               tbefore = list.before[m0.dataIndex] || {};
-            let out = `${tbefore.startTime || ""} ${m0.value || 0}${unit}`;
+            let out = `${tbefore.startTime || ""}： ${
+              m0.value ? m0.value - 0 : 0
+            }${unit}`;
             m1 &&
-              (out += ` <br />${tnow.startTime || ""} ${m1.value || 0}${unit}`);
+              (out += ` <br />${tnow.startTime || ""}： ${
+                m1.value ? m1.value - 0 : 0
+              }${unit}`);
             return out;
           },
         },
@@ -309,9 +313,13 @@ export default {
               m1 = m[1] || undefined;
             let tnow = list.now[m0.dataIndex] || {},
               tbefore = list.before[m0.dataIndex] || {};
-            let out = `${tbefore.startTime || ""} ${m0.value || 0}${unit}`;
+            let out = `${tbefore.startTime || ""}： ${
+              m0.value ? m0.value - 0 : 0
+            }${unit}`;
             m1 &&
-              (out += ` <br />${tnow.startTime || ""} ${m1.value || 0}${unit}`);
+              (out += ` <br />${tnow.startTime || ""}： ${
+                m1.value ? m1.value - 0 : 0
+              }${unit}`);
             return out;
           },
         },

src/views/HardAdvertisement/HardAdvertisement.vue

@@ -151,40 +151,25 @@
                 prop="industry"
                 label="大行业名称"
               />
-                      <!-- 逗号 .replace(/(?=(\B)(\d{3})+\.)/g, ",") -->
+              <!-- 逗号 .replace(/(?=(\B)(\d{3})+\.)/g, ",") -->
               <el-table-column align="center" label="费用（万元）">
                 <template #default="scope">
-                  <span>{{
-                    (scope.row.fee / 10000)
-                      .toFixed(2)
-                  }}</span>
+                  <span>{{ (scope.row.fee / 10000).toFixed(2) }}</span>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="时长（秒）">
                 <template #default="scope">
-                  <span>{{
-                    (scope.row.timeSize / 1000)
-                      .toFixed(2)
-                      
-                  }}</span>
+                  <span>{{ (scope.row.timeSize / 1000).toFixed(2) }}</span>
                 </template>
               </el-table-column>
               <el-table-column align="center" prop="pinci" label="频次（次）">
                 <template #default="scope">
-                  <span>{{
-                    scope.row.pinci
-                      .toFixed(0)
-                      
-                  }}</span>
+                  <span>{{ scope.row.pinci.toFixed(0) }}</span>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="品牌数（个）">
                 <template #default="scope">
-                  <span>{{
-                    scope.row.customer
-                      .toFixed(0)
-                      
-                  }}</span>
+                  <span>{{ scope.row.customer.toFixed(0) }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -241,32 +226,20 @@
                           v-if="
                             customer_list[customer_act].customerType === 'fee'
                           "
-                          >{{
-                            (item.fee / 10000)
-                              .toFixed(2)
-                              
-                          }}</span
+                          >{{ (item.fee / 10000).toFixed(2) }}</span
                         >
                         <span
                           v-if="
                             customer_list[customer_act].customerType ===
                               'timeSize'
                           "
-                          >{{
-                            (item.timeSize / 1000)
-                              .toFixed(2)
-                              
-                          }}</span
+                          >{{ (item.timeSize / 1000).toFixed(2) }}</span
                         >
                         <span
                           v-if="
                             customer_list[customer_act].customerType === 'pinci'
                           "
-                          >{{
-                            item.pinci
-                              .toString()
-                              
-                          }}</span
+                          >{{ item.pinci.toString() }}</span
                         >
                       </td>
                     </tr>
@@ -310,32 +283,20 @@
                           v-if="
                             customer_list[customer_act].customerType === 'fee'
                           "
-                          >{{
-                            (item.fee / 10000)
-                              .toFixed(2)
-                              
-                          }}</span
+                          >{{ (item.fee / 10000).toFixed(2) }}</span
                         >
                         <span
                           v-if="
                             customer_list[customer_act].customerType ===
                               'timeSize'
                           "
-                          >{{
-                            (item.timeSize / 1000)
-                              .toFixed(2)
-                              
-                          }}</span
+                          >{{ (item.timeSize / 1000).toFixed(2) }}</span
                         >
                         <span
                           v-if="
                             customer_list[customer_act].customerType === 'pinci'
                           "
-                          >{{
-                            item.pinci
-                              .toString()
-                              
-                          }}</span
+                          >{{ item.pinci.toString() }}</span
                         >
                       </td>
                     </tr>
@@ -387,11 +348,7 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                (scope.row.fee / 10000)
-                  .toFixed(2)
-                  
-              }}</span>
+              <span>{{ (scope.row.fee / 10000).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="timeSize">
@@ -403,11 +360,7 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                (scope.row.timeSize / 1000)
-                  .toFixed(2)
-                  
-              }}</span>
+              <span>{{ (scope.row.timeSize / 1000).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="pinci">
@@ -419,9 +372,7 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                scope.row.pinci.toFixed(0)
-              }}</span>
+              <span>{{ scope.row.pinci.toFixed(0) }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -464,11 +415,7 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                (scope.row.fee / 10000)
-                  .toFixed(2)
-                  
-              }}</span>
+              <span>{{ (scope.row.fee / 10000).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="timeSize">
@@ -480,11 +427,7 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                (scope.row.timeSize / 1000)
-                  .toFixed(2)
-                  
-              }}</span>
+              <span>{{ (scope.row.timeSize / 1000).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="pinci">
@@ -496,18 +439,12 @@
               ></down>
             </template>
             <template #default="scope">
-              <span>{{
-                scope.row.pinci.toFixed(0)
-              }}</span>
+              <span>{{ scope.row.pinci.toFixed(0) }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="投放频道数">
             <template #default="scope">
-              <span>{{
-                scope.row.customer
-                  .toFixed(0)
-                  
-              }}</span>
+              <span>{{ scope.row.customer.toFixed(0) }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -789,12 +726,13 @@ export default {
       });
     },
     getDate(date, i) {
-        const org = new Date(date);
+      const org = new Date(date);
       const d = new Date(org + i * 86400000);
-      let m = d.getMonth()+1,day =d.getDate();
-      m > 9 ? '' : m ="0" + m;
-      day > 9 ? '' : day ="0" + day;
-      return [d.getFullYear(), m, day].join("-")
+      let m = d.getMonth() + 1,
+        day = d.getDate();
+      m > 9 ? "" : (m = "0" + m);
+      day > 9 ? "" : (day = "0" + day);
+      return [d.getFullYear(), m, day].join("-");
     },
     launchtrendData(list = { before: [], now: [] }, keyName) {
       const org = list;
@@ -811,7 +749,10 @@ export default {
           n = now[i] || {},
           realItem = o.dt ? o : n;
         if (keyName === "launch") keys.push(this.getDate(realItem.dt, i));
-        if (keyName === "trend") keys.push(realItem.hour);
+        if (keyName === "trend") {
+            let eT = Number(realItem.hour) + 1;
+            keys.push(realItem.hour + "时~" + eT + '时');
+        }
         o.dt && realKey[0].push(o.dt);
         n.dt && realKey[1].push(n.dt);
         o[key] >= 0 &&
@@ -819,16 +760,24 @@ export default {
         n[key] >= 0 &&
           value[1].push(key === "timeSize" ? n[key] / 60000 : n[key]);
       }
-      
+
       if (old && old.length) {
         if (old[0].dts && old[0].dts === old[old.length - 1].dte)
           lendata.push(`${old[0].dt}`);
-        else lendata.push(`${old[0].dts || old[0].dt}到${old[old.length - 1].dte || old[old.length - 1].dt}`);
+        else
+          lendata.push(
+            `${old[0].dts || old[0].dt}到${old[old.length - 1].dte ||
+              old[old.length - 1].dt}`
+          );
       }
       if (now && now.length) {
         if (now[0].dts && now[0].dts === now[now.length - 1].dte)
           lendata.push(`${now[0].dt}`);
-        else lendata.push(`${now[0].dts || now[0].dt}到${now[now.length - 1].dte || now[now.length - 1].dt}`);
+        else
+          lendata.push(
+            `${now[0].dts || now[0].dt}到${now[now.length - 1].dte ||
+              now[now.length - 1].dt}`
+          );
       }
       return {
         keys,
@@ -886,11 +835,7 @@ export default {
         },
         yAxis: {
           type: "value",
-          name:
-            this.launch_list[this.launch_act].text +
-            "(" +
-            this.launch_list[this.launch_act].unit +
-            ")",
+          name: "单位：" + this.launch_list[this.launch_act].unit,
           scale: true,
           axisLabel: {
             formatter: arr => {
@@ -918,12 +863,12 @@ export default {
             let out = "";
             if (s.dataIndex >= 0) {
               let dt = no[s.dataIndex] ? no[s.dataIndex].dt : "";
-              out += `${launch_list.text} <br /> ${dt} ${vb +
+              out += `${launch_list.text} <br /> ${dt}： ${vb +
                 launch_list.unit}`;
             }
             if (e.dataIndex >= 0) {
               let dt = bf[e.dataIndex] ? bf[e.dataIndex].dt : "";
-              out += `<br />${dt} ${vn + launch_list.unit}`;
+              out += `<br />${dt}： ${vn + launch_list.unit}`;
             }
             return out;
           },
@@ -974,6 +919,9 @@ export default {
         xAxis: {
           type: "category",
           data: chartData.keys,
+          nameTextStyle: {
+            align: "right",
+          },
         },
         tooltip: {
           trigger: "axis",
@@ -989,12 +937,17 @@ 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.name}时 ${vb +
-              (sele.unit || "")} <br />${s.name}时 ${vn + (sele.unit || "")}`;
+            let sTime = s.name,
+              eTime = s.name - 0 + 1;
+            eTime > 9 ? "" : (eTime = ["0", eTime].join(""));
+            return `${sele.text} <br />${sTime}时~${eTime}时： ${vb +
+              (sele.unit || "")} <br />${sTime}时~${eTime}时： ${vn +
+              (sele.unit || "")}`;
           },
         },
         yAxis: {
           type: "value",
+          name: "单位：" + this.launch_list[this.trend_act].unit,
           scale: true,
           axisLabel: {
             formatter: arr => {
@@ -1003,7 +956,7 @@ export default {
           },
         },
         color: ["#1b9ade", "#fd5555"],
-        grid: [{ left: 150, top: "10%", buttom: 0, right: 100 }],
+        grid: [{ left: 100, top: "10%", buttom: 0, right: 100 }],
         series: chartData.value.map((v, i) => {
           return {
             name: chartData.lendata[i],
@@ -1047,6 +1000,7 @@ export default {
         },
         yAxis: {
           type: "value",
+          name: "单位：%",
           scale: true,
           axisLabel: {
             formatter: arr => {
@@ -1307,8 +1261,8 @@ export default {
 .hardAdvertisement .cell {
   color: #000;
 }
-.hardAdvertisement .headStyle .cell{
-    font-weight: 600
+.hardAdvertisement .headStyle .cell {
+  font-weight: 600;
 }
 .hardAdvertisement .titleHead {
   text-align: center;