update

src/api.js

@@ -513,4 +513,8 @@ export default {
 	syncToMP: params => {
 		return axios.post(`${baseURL}/api/admin/article/synctomp`, params);
 	},
+	//
+	getCASCIList: params => {
+		return axios.get(`${baseURL}/api/admin/casci/list`, { params: params });
+	},
 }

src/views/Home.vue

@@ -10,17 +10,10 @@
 	<el-container>
 		<el-header>
 			<div class="header">
-				<img class="logo" src="../assets/logo.png" alt="">
-				<div class="siteTitle">中科院期刊微信公众号集中管理平台</div>
+				<!-- <img class="logo" src="../assets/logo.png" alt=""> -->
+				<!-- <div class="siteTitle">中科院期刊微信公众号集中管理平台</div> -->
 			</div>	
 			<div class="nav">
-				<!-- <router-link :class="act?'active':''" to="/index/index" @click.native='active(1)'>首页</router-link>
-				<router-link to="/journal/journal" @click.native='active(2)'>刊群导览</router-link>
-				<router-link to="/learning/activity" @click.native='active(3)'>学术交流</router-link>
-				<router-link to="/article/article" @click.native='active(4)'>精品导读</router-link>
-				<router-link to="/conference/conference" @click.native='active(5)'>会议系统</router-link>
-				<router-link to="/message/message" @click.native='active(6)'>信息管理</router-link>
-				<router-link to="/system/account" @click.native='active(7)'>系统管理</router-link> -->
 				<router-link v-for='(item,index) in inDate' :key='index' :class="item.act?'active':''" :to="item.to" @click.native='active(index)'>
 					{{item.name}}
 				</router-link>
