提交

src/App.vue

@@ -1,75 +1,75 @@
 <template>
   <el-config-provider :locale="locale">
-    <div id="nav" class="lingdu_main" v-if="host !== ''">
+    <div id="nav" class="lingdu_main">
       <!-- <router-link to="/">栏目</router-link> |
       <router-link to="/channel">频道</router-link> |
       <router-link to="/realData">直播数据</router-link> -->
       <router-view />
     </div>
-    <div
+    <!-- <div
       class="baseData"
       ref="baseData"
       style="opacity: 0;position: absolute; z-index= -1;top:0"
-    ></div>
+    ></div> -->
   </el-config-provider>
 </template>
 <script>
-import locale from "element-plus/lib/locale/lang/zh-cn";
+import locale from 'element-plus/lib/locale/lang/zh-cn';
 
-import config from "./config/index";
-let nanoid = (t = 21) => {
-  let e = "",
-    r = crypto.getRandomValues(new Uint8Array(t));
-  for (; t--; ) {
-    let n = 63 & r[t];
-    e +=
-      n < 36
-        ? n.toString(36)
-        : n < 62
-        ? (n - 26).toString(36).toUpperCase()
-        : n < 63
-        ? "_"
-        : "-";
-  }
-  return e;
-};
+import config from './config/index';
+// let nanoid = (t = 21) => {
+//   let e = '',
+//     r = crypto.getRandomValues(new Uint8Array(t));
+//   for (; t--; ) {
+//     let n = 63 & r[t];
+//     e +=
+//       n < 36
+//         ? n.toString(36)
+//         : n < 62
+//         ? (n - 26).toString(36).toUpperCase()
+//         : n < 63
+//         ? '_'
+//         : '-';
+//   }
+//   return e;
+// };
 export default {
-  name: "Program",
+  name: 'Program',
   data() {
     return {
       locale,
-      host: "",
+      host: '',
     };
   },
   mounted() {
-      let n = nanoid();
-    const li = [
-      {
-        url: "http://172.16.101.20:8877/test.html?url=http://172.16.101.20&uuid=",
-      },
-      {
-        url: "http://10.0.254.67:8877/test.html?url=http://10.0.254.67&uuid=",
-      },
-    ];
-    for (let i = 0; i < li.length; i++) {
-      const v = li[i];
-      const iframe = document.createElement("iframe");
-      iframe.src = v.url + n;
-      this.$refs.baseData.appendChild(iframe);
-    }
-    this.host = '47.108.249.49:8877';
-    this.$refs.baseData.innerHTML = "";
+    // let n = nanoid();
+    // const li = [
+    //   {
+    //     url: "http://172.16.101.20:8877/test.html?url=http://172.16.101.20&uuid=",
+    //   },
+    //   {
+    //     url: "http://10.0.254.67:8877/test.html?url=http://10.0.254.67&uuid=",
+    //   },
+    // ];
+    // for (let i = 0; i < li.length; i++) {
+    //   const v = li[i];
+    //   const iframe = document.createElement("iframe");
+    //   iframe.src = v.url + n;
+    //   this.$refs.baseData.appendChild(iframe);
+    // }
+    // this.host = '47.108.249.49:8877';
+    // this.$refs.baseData.innerHTML = "";
     // if (window.fetch) this.getdata(n);
   },
   methods: {
     getdata(n) {
       window
-        .fetch("http://47.108.249.49:8877/result?id=" + n, {
-          method: "GET",
+        .fetch('http://47.108.249.49:8877/result?id=' + n, {
+          method: 'GET',
           // method: "OPTIONS",
         })
         .then(res => {
-          if (res.status !== 200) return { err: "请求失败" };
+          if (res.status !== 200) return { err: '请求失败' };
           try {
             return res.json();
           } catch (err) {
@@ -77,10 +77,11 @@ export default {
           }
         })
         .then(res => {
-          this.$refs.baseData.innerHTML = "";
+          this.$refs.baseData.innerHTML = '';
+          console.log(res);
           if (res.err) {
-            document.querySelector(".showText").style.display = "block";
-            document.querySelector(".loader").style.display = "none";
+            document.querySelector('.showText').style.display = 'block';
+            document.querySelector('.loader').style.display = 'none';
             return;
           }
           config.base.Intranet = res.Host;

src/api/newMdeiaApi.js

@@ -115,7 +115,39 @@ export function getCloudLiveList(data) {
 export function getIncomeist(data) {
   return ajax({
     urlType: 'url2',
-    url: '/new-media/cloud-live/pay?liveId=' + data.liveId + '&page=' + data.page + '&pageSize=' + data.size,
+    url:
+      '/new-media/cloud-live/pay?liveId=' +
+      data.liveId +
+      '&page=' +
+      data.page +
+      '&pageSize=' +
+      data.size,
     method: 'GET',
   });
 }
+/**
+ * 融合号排行
+ * @param {object} data
+ * @returns
+ */
+export function getStatistics(data) {
+  return ajax({
+    urlType: 'rankApi',
+    url: '/ronghe/statistics',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * 融合号钻取
+ * @param {object} data
+ * @returns
+ */
+export function getDrilling(data) {
+  return ajax({
+    urlType: 'rankApi',
+    url: '/ronghe/drilling',
+    method: 'POST',
+    data,
+  });
+}

src/config/index.js

@@ -14,6 +14,7 @@ let url = 'http://172.16.101.20:8762/cxzx-kuyun',
   youmei = 'https://topic.smcic.net/youmei',
   kuyunApi = 'http://172.16.101.20:8762/cxzx-fm',
   guijiApi = 'http://topic.smcic.net',
+//   leverAudience = 'http://172.17.17.201:9000',
   leverAudience = 'http://172.16.101.20:8762',
   rankApi = 'http://xhaapi.sxtvs.net';
 let base = '';
@@ -43,7 +44,7 @@ export default {
     requestRetry: 4,
     requestRetryDelay: 800,
     token: '',
-    Intranet: '',
+    Intranet: 'http://172.16.101.20:8762',
   },
   order,
   tableCol,

src/router/rank.js

@@ -105,6 +105,7 @@ export default [
             ),
         },
         {
+            // 接口未分页
           path: 'all_aedia_column',
           name: 'all_aedia_column',
           component: () =>
@@ -113,6 +114,7 @@ export default [
             ),
         },
         {
+            // 接口未分页
           path: 'fusion',
           name: 'fusion',
           component: () =>
@@ -121,6 +123,7 @@ export default [
             ),
         },
         {
+            // 无接口
           path: 'content_library',
           name: 'content_library',
           component: () =>

src/views/Jugou/Jugou.vue

@@ -195,7 +195,7 @@ export default {
       videoUrl = videoUrl
         .replace("/{yyyyMMdd}/", "/" + d + "/")
         .replace(/^https?:/, location.protocol);
-      this.videoUrl = config.base.Intranet + ":8762/minio" + videoUrl.replace("{$channel_id}", this.select);
+      this.videoUrl = config.base.Intranet + "/minio" + videoUrl.replace("{$channel_id}", this.select);
       defaultAjax({
         url,
       })

src/views/Ranking/all_aedia_column.vue

@@ -20,17 +20,45 @@
       </el-form-item>
     </el-form>
 
-    <el-table border :data="tableData" stripe style="width: 100%" :row-click="click_row">
-      <el-table-column align="center" header-align="center" type="index" label="排行" width="50" />
-      <el-table-column align="center" header-align="center" prop="" label="融合号" />
-      <el-table-column align="center" header-align="center" prop="" label="粉丝量" />
-      <el-table-column align="center" header-align="center" prop="" label="总发稿量" />
+    <el-table
+      border
+      :data="tableData"
+      stripe
+      style="width: 100%"
+      :row-click="click_row"
+    >
+      <el-table-column
+        align="center"
+        header-align="center"
+        type="index"
+        label="排行"
+        width="50"
+      />
+      <el-table-column
+        align="center"
+        header-align="center"
+        prop=""
+        label="融合号"
+      />
+      <el-table-column
+        align="center"
+        header-align="center"
+        prop=""
+        label="粉丝量"
+      />
+      <el-table-column
+        align="center"
+        header-align="center"
+        prop=""
+        label="总发稿量"
+      />
     </el-table>
     <br />
     <el-pagination layout="prev, pager, next" :total="1000" />
   </div>
 </template>
 <script>
+import { getStatistics } from '@/api/newMdeiaApi';
 // 概览
 export default {
   name: 'fusion',
@@ -45,12 +73,15 @@ export default {
     };
   },
   mounted() {
-    console.log("---")
+    console.log('---');
+    getStatistics().then(r => {
+      console.log(r);
+    });
   },
   methods: {
-    click_row(e){
-        console.log(e)
-    }
+    click_row(e) {
+      console.log(e);
+    },
   },
   components: {},
 };

src/views/Ranking/live.vue

@@ -185,6 +185,7 @@ import {
 } from '@/api/newMdeiaApi.js';
 import dayjs from 'dayjs';
 const T = dayjs(Date.now() - 86400000);
+const T0 = dayjs(Date.now() - 86400000*30);
 export default {
   name: 'live',
   data() {
@@ -194,7 +195,7 @@ export default {
       search: {
         column: '',
         department: '',
-        date: [T.format('YYYY-MM-DD'), T.format('YYYY-MM-DD')],
+        date: [T0.format('YYYY-MM-DD'), T.format('YYYY-MM-DD')],
         keyword: '',
         page: 1,
         size: 10,