From 39e7d8a84b71af2aaea749be2026e1e3f0a95611 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 18 Sep 2021 21:20:18 +0800
Subject: [PATCH] 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空
---
ruoyi-ui/src/views/tool/gen/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 081412b..0a10404 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -84,7 +84,7 @@
</el-row>
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="50" align="center">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -161,7 +161,7 @@
@pagination="getList"
/>
<!-- 预览界面 -->
- <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+ <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"
@@ -238,7 +238,8 @@
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
- this.resetQuery();
+ this.queryParams.pageNum = Number(this.$route.query.pageNum);
+ this.getList();
}
},
methods: {
@@ -283,7 +284,7 @@
return synchDb(tableName);
}).then(() => {
this.msgSuccess("同步成功");
- })
+ }).catch(() => {});
},
/** 打开导入表弹窗 */
openImportTable() {
@@ -319,7 +320,7 @@
/** 修改按钮操作 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
- this.$router.push("/gen/edit/" + tableId);
+ this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } });
},
/** 删除按钮操作 */
handleDelete(row) {
@@ -333,7 +334,7 @@
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
- })
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.3