From 7322f566f10b97e25aa307580fe041afccaa106c Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Wed, 10 Jan 2024 16:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E7=AB=AF=E5=8D=9A?=
 =?UTF-8?q?=E5=AE=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/admin/common/sidebar.vue |   2 +-
 src/components/admin/userList.vue       |   2 +-
 src/components/admin/welcome.vue        | 210 +++++++++++++-----------
 src/components/index.vue                |  20 ++-
 src/components/myAside.vue              |  98 +++++------
 5 files changed, 181 insertions(+), 151 deletions(-)

diff --git a/src/components/admin/common/sidebar.vue b/src/components/admin/common/sidebar.vue
index cecd70b..a1c442d 100644
--- a/src/components/admin/common/sidebar.vue
+++ b/src/components/admin/common/sidebar.vue
@@ -94,7 +94,7 @@
         }, {
           icon: "el-icon-sugar",
           index: "/loveList",
-          title: "表白墙管理",
+          title: "科研项目管理",
           isBoss: true
         }]
       }
diff --git a/src/components/admin/userList.vue b/src/components/admin/userList.vue
index cc2ee9c..ce79896 100644
--- a/src/components/admin/userList.vue
+++ b/src/components/admin/userList.vue
@@ -20,7 +20,7 @@
         <el-table-column prop="username" label="用户名" align="center"></el-table-column>
         <el-table-column prop="phoneNumber" label="手机号" align="center"></el-table-column>
         <el-table-column prop="email" label="邮箱" align="center"></el-table-column>
-        <el-table-column label="赞赏" width="100" align="center">
+        <el-table-column label="援助" width="100" align="center">
           <template slot-scope="scope">
             <el-input size="medium" maxlength="30" v-model="scope.row.admire"
                       @blur="changeUserAdmire(scope.row)"></el-input>
diff --git a/src/components/admin/welcome.vue b/src/components/admin/welcome.vue
index be01db7..6b005d3 100644
--- a/src/components/admin/welcome.vue
+++ b/src/components/admin/welcome.vue
@@ -1,106 +1,126 @@
 <template>
-  <div>
-    <div class="welcome-title">
-      <h2 class="playful">
-        <span>欢</span>
-        <span>迎</span>
-        <span>光</span>
-        <span>临</span>
-      </h2>
+  <div class="home">
+    <h1>Welcome to the Admin Dashboard!</h1>
+    <p>Here, you can manage all aspects of your application.</p>
+
+    <div class="stats-container">
+      <div class="stat-card">
+        <div class="stat-icon">
+          <i class="fas fa-users"></i>
+        </div>
+        <div class="stat-info">
+          <h2>网站今日访问量</h2>
+          <p>{{historyInfo.ip_count_today}}</p>
+        </div>
+      </div>
+
+
+      <div class="stats-container">
+        <div class="stat-card">
+          <div class="stat-icon">
+            <i class="fas fa-users"></i>
+          </div>
+          <div class="stat-info">
+            <h2>网站昨日访问量</h2>
+            <p>{{historyInfo.ip_count_yest}}</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="stat-card">
+        <div class="stat-icon">
+          <i class="fas fa-shopping-cart"></i>
+        </div>
+        <div class="stat-info">
+          <h2>网站总访问量</h2>
+          <p>{{historyInfo.ip_history_count}}</p>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {}
-    },
-
-    computed: {},
-
-    watch: {},
-
-    created() {
-
-    },
-
-    mounted() {
-
-    },
-
-    methods: {}
+export default {
+  data() {
+    return {
+      historyInfo: {}
+    };
+  },
+
+  computed: {},
+
+  watch: {},
+
+  created() {
+    this.getHistoryInfo();
+  },
+
+  mounted() {},
+
+  methods: {
+    getHistoryInfo() {
+      this.$http.get(this.$constant.baseURL + "/webInfo/getHistoryInfo", {}, true)
+        .then((res) => {
+          if (!this.$common.isEmpty(res.data)) {
+            this.historyInfo = res.data;
+          }
+        })
+        .catch((error) => {
+          this.$message({
+            message: error.message,
+            type: "error"
+          });
+        });
+    }
   }
+};
 </script>
 
 <style scoped>
-
-  .welcome-title {
-    text-align: center;
-    font-size: 50px;
-    font-weight: bold;
-  }
-
-  .playful span {
-    position: relative;
-    color: #5362f6;
-    text-shadow: 0.25px 0.25px #e485f8, 0.5px 0.5px #e485f8, 0.75px 0.75px #e485f8,
-    1px 1px #e485f8, 1.25px 1.25px #e485f8, 1.5px 1.5px #e485f8, 1.75px 1.75px #e485f8,
-    2px 2px #e485f8, 2.25px 2.25px #e485f8, 2.5px 2.5px #e485f8, 2.75px 2.75px #e485f8,
-    3px 3px #e485f8, 3.25px 3.25px #e485f8, 3.5px 3.5px #e485f8, 3.75px 3.75px #e485f8,
-    4px 4px #e485f8, 4.25px 4.25px #e485f8, 4.5px 4.5px #e485f8, 4.75px 4.75px #e485f8,
-    5px 5px #e485f8, 5.25px 5.25px #e485f8, 5.5px 5.5px #e485f8, 5.75px 5.75px #e485f8,
-    6px 6px #e485f8;
-    animation: scatter 1.75s infinite;
-    font-weight: normal;
-  }
-
-  .playful span:nth-child(2n) {
-    color: #ed625c;
-    text-shadow: 0.25px 0.25px #f2a063, 0.5px 0.5px #f2a063, 0.75px 0.75px #f2a063,
-    1px 1px #f2a063, 1.25px 1.25px #f2a063, 1.5px 1.5px #f2a063, 1.75px 1.75px #f2a063,
-    2px 2px #f2a063, 2.25px 2.25px #f2a063, 2.5px 2.5px #f2a063, 2.75px 2.75px #f2a063,
-    3px 3px #f2a063, 3.25px 3.25px #f2a063, 3.5px 3.5px #f2a063, 3.75px 3.75px #f2a063,
-    4px 4px #f2a063, 4.25px 4.25px #f2a063, 4.5px 4.5px #f2a063, 4.75px 4.75px #f2a063,
-    5px 5px #f2a063, 5.25px 5.25px #f2a063, 5.5px 5.5px #f2a063, 5.75px 5.75px #f2a063,
-    6px 6px #f2a063;
-    animation-delay: 0.3s;
-  }
-
-  .playful span:nth-child(3n) {
-    color: #ffd913;
-    text-shadow: 0.25px 0.25px #6ec0a9, 0.5px 0.5px #6ec0a9, 0.75px 0.75px #6ec0a9,
-    1px 1px #6ec0a9, 1.25px 1.25px #6ec0a9, 1.5px 1.5px #6ec0a9, 1.75px 1.75px #6ec0a9,
-    2px 2px #6ec0a9, 2.25px 2.25px #6ec0a9, 2.5px 2.5px #6ec0a9, 2.75px 2.75px #6ec0a9,
-    3px 3px #6ec0a9, 3.25px 3.25px #6ec0a9, 3.5px 3.5px #6ec0a9, 3.75px 3.75px #6ec0a9,
-    4px 4px #6ec0a9, 4.25px 4.25px #6ec0a9, 4.5px 4.5px #6ec0a9, 4.75px 4.75px #6ec0a9,
-    5px 5px #6ec0a9, 5.25px 5.25px #6ec0a9, 5.5px 5.5px #6ec0a9, 5.75px 5.75px #6ec0a9,
-    6px 6px #6ec0a9;
-    animation-delay: 0.15s;
-  }
-
-  .playful span:nth-child(5n) {
-    color: #555bff;
-    text-shadow: 0.25px 0.25px #e485f8, 0.5px 0.5px #e485f8, 0.75px 0.75px #e485f8,
-    1px 1px #e485f8, 1.25px 1.25px #e485f8, 1.5px 1.5px #e485f8, 1.75px 1.75px #e485f8,
-    2px 2px #e485f8, 2.25px 2.25px #e485f8, 2.5px 2.5px #e485f8, 2.75px 2.75px #e485f8,
-    3px 3px #e485f8, 3.25px 3.25px #e485f8, 3.5px 3.5px #e485f8, 3.75px 3.75px #e485f8,
-    4px 4px #e485f8, 4.25px 4.25px #e485f8, 4.5px 4.5px #e485f8, 4.75px 4.75px #e485f8,
-    5px 5px #e485f8, 5.25px 5.25px #e485f8, 5.5px 5.5px #e485f8, 5.75px 5.75px #e485f8,
-    6px 6px #e485f8;
-    animation-delay: 0.4s;
-  }
-
-  .playful span:nth-child(7n) {
-    color: #ff9c55;
-    text-shadow: 0.25px 0.25px #ff5555, 0.5px 0.5px #ff5555, 0.75px 0.75px #ff5555,
-    1px 1px #ff5555, 1.25px 1.25px #ff5555, 1.5px 1.5px #ff5555, 1.75px 1.75px #ff5555,
-    2px 2px #ff5555, 2.25px 2.25px #ff5555, 2.5px 2.5px #ff5555, 2.75px 2.75px #ff5555,
-    3px 3px #ff5555, 3.25px 3.25px #ff5555, 3.5px 3.5px #ff5555, 3.75px 3.75px #ff5555,
-    4px 4px #ff5555, 4.25px 4.25px #ff5555, 4.5px 4.5px #ff5555, 4.75px 4.75px #ff5555,
-    5px 5px #ff5555, 5.25px 5.25px #ff5555, 5.5px 5.5px #ff5555, 5.75px 5.75px #ff5555,
-    6px 6px #ff5555;
-    animation-delay: 0.25s;
-  }
-
+.home {
+  text-align: center;
+  padding: 20px;
+}
+
+h1 {
+  font-size: 32px;
+  color: #333;
+  margin-bottom: 20px;
+}
+
+p {
+  font-size: 18px;
+  color: #666;
+  margin-bottom: 40px;
+}
+
+.stats-container {
+  display: flex;
+  justify-content: space-around;
+}
+
+.stat-card {
+  background-color: #f2f2f2;
+  padding: 20px;
+  border-radius: 5px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.stat-icon {
+  font-size: 24px;
+  color: #333;
+  margin-bottom: 10px;
+}
+
+.stat-info h2 {
+  font-size: 18px;
+  color: #333;
+  margin-bottom: 5px;
+}
+
+.stat-info p {
+  font-size: 14px;
+  color: #666;
+}
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index 852d33a..7d3de4c 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -82,13 +82,11 @@
               <div class="announcement background-opacity">
                 <i class="fa fa-volume-up" aria-hidden="true"></i>
                 <div>
-                  <!--                  <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">-->
-                  <!--                    {{ notice }}-->
-                  <!--                  </div>-->
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;世界上只有一种真正的英雄主义，那就是看清生活的真相之后，依然勇敢地热爱生活。
+                                    <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">
+                                      {{ notice }}
+                                    </div>
                 </div>
               </div>
-              <articleList :articleList="articles"></articleList>
 
               <template>
                 <div class="shadow-box pagination-wrap background-opacity">
@@ -119,6 +117,18 @@
                     :total=this.pagination.total>
                   </el-pagination>
                 </div>
+
+                <articleList :articleList="articles"></articleList>
+
+                <div class="pagination-wrap">
+                  <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">
+                    下一页
+                  </div>
+                  <div v-else style="user-select: none">
+                    ~~到底啦~~
+                  </div>
+                </div>
+
               </template>
 
 
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index b76bd7d..2082c9a 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -52,53 +52,6 @@
       </div>
     </div>
 
-    <!-- 推荐文章 -->
-<!--    <div v-if="!$common.isEmpty(recommendArticles)"-->
-<!--         style="padding: 25px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"-->
-<!--         class="shadow-box background-opacity wow">-->
-<!--      <div class="card-content2-title">-->
-<!--        <i class="el-icon-reading card-content2-icon"></i>-->
-<!--        <span>推荐文章</span>-->
-<!--      </div>-->
-<!--      <div v-for="(article, index) in recommendArticles"-->
-<!--           :key="index"-->
-<!--           @click="$router.push({path: '/article', query: {id: article.id}})">-->
-<!--        <div class="aside-post-detail">-->
-<!--          <div class="aside-post-image">-->
-<!--            <el-image lazy class="my-el-image" :src="article.articleCover" fit="cover">-->
-<!--              <div slot="error" class="image-slot">-->
-<!--                <div class="error-aside-image">-->
-<!--                  {{article.username}}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-image>-->
-<!--          </div>-->
-<!--          <div class="aside-post-title">-->
-<!--            {{ article.articleTitle }}-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="aside-post-date">-->
-<!--          <i class="el-icon-date" style="color: var(&#45;&#45;greyFont)"></i>{{ article.createTime }}-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-
-    <!-- 速览 -->
-    <div v-for="(sort, index) in sortInfo"
-         @click="selectSort(sort)"
-         :key="index"
-         :style="{background: $constant.sortColor[index % $constant.sortColor.length]}"
-         class="shadow-box-mini background-opacity wow"
-         style="position: relative;padding: 10px 25px 15px;border-radius: 10px;animation: hideToShow 1s ease-in-out;margin-top: 30px;cursor: pointer;color: var(--white)">
-      <div>速览</div>
-      <div class="sort-name">
-        {{sort.sortName}}
-      </div>
-      <div style="font-weight: bold;margin-top: 15px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden">
-        {{sort.sortDescription}}
-      </div>
-    </div>
-
     <!-- 分类 -->
     <div class="shadow-box background-opacity wow"
          style="margin-top: 30px;padding: 25px 25px 5px;border-radius: 10px;animation: hideToShow 1s ease-in-out">
@@ -117,6 +70,54 @@
       {{drugDetails}}
     </div>
 
+    <!-- 推荐文章 -->
+    <div v-if="!$common.isEmpty(recommendArticles)"
+         style="padding: 25px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"
+         class="shadow-box background-opacity wow">
+      <div class="card-content2-title">
+        <i class="el-icon-reading card-content2-icon"></i>
+        <span>推荐文章</span>
+      </div>
+      <div v-for="(article, index) in recommendArticles"
+           :key="index"
+           @click="$router.push({path: '/article', query: {id: article.id}})">
+        <div class="aside-post-detail">
+          <div class="aside-post-image">
+            <el-image lazy class="my-el-image" :src="article.articleCover" fit="cover">
+              <div slot="error" class="image-slot">
+                <div class="error-aside-image">
+                  {{article.username}}
+                </div>
+              </div>
+            </el-image>
+          </div>
+          <div class="aside-post-title">
+            {{ article.articleTitle }}
+          </div>
+        </div>
+        <div class="aside-post-date">
+          <i class="el-icon-date" style="color: var(--greyFont)"></i>{{ article.createTime }}
+        </div>
+      </div>
+    </div>
+
+    <!-- 速览 -->
+<!--    <div v-for="(sort, index) in sortInfo"-->
+<!--         @click="selectSort(sort)"-->
+<!--         :key="index"-->
+<!--         :style="{background: $constant.sortColor[index % $constant.sortColor.length]}"-->
+<!--         class="shadow-box-mini background-opacity wow"-->
+<!--         style="position: relative;padding: 10px 25px 15px;border-radius: 10px;animation: hideToShow 1s ease-in-out;margin-top: 30px;cursor: pointer;color: var(&#45;&#45;white)">-->
+<!--      <div>速览</div>-->
+<!--      <div class="sort-name">-->
+<!--        {{sort.sortName}}-->
+<!--      </div>-->
+<!--      <div style="font-weight: bold;margin-top: 15px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden">-->
+<!--        {{sort.sortDescription}}-->
+<!--      </div>-->
+<!--    </div>-->
+
+
     <!-- 赞赏 -->
     <div class="shadow-box-mini background-opacity wow admire-box"
          v-if="!$common.isEmpty(admires)">
@@ -137,8 +138,7 @@
               </div>
             </div>
             <div style="height: 36px;line-height: 36px">
-<!--              {{ item.admire }}元-->
-              500元
+              {{ item.admire }}元
             </div>
           </div>
         </vue-seamless-scroll>