@@ -143,13 +136,13 @@ export default {
 		},
 		initNav(){
 			let data = [
-				{ act: true, to: '/index/index', name: '首页' },
+				// { act: true, to: '/index/index', name: '首页' },
 				{ act: false, to: '/journal/journal', name: '刊群导览' },
-				{ act: false, to: '/learning/activity', name: '学术交流' },
-				{ act: false, to: '/article/article', name: '精品导读' },
-				{ act: false, to: '/conference/conference', name: '会议系统' },
-				{ act: false, to: '/message/message', name: '信息管理' },
-				{ act: false, to: '/system/account', name: '系统管理' },
+				// { act: false, to: '/learning/activity', name: '学术交流' },
+				// { act: false, to: '/article/article', name: '精品导读' },
+				// { act: false, to: '/conference/conference', name: '会议系统' },
+				// { act: false, to: '/message/message', name: '信息管理' },
+				// { act: false, to: '/system/account', name: '系统管理' },
 			];
 			let mod = this.$route.path.split("/")[1];
 			this.$router.options.routes.forEach((element,i) => {

src/views/journalQun/CASCI.vue

@@ -1,5 +1,4 @@
 <style lang="scss" scoped>
-
 </style>
 <template>
   <section>
@@ -21,38 +20,20 @@
             ></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="search">搜索</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="form.date">
-              <el-option label="日榜" value="day"></el-option>
-              <el-option label="周榜" value="week"></el-option>
-              <el-option label="月榜" value="month"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-if="form.date == 'day'"
-              v-model="form.timerange"
-              type="date"
-              placeholder="选择日期"
-            >
-            </el-date-picker>
-            <el-date-picker
-              v-if="form.date == 'week'"
-              v-model="form.timerange"
-              type="week"
-              format="yyyy 第 WW 周"
-              placeholder="选择周"
-            ></el-date-picker>
             <el-date-picker
-              v-if="form.date == 'month'"
               v-model="form.timerange"
-              type="month"
-              placeholder="选择月"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions"
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="search">搜索</el-button>
+          </el-form-item>
           <el-form-item style="float: right">
             <el-button
               @click="download"
@@ -76,34 +57,55 @@
         @sort-change="changeTableSort"
       >
         <el-table-column prop="rank" width="80" label="排名"> </el-table-column>
-        <el-table-column prop="img" label="期刊封面" width="120">
+        <el-table-column prop="journal_img" label="期刊封面" width="120">
           <template slot-scope="scope">
-            <img :src="scope.row.img" alt="" width="80" style="margin: 5px" />
+            <img :src="scope.row.journal_img" alt="" width="80" style="margin: 5px" />
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="统计资源数量(总)" sortable="custom">
-        </el-table-column>
-        <el-table-column prop="wxcode" label="统计资源数量(公众号)" sortable="custom">
-        </el-table-column>
-        <el-table-column prop="wxcode" label="总阅读量(次))" sortable="custom">
+        <el-table-column prop="journal_name" label="期刊名称"> </el-table-column>
+        <el-table-column prop="article_count" label="统计资源数量(总)" sortable="custom">
         </el-table-column>
-        <el-table-column prop="wxcode" label="公众号阅读量(次)" sortable="custom">
+        <el-table-column
+          prop="article_count_mp"
+          label="统计资源数量(公众号)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="小程序阅读量(次)" sortable="custom">
+        <el-table-column
+          prop="article_count_xcx"
+          label="统计资源数量(小程序)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="总点赞量(次)" sortable="custom">
+        <el-table-column prop="read_num" label="总阅读量(次))" sortable="custom">
         </el-table-column>
-        <el-table-column prop="wxcode" label="公众号点赞量(次)" sortable="custom">
+        <el-table-column
+          prop="read_num_mp"
+          label="公众号阅读量(次)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="小程序点赞量(次)" sortable="custom">
+        <el-table-column
+          prop="read_num_xcx"
+          label="小程序阅读量(次)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="总转发量量(次)" sortable="custom">
+        <el-table-column prop="zhuanfa_num" label="总转发量量(次)" sortable="custom">
         </el-table-column>
-        <el-table-column prop="wxcode" label="公众号转发量(次)" sortable="custom">
+        <el-table-column
+          prop="zhuanfa_num_mp"
+          label="公众号转发量(次)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="小程序转发量(次)" sortable="custom">
+        <el-table-column
+          prop="zhuanfa_num_xcx"
+          label="小程序转发量(次)"
+          sortable="custom"
+        >
         </el-table-column>
-        <el-table-column prop="wxcode" label="CASCI" sortable="custom">
+        <el-table-column prop="casci" label="CASCI" sortable="custom">
         </el-table-column>
         <el-table-column
           prop="zip"
@@ -212,7 +214,10 @@ export default {
         page: 1,
         page_size: 20,
         date: "day",
-        timerange: new Date(),
+        timerange: [
+          new Date(new Date()-1000*60*60*24).toLocaleDateString().split("/").join("-"),
+          new Date(new Date()-1000*60*60*24).toLocaleDateString().split("/").join("-"),
+        ],
       },
       total: 1,
       list: [{ name: "2333" }],
@@ -223,12 +228,17 @@ export default {
       dialogVisible1: false,
       form1: { qrcode: "" },
       file: "",
+      pickerOptions:{
+        disabledDate:(time)=>{
+          return time.getTime() > new Date()-1000*60*60*24;
+        }
+      }
     };
   },
   methods: {
-    changeTableSort(e){
-      let parm = {order_by:e.prop,order:e.order}
-      console.log(parm)
+    changeTableSort(e) {
+      let parm = { order_by: e.prop, order: e.order };
+      console.log(parm);
     },
     delImg() {
       this.$set(this.form1, "qrcode", null);
@@ -292,7 +302,7 @@ export default {
     showCASCI(row) {
       this.$router.push({
         path: "/journal/casci/detail",
-        query: { id: row.id },
+        query: { id: row.journal_id },
       });
     },
     //封面
@@ -329,9 +339,11 @@ export default {
       this.getData();
     },
     getData() {
-      var parm = this.form;
+      // var parm = this.form;
+      var parm = {...this.form};
+      parm.timerange = parm.timerange.join(",")
       this.loading = true;
-      this.$api.getJournalList(parm).then((res) => {
+      this.$api.getCASCIList(parm).then((res) => {
         this.list = res.data.data.list;
         this.total = res.data.data.total;
         this.loading = false;