update

src/views/Home.vue

@@ -60,8 +60,8 @@
 	<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 v-for='(item,index) in inDate' :key='index' :class="item.act?'active':''" :to="item.to" @click.native='active(index)'>
@@ -111,7 +111,6 @@
 			<!-- 右侧内容 -->
 			<el-container>
 				<el-main>			
-					
 						<transition name="fade" mode="out-in">
 						<router-view  :info='info' :community='community' v-if='isShow'></router-view>
 						</transition>
@@ -215,13 +214,13 @@ export default {
 		},
 		initNav(){
 			let data = [
-				// { act: true, to: '/index/index', name: '首页' },
-				// { act: false, to: '/journal/journal', 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: '/article/article', name: '精品导读' },
+				{ act: false, to: '/conference/conference', name: '会议系统' },
 				{ act: false, to: '/message/message', name: '信息管理' },
-				// { act: false, to: '/system/account', 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

@@ -14,23 +14,44 @@
           <el-form-item label="">
             <el-input
               clearable
-              placeholder="请输入信息标题"
+              placeholder="请输入期刊名称"
               v-model="form.name"
               @clear="getData"
             ></el-input>
           </el-form-item>
           <el-form-item>
+            <el-radio-group v-model="form.date">
+              <el-radio-button label="day">日报</el-radio-button>
+              <el-radio-button label="week">周报</el-radio-button>
+              <el-radio-button label="month">月报</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="form.date=='day'">
             <el-date-picker
-              v-model="form.timerange"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              v-model="form.day_value"
+              type="date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions"
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item v-if="form.date=='week'">
+            <el-date-picker
+              v-model="form.week_value"
+              type="week"
+              format="yyyy 第 WW 周"
+              placeholder="选择周"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item v-if="form.date=='month'">
+            <el-date-picker
+              v-model="form.month_value"
+              type="month"
+              placeholder="选择月"
+            >
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="search">搜索</el-button>
           </el-form-item>
@@ -214,10 +235,9 @@ export default {
         page: 1,
         page_size: 20,
         date: "day",
-        timerange: [
-          new Date(new Date()-1000*60*60*24).toLocaleDateString().split("/").join("-"),
-          new Date(new Date()-1000*60*60*24).toLocaleDateString().split("/").join("-"),
-        ],
+        day_value: new Date(new Date()-1000*60*60*24).toLocaleDateString(),
+        week_value: null,
+        month_value: null
       },
       total: 1,
       list: [{ name: "2333" }],
@@ -348,7 +368,7 @@ export default {
     },
     getData() {
       var parm = {...this.form};
-      parm.timerange = parm.timerange.join(",")
+      // parm.timerange = parm.timerange.join(",")
       parm.order_by = this.order_by;
       parm.order = this.order;
       this.loading = true;

src/views/journalQun/CASCIDetail.vue

@@ -241,6 +241,11 @@
       <div class="top30JournalAnalyse">
         <div class="title">
           <h3>近30日发布资源TOP10</h3>
+          <el-radio-group v-model="publish_orderby" size="mini" @change="getDays30Publish">
+            <el-radio-button label="new">最新</el-radio-button>
+            <el-radio-button label="read_num">阅读量</el-radio-button>
+            <el-radio-button label="zhuanfa_num">转发量</el-radio-button>
+          </el-radio-group>
         </div>
       </div>
       <div class="content">
@@ -404,7 +409,8 @@ export default {
       days30PublishArticle:[],
       dialogTitle:"",
       dialogVisible1:false,
-      dialogVisible2:false
+      dialogVisible2:false,
+      publish_orderby:"new"
     };
   },
   methods: {
@@ -474,6 +480,7 @@ export default {
     getDays30Publish(){
       var parm = {...this.params};
       parm.journal_id = this.$route.query.id;
+      parm.order_by = this.publish_orderby
       this.$api.getDays30Publish(parm).then((res)=>{
         console.log(res)
         this.days30Publish = res.data.data;