3 Commits ab697adfe4 ... 076a2adf4c

Autor SHA1 Mensaje Fecha
  yejian 076a2adf4c 用户停留-根据类型过滤展示数据;页面分类按钮增加左右边距 hace 2 años
  liyongli fb64c90be6 Merge remote-tracking branch 'origin/starv_master' hace 2 años
  liyongli 614e9243f4 提交 hace 2 años

+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "@element-plus/icons-vue": "^1.1.3",
     "axios": "^0.26.1",
     "core-js": "^3.6.5",
+    "dayjs": "^1.11.7",
     "echarts": "^5.2.1",
     "echarts-wordcloud": "^2.0.0",
     "element-plus": "^1.0.2-beta.36",

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 53 - 570
pnpm-lock.yaml


+ 14 - 0
src/api/newMdeiaApi.js

@@ -24,3 +24,17 @@ export function getContentDayList(data) {
     data,
   });
 }
+
+
+/**
+ * 获取柚媒接口调用信息;
+ * @return {AxjxPromise}
+ */
+export function getYoumeiList(data) {
+    return ajax({
+      urlType: 'youmei',
+      url: '/search-log',
+      method: 'POST',
+      data,
+    });
+  }

+ 2 - 0
src/config/index.js

@@ -1,6 +1,7 @@
 import tableCol from "./tableCol";
 let url = "http://172.16.101.20:8762/cxzx-kuyun",
   url2 = "http://172.16.101.20:8762/cxzx-program",
+  youmei = "https://topic.smcic.net/youmei",
   kuyunApi = "http://172.16.101.20:8762/cxzx-fm",
   guijiApi = "http://topic.smcic.net",
   leverAudience = "http://172.16.101.20:8762",
