提交

src/views/report/Advertisement/Charts.js

@@ -151,10 +151,12 @@ export function advertisementFeeInit(ele, list) {
         let t1 = list.F[a[1].dataIndex] || undefined;
         if (!t) return "";
         return (
+          t.date +
           t.t +
           ": " +
           (t.value.toFixed(2) - 0 + "%") +
           "<br/>" +
+          t.date +
           t1.t +
           ": " +
           (t1.value.toFixed(2) - 0 + "%")
@@ -176,6 +178,10 @@ export function advertisementFeeInit(ele, list) {
       type: "category",
       boundaryGap: false,
       data: keys.map(v => v.date),
+      axisLabel: {
+        interval: 0,
+        rotate: 20,
+      },
     },
     yAxis: {
       type: "value",
@@ -193,14 +199,32 @@ export function advertisementFeeInit(ele, list) {
         name: list.F[0].type,
         type: "line",
         stack: "Total",
-        showSymbol: false,
+        showSymbol: true,
+        label: {
+          show: true,
+          position: "top",
+          color: "#333",
+          fontSize: "12px",
+          formatter: params => {
+            return params.value.toFixed(2) - 0 + "%";
+          },
+        },
         data: list.F.map(v => v.value),
       },
       {
         name: list.L[0].type,
         type: "line",
         stack: "Total",
-        showSymbol: false,
+        showSymbol: true,
+        label: {
+          show: true,
+          position: "bottom",
+          color: "#333",
+          fontSize: "12px",
+          formatter: params => {
+            return params.value.toFixed(2) - 0 + "%";
+          },
+        },
         data: list.L.map(v => v.value),
       },
     ],

src/views/report/Advertisement/index.vue

@@ -45,21 +45,25 @@
           <h4 class="xifenxinxiTitle">
             <div class="right"></div>
             <div class="left">
-              电视: <span v-text="orgin.day_hb.name"> </span>
+              <span v-text="orgin.day_hb.name"> </span>
             </div>
           </h4>
           <br />
           <div ref="adRingRatioCanvas"></div>
           <p
-            style="text-indent: 2em; margin-top: 0.5em; padding: 0 3px"
-            v-text="orgin.day_hb.desc"
+            :style="
+              'text-indent: 2em; font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              fontSize +
+              'px;'
+            "
+            v-html="orgin.day_hb.desc"
           ></p>
         </div>
         <div class="card">
           <h4 class="xifenxinxiTitle">
             <div class="right"></div>
             <div class="left">
-              电视: <span v-text="orgin.brand_top.name"> </span>
+              <span v-text="orgin.brand_top.name"> </span>
             </div>
           </h4>
           <br />
@@ -106,15 +110,19 @@
             </van-row>
           </div>
           <p
-            style="text-indent: 2em; margin-top: 0.5em; padding: 0 3px"
-            v-text="orgin.brand_top.desc"
+            :style="
+              'text-indent: 2em; font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              fontSize +
+              'px;'
+            "
+            v-html="orgin.brand_top.desc"
           ></p>
         </div>
         <div class="card">
           <h4 class="xifenxinxiTitle">
             <div class="right"></div>
             <div class="left">
-              电视: <span v-text="orgin.brand_hb.name"> </span>
+              <span v-text="orgin.brand_hb.name"> </span>
             </div>
           </h4>
           <br />
@@ -122,15 +130,18 @@
             <div ref="adTop10Canvas"></div>
           </div>
           <p
-            style="text-indent: 2em; margin-top: 0.5em; padding: 0 3px"
-            v-text="orgin.brand_hb.desc"
+            :style="
+              'text-indent: 2em; font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              fontSize +
+              'px;'
+            "
+            v-html="orgin.brand_hb.desc"
           ></p>
         </div>
         <div class="card">
           <h4 class="xifenxinxiTitle">
             <div class="right"></div>
             <div class="left">
-              电视：
               <span v-text="orgin.month_thb.name"> </span>
             </div>
           </h4>
@@ -139,8 +150,12 @@
             <div ref="adFeeCanvas"></div>
           </div>
           <p
-            style="text-indent: 2em; margin-top: 0.5em; padding: 0 3px"
-            v-text="orgin.month_thb.desc"
+            :style="
+              'text-indent: 2em; font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              fontSize +
+              'px;'
+            "
+            v-html="orgin.month_thb.desc"
           ></p>
         </div>
         <div class="bottom">

src/views/report/Traditional/index.vue

@@ -10,11 +10,11 @@
     <p
       class="content"
       :style="
-        'text-indent: 2em; font-weight: 600; padding: 0.5em 3px;font-size: ' +
-        fontSize*1.2 +
+        'text-indent: 2em; font-weight: 700; padding: 0.5em 3px;font-size: ' +
+        fontSize +
         'px;'
       "
-      v-text="title.desc"
+      v-html="title.desc"
     ></p>
     <div :style="'height: ' + fontSize + 'px;'"></div>
     <div class="tv-list" :style="'font-size:' + fontSize + 'px'">
@@ -59,7 +59,7 @@
             </van-col>
             <van-col span="2" class="td">
               <img
-                src="../../../assets/image/shou.gif"
+                src="../../../assets/image/shou.png"
                 width="26px"
                 alt=""
                 style="vertical-align: middle"
@@ -135,7 +135,7 @@
             </van-cell>
             <van-cell-group title="视听收视新指标">
               <van-row>
-                <van-col span="10" class="td" style="text-align: right;"> 收视时长： </van-col>
+                <van-col span="10" class="td" style="text-align: right;"> 收视总时长： </van-col>
                 <van-col span="14" class="td">
                   <counto
                     :startVal="0"
@@ -148,7 +148,7 @@
                     ratios.timecountWei
                   }}
                 </van-col>
-                <van-col span="10" class="td" style="text-align: right;"> 收视次数： </van-col>
+                <van-col span="10" class="td" style="text-align: right;"> 收视总次数： </van-col>
                 <van-col span="14" class="td">
                   <counto
                     :startVal="0"
@@ -420,7 +420,7 @@ export default {
           data: key,
         },
         grid: {
-          right: "35px",
+          right: "25px",
           left: "40px",
         },
         yAxis: {
@@ -571,6 +571,7 @@ export default {
 <style>
 .van-cell-group__title {
   font-size: 1.1rem;
+  padding-left: 8px;
   color: #000;
   font-weight: 600;
 }