From a5110e7c16a1066f78dbd4e00e7579a2218e6331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= <xl376837995@163.com>
Date: Thu, 25 Jan 2024 16:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=88=86=EF=BC=8C=E8=BD=AC=E6=8A=95?=
 =?UTF-8?q?=E7=9B=B4=E6=8A=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Dashboard_.vue            |  3 ++
 .../page/superJournalsManagement.vue          | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/components/page/Dashboard_.vue b/src/components/page/Dashboard_.vue
index 6f2beda..1812418 100644
--- a/src/components/page/Dashboard_.vue
+++ b/src/components/page/Dashboard_.vue
@@ -28,6 +28,9 @@
 						<img src="../../assets/img/star-all.png" v-if="starList_mark>8" class="starSty">
 						<b style="font-size: 15px;color: #b77614;" v-if="starList_mark>8">× {{starList_mark}}</b>
 					</div>
+					<div v-else>
+						<img src="../../assets/img/star-grey.png" class="starSty">
+					</div>
 					<el-button type="primary" plain @click="openCoreHand()" size="mini" style="margin-top: 5px;">
 						<i class="el-icon-setting"></i>
 						Profile settings
diff --git a/src/components/page/superJournalsManagement.vue b/src/components/page/superJournalsManagement.vue
index b1b611d..5ce6614 100644
--- a/src/components/page/superJournalsManagement.vue
+++ b/src/components/page/superJournalsManagement.vue
@@ -28,9 +28,9 @@
 			</el-table-column>
 			<el-table-column label="当年初审均值" prop="CS" align="center" width="120"></el-table-column>
 			<el-table-column label="当年终审均值" prop="ZS" align="center" width="120"></el-table-column>
-			<el-table-column label="" prop="ZT" align="center" width="180">
+			<el-table-column label="" prop="ZT" align="center" width="160">
 				<template slot="header">
-					<span>{{this.lastYear}}年直投 / 当月转投</span>
+					<span>当月直投 / 当月转投</span>
 				</template>
 				<template slot-scope="scope">
 					<span>{{scope.row.Z}}</span>
@@ -38,6 +38,28 @@
 					<span>{{scope.row.ZT}}</span>
 				</template>
 			</el-table-column>
+			<el-table-column label="" prop="ZT" align="center" width="190">
+				<template slot="header">
+					<span>{{this.dangYear}}年直投 / {{this.dangYear}}年转投</span>
+				</template>
+				<template slot-scope="scope">
+					<span>{{scope.row.DNZ}}</span>
+					<b> / </b>
+					<span>{{scope.row.DNZT}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="" prop="ZT" align="center" width="190">
+				<template slot="header">
+					<span>{{this.lastYear}}年直投 / {{this.lastYear}}年转投</span>
+				</template>
+				<template slot-scope="scope">
+					<span>{{scope.row.NZ}}</span>
+					<b> / </b>
+					<span>{{scope.row.NZT}}</span>
+				</template>
+			</el-table-column>
+
+
 			<!-- <el-table-column  label="平均H指数" prop="H"   align="center"></el-table-column>
             <el-table-column  label="国际化" prop="H"   align="center"></el-table-column>
             <el-table-column  label="不活跃系数" prop="H"   align="center"></el-table-column> -->
@@ -68,6 +90,7 @@
 				},
 				tableData: [],
 				Total: 0,
+				dangYear: 0,
 				lastYear: 0,
 			}
 		},
@@ -78,7 +101,8 @@
 			// 获取文章列表数据        
 			getdata() {
 				this.loading = true
-				this.lastYear = new Date().getFullYear()-1
+				this.dangYear = new Date().getFullYear()
+				this.lastYear = new Date().getFullYear() - 1
 				this.$api
 					.post('api/Monitor/getJournalForms')
 					.then(res => {