@@ -21,6 +22,7 @@ export default {
     url,
     url2,
     url3: "",
+    youmei,
     leverAudience,
     kuyunApi,
     guijiApi,

+ 0 - 288
src/router/dist/index.dev.js

@@ -1,288 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _vueRouter = require("vue-router");
-
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var routes = [{
-  path: "/",
-  name: "Program",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Program.vue"));
-    });
-  }
-}, {
-  path: "/Channel",
-  name: "Channel",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Channel.vue"));
-    });
-  }
-}, {
-  path: "/heightlight",
-  name: "Heightlight",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Heightlight.vue"));
-    });
-  }
-}, {
-  path: "/realData",
-  name: "RealData",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/RealData.vue"));
-    });
-  }
-}, {
-  path: "/liveChannel",
-  name: "LiveChannel",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/LiveChannel.vue"));
-    });
-  }
-}, {
-  path: "/boutiqueColumn",
-  name: "boutiqueColumn",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/BoutiqueColumn/BoutiqueColumn.vue"));
-    });
-  }
-}, {
-  path: "/activity",
-  name: "Activity",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Activity/Activity.vue"));
-    });
-  }
-}, {
-  path: "/jugou",
-  name: "Jugou",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Jugou/Jugou.vue"));
-    });
-  }
-}, {
-  path: "/radio",
-  name: "Radio",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Radio/Radio.vue"));
-    });
-  }
-}, {
-  path: "/hardAdvertisement",
-  name: "HardAdvertisement",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/HardAdvertisement/HardAdvertisement.vue"));
-    });
-  }
-}, {
-  path: "/advertisingEye",
-  name: "AdvertisingEye",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/AdvertisingEye/AdvertisingEye.vue"));
-    });
-  }
-}, {
-  path: "/channelRanking",
-  name: "ChannelRanking",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/ChannelRanking/ChannelRanking.vue"));
-    });
-  }
-}, {
-  path: "/reportForm",
-  name: "ReportForm",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/ReportForm/ReportForm.vue"));
-    });
-  }
-}, {
-  path: "/radioBroadcast",
-  name: "RadioBroadcast",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/RadioBroadcast.vue"));
-    });
-  }
-}, {
-  path: "/country",
-  component: function component() {
-    return Promise.resolve().then(function () {
-      return _interopRequireWildcard(require("../views/Country/Index.vue"));
-    });
-  },
-  children: [{
-    path: "",
-    // 频道全天节目
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/ChannelEPG/Channel.vue"));
-      });
-    }
-  }, {
-    path: "/country/customRanking",
-    // 自定义时间段排行
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/CustomRanking/CustomRanking.vue"));
-      });
-    }
-  }, {
-    path: "/country/channelList",
-    // 多维度筛选 频道时段排名
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/ChannelList/ChannelList.vue"));
-      });
-    }
-  }, {
-    path: "/country/singleDay",
-    // 单天频道点分钟
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/SingleDay/SingleDay.vue"));
-      });
-    }
-  }, {
-    path: "/country/average",
-    // 平均频道点分钟
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Average/Average.vue"));
-      });
-    }
-  }, {
-    path: "/country/subRegion",
-    // 频道分地收视(全国)
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/SubRegion/SubRegion.vue"));
-      });
-    }
-  }, {
-    path: "/country/channelRegion",
-    // 频道分地区收视
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/ChannelRegion/ChannelRegion.vue"));
-      });
-    }
-  }, {
-    path: "/country/flowChannel",
-    // 频道实时流入流出
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/FlowChannel/FlowChannel.vue"));
-      });
-    }
-  }, {
-    path: "/country/program",
-    // 节目点分钟
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Program/Program.vue"));
-      });
-    }
-  }, {
-    path: "/country/compete",
-    // 节目竞争一览
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Compete/Compete.vue"));
-      });
-    }
-  }, {
-    path: "/country/specificProgramQuery",
-    // 具体节目剧目查询
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/SpecificProgramQuery/SpecificProgramQuery.vue"));
-      });
-    }
-  }, {
-    path: "/country/specificProgram",
-    // 具体节目剧目排行
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/SpecificProgram/SpecificProgram.vue"));
-      });
-    }
-  }, {
-    path: "/country/abstractProgramQuery",
-    // 抽象节目剧目查询
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/AbstractProgramQuery/AbstractProgramQuery.vue"));
-      });
-    }
-  }, {
-    path: "/country/abstractProgram",
-    // 抽象节目剧目排行
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/AbstractProgram/AbstractProgram.vue"));
-      });
-    }
-  }, {
-    path: "/country/flow",
-    // 单期节目流入流出
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Flow/Flow.vue"));
-      });
-    }
-  }, {
-    path: "/country/abstract",
-    // 抽象节目剧目分地区收视(全国)
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Abstract/Abstract.vue"));
-      });
-    }
-  }, {
-    path: "/country/overlap",
-    // 节目剧目重叠度
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Overlap/Overlap.vue"));
-      });
-    }
-  }, {
-    path: "/country/scheduling",
-    // 电视剧排播信息及表现(全国)
-    component: function component() {
-      return Promise.resolve().then(function () {
-        return _interopRequireWildcard(require("../views/Scheduling/Scheduling.vue"));
-      });
-    }
-  }]
-}]; // 实时/单期 节目流入流出 共计2个  可以使用同一模块
-// 具体/抽象 节目剧目 查询/排行  共计4个,可以使用一个模块
-
-var router = (0, _vueRouter.createRouter)({
-  history: (0, _vueRouter.createWebHashHistory)(process.env.BASE_URL),
-  routes: routes
-});
-var _default = router;
-exports["default"] = _default;

+ 138 - 8
src/views/Proofread/index.vue

@@ -2,29 +2,159 @@
   <div class="AbstractProgram">
     <br />
     <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item>传统媒体</el-breadcrumb-item>
-      <el-breadcrumb-item>节目点分钟</el-breadcrumb-item>
+      <el-breadcrumb-item>媒体</el-breadcrumb-item>
+      <el-breadcrumb-item>稿前校对统计</el-breadcrumb-item>
     </el-breadcrumb>
     <br />
-    <el-card class="box-card"> </el-card>
+    <el-card class="box-card">
+      <el-form
+        :model="form"
+        size="small"
+        :inline="true"
+        label-width="120px"
+        class="demo-form-inline"
+      >
+        <el-form-item label="日期">
+          <el-date-picker
+            v-model="form.time"
+            type="datetimerange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="disabledDate"
+            placeholder="日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="关键词">
+          <el-input v-model="form.keyword" placeholder="检索关键词" clearable />
+        </el-form-item>
+        <el-form-item style="float: right">
+          <el-button type="primary" @click="onSubmit" :loading="load">
+            查询
+          </el-button>
+          <!-- <el-button type="primary" @click="onExport" :loading="load">
+            导出
+          </el-button> -->
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <br />
+    <el-card>
+      <el-table :data="tableData" style="width: 100%" :header-cell-style="{ backgroundColor: '#f4f5f7', color: '#606266' }">
+        <el-table-column
+          show-overflow-tooltip
+          align="center"
+          prop="displayName"
+          label="用户名称"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          align="center"
+          prop="createTime"
+          label="校对时间"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          align="center"
+          prop="textLength"
+          label="校对字数"
+        />
+      </el-table>
+      <br />
+      <el-pagination
+        @current-change="change"
+        background
+        :default-current-page="page"
+        layout="prev, pager, next"
+        :total="total"
+      />
+    </el-card>
   </div>
 </template>
 
 <script>
 // @ is an alias to /src
