页面调整

web/components/UserDocument.vue

@@ -274,7 +274,7 @@ export default {
     },
     pageChange(page) {
       this.$router.push({
-        query: { page },
+        query: { ...this.query, page },
       })
     },
     deleteDocument(row) {

web/layouts/admin.vue

@@ -213,6 +213,20 @@ export default {
       ],
     }
   },
+  watch: {
+    $route(to, from) {
+      // main 滚动到顶部
+      this.$nextTick(() => {
+        const main = document.querySelector('.el-main')
+        if (main) {
+          main.scrollTo({
+            behavior: 'smooth',
+            top: 0,
+          })
+        }
+      })
+    },
+  },
   computed: {
     ...mapGetters('user', ['user', 'token', 'permissions', 'allowPages']),
     ...mapGetters('setting', ['settings']),

web/pages/admin/article.vue

@@ -170,10 +170,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
-      // this.listArticle()
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listArticle()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.article = { id: 0 }

web/pages/admin/attachment.vue

@@ -143,10 +143,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
-      // this.listAttachment()
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listAttachment()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     async editRow(row) {
       const res = await getAttachment({ id: row.id })

web/pages/admin/banner.vue

@@ -142,9 +142,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listBanner()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.banner = {}

web/pages/admin/comment.vue

@@ -174,9 +174,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listComment()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.comment = { id: 0 }

web/pages/admin/dashboard.vue

@@ -152,25 +152,37 @@
         <el-table-column prop="name" label="名称" width="100"> </el-table-column
         ><el-table-column prop="is_required" label="是否必须" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_required" effect="danger" size="small"
+            <el-tag
+              v-if="scope.row.is_required"
+              effect="dark"
+              type="danger"
+              size="small"
               >必须安装</el-tag
             >
-            <el-tag effect="info" size="small" v-else>非必须</el-tag>
+            <el-tag effect="dark" type="info" size="small" v-else
+              >非必须</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column prop="is_installed" label="安装" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_installed" effect="success" size="small"
+            <el-tag
+              v-if="scope.row.is_installed"
+              effect="dark"
+              type="success"
+              size="small"
               >已安装</el-tag
             >
-            <el-tag effect="warning" size="small" v-else>未安装</el-tag>
+            <el-tag effect="dark" type="warning" size="small" v-else
+              >未安装</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column prop="description" min-width="200" label="用途">
         </el-table-column>
         <el-table-column prop="error" label="错误" min-width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.error" effect="danger" size="small">{{
+            <span v-if="scope.row.error" size="small">{{
               scope.row.error
             }}</span>
             <span v-else>-</span>

web/pages/admin/document/category.vue

@@ -129,9 +129,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listCategory()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.category = {

web/pages/admin/document/list.vue

@@ -297,9 +297,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listDocument()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       // 新增，跳转到前台文档上传页面

web/pages/admin/document/recycle.vue

@@ -213,9 +213,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listDocument()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     recoverRow(row) {
       this.$confirm(`您确定要要恢复【${row.title}】吗？`, '温馨提示', {

web/pages/admin/friendlink.vue

@@ -149,9 +149,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.$router.push({
+          query: this.search,
+        })
+      } else {
+        this.listFriendlink()
+      }
     },
     onCreate() {
       this.friendlink = { id: 0 }

web/pages/admin/navigation.vue

@@ -159,9 +159,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listNavigation()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.navigation = { id: 0 }

web/pages/admin/report.vue

@@ -154,9 +154,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listReport()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.report = { id: 0 }

web/pages/admin/user/group.vue

@@ -174,9 +174,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listGroup()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.initGroup()

web/pages/admin/user/list.vue

@@ -189,9 +189,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listUser()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     onCreate() {
       this.formUserVisible = true

web/pages/admin/user/permission.vue

@@ -132,9 +132,19 @@ export default {
     },
     onSearch(search) {
       this.search = { ...this.search, ...search, page: 1 }
-      this.$router.push({
+      if (
-        query: this.search,
+        location.href.lastIndexOf(
-      })
+          this.$router.resolve({
+            query: this.search,
+          }).href
+        ) > -1
+      ) {
+        this.listPermission()
+      } else {
+        this.$router.push({
+          query: this.search,
+        })
+      }
     },
     async editRow(row) {
       const res = await getPermission({ id: row.id })