From 7fd164414d33dcc30d2c68af15b44371fc91b6d6 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Thu, 10 Nov 2022 14:22:23 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/dashboard.vue              | 40 +++++++++++++-------------
 pages/admin/tag/post/_tag_id.vue       |  2 +-
 pages/article/post/_article_id.vue     |  3 +-
 pages/open-data.vue                    |  7 ++---
 pages/portfolio/post/_portfolio_id.vue |  2 +-
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/pages/admin/dashboard.vue b/pages/admin/dashboard.vue
index 91a397e..e17a716 100644
--- a/pages/admin/dashboard.vue
+++ b/pages/admin/dashboard.vue
@@ -54,7 +54,7 @@
             <el-table-column label="标签" prop="articleTitle">
               <template slot-scope="scope">
                 <el-tag style="margin-left: 0.5rem;" v-for="tag in scope.row.tags" :key="tag.idTag" size="mini"
-                  effect="plain">
+                        effect="plain">
                   # {{ tag.tagTitle }}
                 </el-tag>
               </template>
@@ -64,13 +64,14 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.articlePerfect === '1'" size="mini"
-                  @click="cancelPreference(scope.$index, scope.row.idArticle)" plain>取消优选</el-button>
+                           @click="cancelPreference(scope.$index, scope.row.idArticle)" plain>取消优选
+                </el-button>
                 <el-button v-else size="mini" @click="setPreference(scope.$index, scope.row.idArticle)" plain>设为优选
                 </el-button>
                 <el-button size="mini" type="primary" @click="updateTags(scope.$index, scope.row)" plain>编辑标签
                 </el-button>
                 <el-button v-if="scope.row.articleStatus === '0'" size="mini" type="danger"
-                  @click="toggleStatus(scope.$index, scope.row)" plain>下架
+                           @click="toggleStatus(scope.$index, scope.row)" plain>下架
                 </el-button>
                 <el-button v-else size="mini" type="success" @click="toggleStatus(scope.$index, scope.row)" plain>上架
                 </el-button>
@@ -80,9 +81,9 @@
         </el-col>
         <el-col>
           <el-pagination :hide-on-single-page="true" @size-change="handleArticleSizeChange"
-            @current-change="handleArticleCurrentChange" :current-page="articles.pageNum"
-            :page-sizes="[10, 20, 50, 100]" :page-size="articles.pageSize"
-            layout="total, sizes, prev, pager, next, jumper" :total="articles.total">
+                         @current-change="handleArticleCurrentChange" :current-page="articles.pageNum"
+                         :page-sizes="[10, 20, 50, 100]" :page-size="articles.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper" :total="articles.total">
           </el-pagination>
         </el-col>
         <el-col :span="24">
@@ -111,8 +112,10 @@
         </el-col>
         <el-col>
           <el-pagination :hide-on-single-page="true" @size-change="handleUserSizeChange"
-            @current-change="handleUserCurrentChange" :current-page="users.pageNum" :page-sizes="[10, 20, 50, 100]"
-            :page-size="users.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="users.total">
+                         @current-change="handleUserCurrentChange" :current-page="users.pageNum"
+                         :page-sizes="[10, 20, 50, 100]"
+                         :page-size="users.pageSize" layout="total, sizes, prev, pager, next, jumper"
+                         :total="users.total">
           </el-pagination>
         </el-col>
         <el-col :span="24">
@@ -137,9 +140,9 @@
         </el-col>
         <el-col>
           <el-pagination :hide-on-single-page="true" @size-change="handleBankAccountSizeChange"
-            @current-change="handleBankAccountCurrentChange" :current-page="bankAccounts.pageNum"
-            :page-sizes="[10, 20, 50, 100]" :page-size="bankAccounts.pageSize"
-            layout="total, sizes, prev, pager, next, jumper" :total="bankAccounts.total">
+                         @current-change="handleBankAccountCurrentChange" :current-page="bankAccounts.pageNum"
+                         :page-sizes="[10, 20, 50, 100]" :page-size="bankAccounts.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper" :total="bankAccounts.total">
           </el-pagination>
         </el-col>
       </div>
@@ -181,7 +184,7 @@
 
 <script>
 import Vue from 'vue';