-//   import { epgselectDate, epgcountry,overlapSearchTitle } from "@/api/kuyun";
+import { getYoumeiList } from '@/api/newMdeiaApi';
+import dayjs from 'dayjs';
 
 //   import config from "@/config/index";
+let T = undefined;
 export default {
   name: 'Proofread',
   data() {
-    return {};
+    return {
+      page: 1,
+      size: 10,
+      total: 0,
+      load: false,
+      tableData: [],
+      form: {
+        keyword: '',
+        time: [],
+      },
+    };
+  },
+  mounted() {
+    const h = Date.now();
+    const h1 = h - (h % 3600000);
+    const h2 = h - (h % 3600000) - 3600000;
+    const time1 = dayjs(h2).format('YYYY-MM-DD HH:mm:ss');
+    const time2 = dayjs(h1).format('YYYY-MM-DD HH:mm:ss');
+    this.form = {
+      keyword: '',
+      time: [time1, time2],
+    };
+    this.getDate();
   },
-  mounted() {},
   computed: {},
-  methods: {},
+  methods: {
+    getDate() {
+      if (T) window.clearTimeout(T);
+      T = setTimeout(() => {
+        this.load = true;
+        if (T) window.clearTimeout(T);
+      }, 200);
+      getYoumeiList({
+        page: this.page,
+        size: this.size,
+        keyword: this.form.keyword,
+        startTime: this.form.time[0],
+        endTime: this.form.time[1],
+      })
+        .then(r => {
+          if (T) window.clearTimeout(T);
+          this.load = false;
+          this.total = r.total || 0;
+          this.tableData = r.records || [];
+        })
+        .catch(() => {
+          if (T) window.clearTimeout(T);
+          this.tableData = [];
+          this.load = false;
+        });
+    },
+    disabledDate(time) {
+      return time.getTime() > Date.now();
+    },
+    change(page) {
+      this.page = page;
+      console.log(page);
+      this.getDate();
+    },
+    onSubmit() {
+      this.page = 1;
+      this.getDate();
+    },
+    onExport() {},
+  },
   components: {},
 };
 </script>
 
-<style></style>
+<style>
+.el-pagination .btn-next .el-icon,
+.el-pagination .btn-prev .el-icon{
+    margin: 0 auto;
+}
+</style>

+ 1 - 1
src/views/Ranking/FusionNumberManuscript.vue

@@ -97,7 +97,7 @@ export default {
   padding: 0 100px;
 }
 .groupType {
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 1 - 1
src/views/Ranking/FusionVermicelli.vue

@@ -98,7 +98,7 @@ export default {
   padding: 0 100px;
 }
 .groupType {
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 1 - 1
src/views/Ranking/ManuscriptDissemination.vue

@@ -127,7 +127,7 @@ export default {
   padding: 0 100px;
 }
 .groupType{
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 1 - 1
src/views/Ranking/ManuscriptIssued.vue

@@ -128,7 +128,7 @@ export default {
   padding: 0 100px;
 }
 .groupType{
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 1 - 1
src/views/Ranking/ManuscriptQuantity.vue

@@ -96,7 +96,7 @@ export default {
   padding: 0 100px;
 }
 .groupType {
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 1 - 1
src/views/Ranking/MaterialContribution.vue

@@ -127,7 +127,7 @@ export default {
   padding: 0 100px;
 }
 .groupType{
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

+ 2 - 2
src/views/Ranking/UserStayRanking.vue

@@ -62,7 +62,7 @@ export default {
       getCategoryCnt({ type: this.btnFocus })
         .then((res) => {
           that.total = res.length;
-          that.tableData = res;
+          that.tableData = res.filter(v=>v.category_name==this.btnFocus);
           that.load.close();
         })
         .catch((err) => {
@@ -96,7 +96,7 @@ export default {
   padding: 0 100px;
 }
 .groupType {
-  padding: 15px 0;
+  padding: 15px 10px;
   box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 }
 .card-rank {

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio