提交

src/views/report/Advertisement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="font-size: 0; background-color: #fff">
-    <div class="Advertisement" style="padding: 0;">
+    <div class="Advertisement" style="padding: 0">
       <img
         class="item"
         :src="
@@ -56,7 +56,7 @@
           <div ref="adRingRatioCanvas"></div>
           <p
             :style="
-              ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              ' font-weight: 700; word-break: normal;text-align: justify;padding: 0.5em 3px;font-size: ' +
               fontSize +
               'px;'
             "
@@ -115,7 +115,7 @@
           </div>
           <p
             :style="
-              ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              ' font-weight: 700;word-break: normal;text-align: justify; padding: 0.5em 3px;font-size: ' +
               fontSize +
               'px;'
             "
@@ -135,7 +135,7 @@
           </div>
           <p
             :style="
-              ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              ' font-weight: 700; word-break: normal;text-align: justify;padding: 0.5em 3px;font-size: ' +
               fontSize +
               'px;'
             "
@@ -155,7 +155,7 @@
           </div>
           <p
             :style="
-              ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              ' font-weight: 700; word-break: normal;text-align: justify;padding: 0.5em 3px;font-size: ' +
               fontSize +
               'px;'
             "
@@ -350,6 +350,10 @@ export default {
   padding: 0px 5px 12px 5px;
   background-color: #fff;
 }
+.Advertisement .article {
+  word-break: normal;
+  text-align: justify;
+}
 .Advertisement .item {
   max-width: 677px;
   margin: 0 auto;
@@ -360,7 +364,7 @@ export default {
   font-weight: 700;
 }
 .Advertisement .title {
-  background-color:  #d11e16;
+  background-color: #d11e16;
   width: 196px;
   margin: 0 auto;
 }

src/views/report/Mobile/index.vue

@@ -15,7 +15,7 @@
       <p
         class="content"
         :style="
-          ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+          ' font-weight: 700; padding: 0.5em 3px;word-break: normal;text-align: justify;font-size: ' +
           fontSize * 1.1 +
           'px;'
         "
@@ -24,155 +24,168 @@
     </div>
     <div class="tv-list" :style="'font-size:' + fontSize + 'px'">
       <div class="content">
-        <van-cell-group border title="部门排行">
-          <div class="itemHead">
-            <van-row>
-              <van-col span="3" class="td"> 排名 </van-col>
-              <van-col span="7" class="td"> 部门 </van-col>
-              <van-col span="7" class="td"> 传播量(次) </van-col>
-              <!-- td2 :style="width > 667 ? 'line-height: 2.5em' : 'line-height: 1.5em'" -->
-              <van-col span="5" class="td"> 发稿量(条) </van-col>
-              <van-col span="2" class="td">
-                <div style="width: 35px; height: 35px; overflow: hidden">
-                  <img
-                    src="../../../assets/image/shou.gif"
-                    width="30px"
-                    alt=""
-                    style="vertical-align: middle; transform: rotate(45deg)"
-                  />
-                </div>
-              </van-col>
-            </van-row>
-          </div>
-          <div v-for="(v, o) in dep || []" :key="v.name">
-            <div
-              style="border-bottom: 1px dashed #eee; margin: 11px 0 0 0"
-              v-if="o === 20"
-            ></div>
-            <van-row class="item" @click="() => showPopup(o)">
-              <van-col
-                span="3"
-                :class="{ td: true }"
-                :style="{ color: color[o] || '#000', fontWeight: 600 }"
-              >
-                {{ o + 1 }}
-              </van-col>
-              <van-col span="7" :class="{ td: true }">
-                {{ v.name }}
-              </van-col>
-              <van-col span="7" :class="{ td: true }">
-                {{ timeFormat(v.read_count) }}
-                <van-icon
-                  v-if="v.read_change !== '相等'"
-                  name="down"
-                  :color="v.read_change === '上涨' ? '#f00' : '#04c15f'"
-                  :class="{ rise: v.read_change === '上涨' }"
-                />
-              </van-col>
-              <van-col span="5" :class="{ td: true }">
-                {{ timeFormat(v.publish_count) }}
-                <van-icon
-                  v-if="v.publish_change !== '相等'"
-                  name="down"
-                  :color="v.publish_change === '上涨' ? '#f00' : '#04c15f'"
-                  :class="{ rise: v.publish_change === '上涨' }"
+        <div class="itemHead">
+          <van-row>
+            <van-col span="3" class="td"> 排名 </van-col>
+            <van-col span="7" class="td"> 频率频道 </van-col>
+            <van-col span="5" class="td"> 发稿量(条) </van-col>
+            <van-col span="7" class="td"> 传播量(次) </van-col>
+            <!-- td2 :style="width > 667 ? 'line-height: 2.5em' : 'line-height: 1.5em'" -->
+            <van-col span="2" class="td">
+              <div style="width: 35px; height: 35px; overflow: hidden">
+                <img
+                  src="../../../assets/image/shou.gif"
+                  width="30px"
+                  alt=""
+                  style="vertical-align: middle; transform: rotate(45deg)"
                 />
+              </div>
+            </van-col>
+          </van-row>
+        </div>
+        <div v-for="(v, o) in dep || []" :key="v.name">
+          <div
+            style="border-bottom: 1px dashed #eee; margin: 11px 0 0 0"
+            v-if="o === 20"
+          ></div>
+          <van-row class="item" @click="() => showPopup(o)">
+            <van-col
+              span="3"
+              :class="{ td: true }"
+              :style="{ color: color[o] || '#000', fontWeight: 600 }"
+            >
+              {{ o + 1 }}
+            </van-col>
+            <van-col span="7" :class="{ td: true }">
+              {{ v.name }}
+            </van-col>
+            <van-col span="5" :class="{ td: true }">
+              {{ timeFormat(v.publish_count) }}
+              <van-icon
+                v-if="v.publish_change !== '相等'"
+                name="down"
+                :color="v.publish_change === '上涨' ? '#f00' : '#04c15f'"
+                :class="{ rise: v.publish_change === '上涨' }"
+              />
+            </van-col>
+            <van-col span="7" :class="{ td: true }">
+              {{ timeFormat(v.read_count) }}
+              <van-icon
+                v-if="v.read_change !== '相等'"
+                name="down"
+                :color="v.read_change === '上涨' ? '#f00' : '#04c15f'"
+                :class="{ rise: v.read_change === '上涨' }"
+              />
+            </van-col>
+            <van-col span="2" class="td" style="cursor: pointer">
+              <van-icon name="arrow" />
+            </van-col>
+          </van-row>
+        </div>
+        <van-popup
+          :style="{ height: '100%', width: '100%' }"
+          position="right"
+          v-model="show"
+        >
+          <div class="main">
+            <van-cell
+              title-style="flex: 3"
+              :title="ratios.schedulename"
+              :label="ratios.channelname"
+            >
+              <div
+                @click="show = false"
+                :style="
+                  'float:left;color: #5470c6;word-break: normal;text-align: justify;cursor:pointer;font-size:' +
+                  fontSize +
+                  'px'
+                "
+              >
+                <van-icon name="revoke" />
+                返回
+              </div>
+              <div
+                :style="
+                  'width: 100%; text-align: center;font-size:' + fontSize + 'px'
+                "
+              >
+                {{ ratios.name }}
+              </div>
+            </van-cell>
+            <van-row :style="'font-size: ' + fontSize * 1.1 + 'px;'">
+              <van-col span="7" class="td"> 发稿量： </van-col>
+              <van-col span="5" class="td">
+                {{ ratios.publish_count }}
               </van-col>
-              <van-col span="2" class="td" style="cursor: pointer">
-                <van-icon name="arrow" />
+              <van-col span="7" class="td"> 传播量： </van-col>
+              <van-col span="5" class="td">
+                {{ ratios.read_count }}
               </van-col>
             </van-row>
-          </div>
-          <van-popup
-            :style="{ height: '100%', width: '100%' }"
-            position="right"
-            v-model="show"
-          >
-            <div class="main">
+            <van-cell-group border title="账号矩阵">
+              <div>
+                <van-row class="itemHead">
+                  <van-col span="4" class="td"> 平台 </van-col>
+                  <van-col span="7" class="td"> 账号 </van-col>
+                  <van-col span="4" class="td"> 发稿量 </van-col>
+                  <van-col span="4" class="td"> 传播量 </van-col>
+                  <van-col span="5" class="td"> 环比 </van-col>
+                </van-row>
+                <van-row
+                  class="item"
+                  v-for="(v, i) in ratios.detail || []"
+                  :key="i + v.nick_name"
+                >
+                  <van-col span="4" class="td"> {{ v.platform }} </van-col>
+                  <van-col span="7" class="td"> {{ v.nick_name }} </van-col>
+                  <van-col span="4" class="td">
+                    {{ timeFormat(v.publish_count) }}
+                  </van-col>
+                  <van-col span="4" class="td">
+                    {{ timeFormat(v.read_count) }}
+                  </van-col>
+                  <van-col span="5" class="td">
+                    <span
+                      :style="
+                        v.read_huanbi > 0
+                          ? 'color:#f00'
+                          : v.read_huanbi < 0
+                          ? 'color:#04c15f'
+                          : ''
+                      "
+                      >{{ formatNum(v.read_huanbi || 0, 2) }}%</span
+                    >
+                    <van-icon
+                      v-if="v.read_huanbi != 0"
+                      name="down"
+                      :color="v.read_huanbi > 0 ? '#f00' : '#04c15f'"
+                      :class="{ rise: v.read_huanbi > 0 }"
+                    />
+                  </van-col>
+                </van-row>
+              </div>
+            </van-cell-group>
+            <van-cell-group border :title="ratios.name + '热门稿件'">
               <van-cell
+                v-for="(v, i) in ratios.article"
+                :key="i"
                 title-style="flex: 3"
-                :title="ratios.schedulename"
-                :label="ratios.channelname"
+                :title="i + 1 + '、' + v.title"
               >
-                <div
-                  @click="show = false"
-                  style="color: #5470c6; cursor: pointer"
-                >
-                  <van-icon name="revoke" />
-                  {{ ratios.name }}
-                </div>
-              </van-cell>
-              <van-row :style="'font-size: ' + fontSize * 1.1 + 'px;'">
-                <van-col span="7" class="td"> 发稿量： </van-col>
-                <van-col span="5" class="td">
-                  {{ ratios.publish_count }}
-                </van-col>
-                <van-col span="7" class="td"> 阅读量： </van-col>
-                <van-col span="5" class="td">
-                  {{ ratios.read_count }}
-                </van-col>
-              </van-row>
-              <van-cell-group border title="账号矩阵">
-                <div>
-                  <van-row class="itemHead">
-                    <van-col span="4" class="td"> 平台 </van-col>
-                    <van-col span="7" class="td"> 账号 </van-col>
-                    <van-col span="4" class="td"> 发稿量 </van-col>
-                    <van-col span="4" class="td"> 阅读量 </van-col>
-                    <van-col span="5" class="td"> 环比 </van-col>
-                  </van-row>
-                  <van-row
-                    class="item"
-                    v-for="(v, i) in ratios.detail || []"
-                    :key="i + v.nick_name"
+                <template #label>
+                  <van-tag size="large" color="#409efe" type="primary"
+                    >传播量：{{ timeFormat(v.play_count) }}</van-tag
                   >
-                    <van-col span="4" class="td"> {{ v.platform }} </van-col>
-                    <van-col span="7" class="td"> {{ v.nick_name }} </van-col>
-                    <van-col span="4" class="td">
-                      {{ timeFormat(v.publish_count) }}
-                    </van-col>
-                    <van-col span="4" class="td">
-                      {{ timeFormat(v.read_count) }}
-                    </van-col>
-                    <van-col span="5" class="td">
-                      <span
-                        :style="
-                          v.read_huanbi > 0 ? 'color:#f00' : v.read_huanbi < 0 ? 'color:#04c15f' : ''
-                        "
-                        >{{ formatNum(v.read_huanbi || 0, 2) }}%</span
-                      >
-                      <van-icon
-                        v-if="v.read_huanbi != 0"
-                        name="down"
-                        :color="v.read_huanbi > 0 ? '#f00' : '#04c15f'"
-                        :class="{ rise: v.read_huanbi > 0 }"
-                      />
-                    </van-col>
-                  </van-row>
-                </div>
-              </van-cell-group>
-              <van-cell-group border :title="ratios.name + '热门稿件'">
-                <van-cell
-                  v-for="(v, i) in ratios.article"
-                  :key="i"
-                  title-style="flex: 3"
-                  :title="i + 1 + '、' + v.title"
-                >
-                  <template #label>
-                    <van-tag size="large" color="#409efe" type="primary"
-                      >传播量：{{ timeFormat(v.play_count) }}</van-tag
-                    >
-                    {{ v.dep_name + "-" + v.nick_name }}
-                  </template>
-                </van-cell>
-              </van-cell-group>
-            </div>
-          </van-popup>
-        </van-cell-group>
+                  {{ v.dep_name + "-" + v.nick_name }}
+                </template>
+              </van-cell>
+            </van-cell-group>
+          </div>
+        </van-popup>
         <van-cell-group border title="爆款话题">
           <p
             :style="
-              ' font-weight: 700; padding: 0.5em 3px;font-size: ' +
+              ' font-weight: 700;word-break: normal;text-align: justify; padding: 0.5em 3px;font-size: ' +
               fontSize +
               'px;'
             "

src/views/report/Traditional/index.vue

@@ -12,7 +12,9 @@
     <p
       class="content"
       :style="
-        'font-weight: 700; padding: 0.5em 3px;font-size: ' + fontSize + 'px;'
+        'font-weight: 700;word-break: normal;text-align: justify; padding: 0.5em 3px;font-size: ' +
+        fontSize +
+        'px;'
       "
       v-html="title.desc"
     ></p>
@@ -128,16 +130,23 @@
               <div
                 @click="show = false"
                 :style="
-                  'color: #5470c6;cursor:pointer;font-size:' + fontSize + 'px'
+                  'float:left;color: #5470c6;word-break: normal;text-align: justify;cursor:pointer;font-size:' +
+                  fontSize +
+                  'px'
                 "
               >
                 <van-icon name="revoke" />
+                返回
+              </div>
+              <div
+                :style="
+                  'width: 100%; text-align: center;font-size:' + fontSize + 'px'
+                "
+              >
                 {{ ratios.channelname }}
               </div>
             </van-cell>
-            <van-cell-group
-              title="视听收视新指标"
-            >
+            <van-cell-group title="视听收视新指标">
               <van-row>
                 <van-col span="7" class="td" style="text-align: right">
                   收视总时长：

src/views/report/TraditionalAndXian/index.vue

@@ -12,7 +12,9 @@
     <p
       class="content"
       :style="
-        'font-weight: 700; padding: 0.5em 3px;font-size: ' + fontSize + 'px;'
+        'font-weight: 700;word-break: normal;text-align: justify; padding: 0.5em 3px;font-size: ' +
+        fontSize +
+        'px;'
       "
       v-html="title1.desc"
     ></p>
@@ -75,7 +77,7 @@
           <van-row
             :style="v.shanxi_channel ? 'background:	#F5DEB3' : ''"
             class="item"
-            @click="() => showPopup(o)"
+            @click="() => showPopup(o, 0)"
           >
             <van-col
               span="4"
@@ -128,11 +130,20 @@
               <div
                 @click="show = false"
                 :style="
-                  'color: #5470c6;cursor:pointer;font-size:' + fontSize + 'px'
+                  'float:left;color: #5470c6;word-break: normal;text-align: justify;cursor:pointer;font-size:' +
+                  fontSize +
+                  'px'
                 "
               >
                 <van-icon name="revoke" />
-                {{ ratios1.channelname }}
+                返回
+              </div>
+              <div
+                :style="
+                  'width: 100%; text-align: center;font-size:' + fontSize + 'px'
+                "
+              >
+                {{ ratios.channelname }}
               </div>
             </van-cell>
             <van-cell-group title="视听收视新指标">
@@ -222,7 +233,9 @@
     <p
       class="content"
       :style="
-        'font-weight: 700; padding: 0.5em 3px;font-size: ' + fontSize + 'px;'
+        'font-weight: 700;word-break: normal;text-align: justify; padding: 0.5em 3px;font-size: ' +
+        fontSize +
+        'px;'
       "
       v-html="title.desc"
     ></p>
@@ -262,7 +275,7 @@
           <van-row
             :style="v.shanxi_channel ? 'background:	#F5DEB3' : ''"
             class="item"
-            @click="() => showPopup(o)"
+            @click="() => showPopup(o, 1)"
           >
             <van-col
               span="4"
@@ -312,13 +325,17 @@
               :title="ratios.schedulename"
               :label="ratios.channelname"
             >
-              <div
+              
+            <div
                 @click="show = false"
                 :style="
-                  'color: #5470c6;cursor:pointer;font-size:' + fontSize + 'px'
+                  'float:left;color: #5470c6;word-break: normal;text-align: justify;cursor:pointer;font-size:' + fontSize + 'px'
                 "
               >
                 <van-icon name="revoke" />
+                返回
+              </div>
+              <div :style="'width: 100%; text-align: center;font-size:' + fontSize + 'px'">
                 {{ ratios.channelname }}
               </div>
             </van-cell>
@@ -577,9 +594,13 @@ export default {
       let out = Time.toFixed(w || 0) - 0;
       return out;
     },
-    showPopup(i) {
+    showPopup(i, o) {
       this.show = true;
-      const reaios = JSON.parse(JSON.stringify(this.platfromData[i] || {}));
+      const reaios = JSON.parse(
+        JSON.stringify(
+          !o ? this.platfromData1[i] || {} : this.platfromData[i] || {}
+        )
+      );
       reaios.hitcount = this.formatType1(reaios.hitcount, 1);
       reaios.usrcount = this.formatType1(reaios.usrcount, 1);
       reaios.timecount = this.formatType1(reaios.timecount / 60, 0);

src/views/report/TraditionalXian/index.vue

@@ -127,13 +127,17 @@
               :title="ratios.schedulename"
               :label="ratios.channelname"
             >
-              <div
+              
+            <div
                 @click="show = false"
                 :style="
-                  'color: #5470c6;cursor:pointer;font-size:' + fontSize + 'px'
+                  'float:left;color: #5470c6;word-break: normal;text-align: justify;cursor:pointer;font-size:' + fontSize + 'px'
                 "
               >
                 <van-icon name="revoke" />
+                返回
+              </div>
+              <div :style="'width: 100%; text-align: center;font-size:' + fontSize + 'px'">
                 {{ ratios.channelname }}
               </div>
             </van-cell>