-import { mapState } from 'vuex';
+import {mapState} from 'vuex';
 import echarts from 'echarts';
 import EditTags from '~/components/widget/tags';
 
@@ -192,12 +195,11 @@ export default {
   components: {
     EditTags
   },
-  fetch() {
-    let { store, params, error } = this.$nuxt.context
+  asyncData({store, params, error}) {
     return Promise.all([
       store
         .dispatch('dashboard/fetchDashboard', params)
-        .catch(err => error({ statusCode: 404 })),
+        .catch(err => error({statusCode: 404})),
       store.dispatch("dashboard/fetchLastThirtyDays", params),
       store.dispatch("dashboard/fetchHistory", params),
       store.dispatch("dashboard/fetchNewUsers", params),
@@ -480,7 +482,7 @@ export default {
       _ts.$set(_ts, 'articleTags', article.articleTags);
       _ts.$set(_ts, 'tagsDialogVisible', true);
     },
-    toggleStatus() { },
+    toggleStatus() {},
     closeTagsDialog() {
       this.$set(this, 'tagsDialogVisible', false);
     },
@@ -529,10 +531,8 @@ export default {
   },
   mounted() {
     this.$store.commit("setActiveMenu", "admin-dashboard");
-    setTimeout(() => {
-      this.initLastThirtyDaysCharts(this.lastThirtyDays)
-      this.initHistoryCharts(this.history)
-    }, 5000);
+    this.initLastThirtyDaysCharts(this.lastThirtyDays)
+    this.initHistoryCharts(this.history)
   }
 }
 </script>
diff --git a/pages/admin/tag/post/_tag_id.vue b/pages/admin/tag/post/_tag_id.vue
index f2e2209..e0df7d7 100644
--- a/pages/admin/tag/post/_tag_id.vue
+++ b/pages/admin/tag/post/_tag_id.vue
@@ -136,7 +136,7 @@ export default {
     }
     return params.tag_id && !isNaN(Number(params.tag_id))
   },
-  fetch({store, params, error}) {
+  asyncData({store, params, error}) {
     return Promise.all([
       store.dispatch('tag/fetchPostDetail', params)
         .catch(err => error({statusCode: 404}))
diff --git a/pages/article/post/_article_id.vue b/pages/article/post/_article_id.vue
index 12e4c99..eb568ad 100644
--- a/pages/article/post/_article_id.vue
+++ b/pages/article/post/_article_id.vue
@@ -70,8 +70,7 @@
       }
       return params.article_id && !isNaN(Number(params.article_id))
     },
-    fetch() {
-      let {store, params, error} = this.$nuxt.context
+    asyncData({store, params, error}) {
       return Promise.all([
         store.dispatch('article/fetchPostDetail', params)
           .catch(err => error({statusCode: 404}))
diff --git a/pages/open-data.vue b/pages/open-data.vue
index 8401c8a..a484a28 100644
--- a/pages/open-data.vue
+++ b/pages/open-data.vue
@@ -54,8 +54,7 @@ import gzh from "assets/rymcugzh.jpg";
 Vue.prototype.$echarts = echarts;
 export default {
   name: "openData",
-  fetch() {
-    let { store, params, error } = this.$nuxt.context
+  asyncData({store, params, error}) {
     return Promise.all([
       store
         .dispatch('open-data/fetchLastThirtyDays', params)
@@ -155,9 +154,7 @@ export default {
   },
   mounted() {
     this.$store.commit("setActiveMenu", "open-data");
-    setTimeout(() => {
-      this.initLastThirtyDaysCharts(this.lastThirtyDays)
-    }, 2000);
+    this.initLastThirtyDaysCharts(this.lastThirtyDays)
   }
 }
 </script>
diff --git a/pages/portfolio/post/_portfolio_id.vue b/pages/portfolio/post/_portfolio_id.vue
index a8bcfed..2487c19 100644
--- a/pages/portfolio/post/_portfolio_id.vue
+++ b/pages/portfolio/post/_portfolio_id.vue
@@ -109,7 +109,7 @@ export default {
     }
     return params.portfolio_id && !isNaN(Number(params.portfolio_id))
   },
-  fetch({store, params, error}) {
+  asyncData({store, params, error}) {
     return Promise.all([
       store.dispatch('portfolio/fetchPostDetail', params)
         .catch(err => error({statusCode: 404}))