From f9b9156c8a6e5f4dc3b19dcd965409fefbac315f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 28 二月 2020 17:34:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/tool/gen/importTable.vue | 5 ++++-
ruoyi-ui/src/views/monitor/operlog/index.vue | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index 9430168..3af8e62 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -143,7 +143,7 @@
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
- <el-form-item label="鎿嶄綔妯″潡锛�">{{ form.title }} / 淇敼</el-form-item>
+ <el-form-item label="鎿嶄綔妯″潡锛�">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<el-form-item
label="鐧诲綍淇℃伅锛�"
>{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
index e4b30c2..fd98460 100644
--- a/ruoyi-ui/src/views/tool/gen/importTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/importTable.vue
@@ -26,7 +26,7 @@
</el-form-item>
</el-form>
<el-row>
- <el-table :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+ <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="tableName" label="琛ㄥ悕绉�"></el-table-column>
<el-table-column prop="tableComment" label="琛ㄦ弿杩�"></el-table-column>
@@ -76,6 +76,9 @@
this.getList();
this.visible = true;
},
+ clickRow(row) {
+ this.$refs.table.toggleRowSelection(row);
+ },
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.tables = selection.map(item => item.tableName);
--
Gitblit v1.9.3