cxc/qiaoba-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
ailanyin
2023-07-05 16:17:23 +08:00
parent 0b75b77f22
commit a796fdd288
7 changed files with 220 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/monitor/use_log.js
View File

@ -1,29 +1,29 @@
import request from '@/utils/request' import request from "@/utils/request";
// 查询操作日志列表 // 查询操作日志列表
export function list(query) { export function list(query) {
return request({ return request({
url: '/monitor/use-log/list', url: "/monitor/use-log/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 删除操作日志 // 删除操作日志
export function delOperlog(ids) { export function delOperlog(ids) {
return request({ return request({
url: '/monitor/use-log', url: "/monitor/use-log",
method: 'delete', method: "delete",
data: { data: {
ids: ids ids: ids,
} },
}) });
} }
// 清空操作日志 // 清空操作日志
export function cleanOperlog() { export function cleanOperlog() {
return request({ return request({
url: '/monitor/use-log/clean', url: "/monitor/use-log/clean",
method: 'delete' method: "delete",
}) });
} }

41
src/constant/dict.js
View File

@ -190,28 +190,27 @@ export const init_status_dict = [
]; ];
export const doc_flag_dict = [ export const doc_flag_dict = [
{ {
label: "关", label: "关",
value: "0", value: "0",
elTagType: "warning", elTagType: "warning",
}, },
{ {
label: "开", label: "开",
value: "1", value: "1",
elTagType: "success", elTagType: "success",
} },
]; ];
export const excel_flag_dict = [ export const excel_flag_dict = [
{ {
label: "关", label: "关",
value: "0", value: "0",
elTagType: "warning", elTagType: "warning",
} },
, {
{ label: "开",
label: "开", value: "1",
value: "1", elTagType: "success",
elTagType: "success", },
}
]; ];

2
src/views/monitor/use_log/index.vue
View File

@ -248,7 +248,7 @@
<script setup name="Operlog"> <script setup name="Operlog">
import { list, delOperlog, cleanOperlog } from "@/api/monitor/use_log"; import { list, delOperlog, cleanOperlog } from "@/api/monitor/use_log";
import { sys_oper_type,sys_common_status } from "@/constant/dict"; import { sys_oper_type, sys_common_status } from "@/constant/dict";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();

8
src/views/tenant/initialize.vue
View File

@ -72,10 +72,10 @@
<div class="card-content-item"> <div class="card-content-item">
<span class="card-content-item-title">模式:</span> <span class="card-content-item-title">模式:</span>
<span class="card-content-item-value">{{ <span class="card-content-item-value">{{
tenant_mode_dict.find( tenant_mode_dict.find(
(item) => item.value === tenantInitCheckResult.mode (item) => item.value === tenantInitCheckResult.mode
)?.label )?.label
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>

32
src/views/tool/gen/genInfoForm.vue
View File

@ -64,18 +64,18 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文档"> <el-form-item label="文档">
<el-switch <el-switch
v-model="info.docFlag" v-model="info.docFlag"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Excel导出"> <el-form-item label="Excel导出">
<el-switch <el-switch
v-model="info.excelFlag" v-model="info.excelFlag"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -86,8 +86,8 @@
<template #label> <template #label>
上级菜单 上级菜单
<el-tooltip <el-tooltip
content="分配到指定菜单下，例如 系统管理" content="分配到指定菜单下，例如 系统管理"
placement="top" placement="top"
> >
<el-icon> <el-icon>
<question-filled /> <question-filled />
@ -95,24 +95,20 @@
</el-tooltip> </el-tooltip>
</template> </template>
<el-tree-select <el-tree-select
v-model="info.parentMenuId" v-model="info.parentMenuId"
:data="menuOptions" :data="menuOptions"
check-strictly check-strictly
:props="{ :props="{
value: 'menuId', value: 'menuId',
label: 'menuName', label: 'menuName',
children: 'children', children: 'children',
}" }"
placeholder="选择上级部门" placeholder="选择上级部门"
value-key="menuId" value-key="menuId"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</template> </template>

4
src/views/tool/gen/importTable.vue
View File

@ -3,7 +3,7 @@
<el-dialog <el-dialog
title="导入表" title="导入表"
v-model="visible" v-model="visible"
width="800px" width="900px"
top="5vh" top="5vh"
append-to-body append-to-body
> >
@ -13,6 +13,7 @@
v-model="queryParams.tableName" v-model="queryParams.tableName"
placeholder="请输入表名称" placeholder="请输入表名称"
clearable clearable
style="width: 200px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -21,6 +22,7 @@
v-model="queryParams.tableComment" v-model="queryParams.tableComment"
placeholder="请输入表描述" placeholder="请输入表描述"
clearable clearable
style="width: 200px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>

341
src/views/tool/gen/index.vue
View File

@ -1,32 +1,32 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryRef" ref="queryRef"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
> >
<el-form-item label="表名称" prop="tableName"> <el-form-item label="表名称" prop="tableName">
<el-input <el-input
v-model="queryParams.tableName" v-model="queryParams.tableName"
placeholder="请输入表名称" placeholder="请输入表名称"
clearable clearable
style="width: 200px" style="width: 200px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="表描述" prop="tableComment"> <el-form-item label="表描述" prop="tableComment">
<el-input <el-input
v-model="queryParams.tableComment" v-model="queryParams.tableComment"
placeholder="请输入表描述" placeholder="请输入表描述"
clearable clearable
style="width: 200px" style="width: 200px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery" <el-button type="primary" icon="Search" @click="handleQuery"
>搜索 >搜索
</el-button> </el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
@ -35,221 +35,210 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="info" type="info"
plain plain
icon="Upload" icon="Upload"
@click="openImportTable" @click="openImportTable"
v-hasPermi="['tool:gen:import']" v-hasPermi="['tool:gen:import']"
>导入 >导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
:disabled="single" :disabled="single"
@click="handleEditTable" @click="handleEditTable"
v-hasPermi="['tool:gen:edit']" v-hasPermi="['tool:gen:edit']"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['tool:gen:remove']" v-hasPermi="['tool:gen:remove']"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar <right-toolbar
v-model:showSearch="showSearch" v-model:showSearch="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableList" :data="tableList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
type="selection" type="selection"
align="center" align="center"
width="55" width="55"
></el-table-column> ></el-table-column>
<el-table-column label="序号" type="index" width="50" align="center"> <el-table-column label="序号" type="index" width="50" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ <span>{{
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="表名称" label="表名称"
align="center" align="center"
prop="tableName" prop="tableName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="表描述" label="表描述"
align="center" align="center"
prop="tableComment" prop="tableComment"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="实体" label="实体"
align="center" align="center"
prop="className" prop="className"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="作者" label="作者"
align="center" align="center"
prop="author" prop="author"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="包路径" label="包路径"
align="center" align="center"
prop="packageName" prop="packageName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- docFlag --> <!-- docFlag -->
<el-table-column <el-table-column label="文档" align="center" prop="docFlag">
label="文档" <template #default="{ row }">
align="center" <dict-tag :value="row.docFlag" :options="doc_flag_dict"></dict-tag>
prop="docFlag" </template>
> </el-table-column>
<template #default="{row}"> <el-table-column label="导出Excel" align="center" prop="excelFlag">
<template #default="{ row }">
<dict-tag <dict-tag
:value="row.docFlag" :value="row.excelFlag"
:options="doc_flag_dict" :options="excel_flag_dict"
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="导出Excel" label="操作"
align="center" align="center"
prop="excelFlag" width="330"
> class-name="small-padding fixed-width"
<template #default="{row}">
<dict-tag
:value="row.excelFlag"
:options="excel_flag_dict"
></dict-tag>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="330"
class-name="small-padding fixed-width"
> >
<template #default="scope"> <template #default="scope">
<el-tooltip content="预览" placement="top"> <el-tooltip content="预览" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
icon="View" icon="View"
@click="handlePreview(scope.row)" @click="handlePreview(scope.row)"
v-hasPermi="['tool:gen:preview']" v-hasPermi="['tool:gen:preview']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="编辑" placement="top"> <el-tooltip content="编辑" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
icon="Edit" icon="Edit"
@click="handleEditTable(scope.row)" @click="handleEditTable(scope.row)"
v-hasPermi="['tool:gen:edit']" v-hasPermi="['tool:gen:edit']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['tool:gen:remove']" v-hasPermi="['tool:gen:remove']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="同步" placement="top"> <el-tooltip content="同步" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
icon="Refresh" icon="Refresh"
@click="handlesyncTable(scope.row)" @click="handlesyncTable(scope.row)"
v-hasPermi="['tool:gen:edit']" v-hasPermi="['tool:gen:edit']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="生成代码" placement="top"> <el-tooltip content="生成代码" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
icon="Download" icon="Download"
@click="handleGenTable(scope.row)" @click="handleGenTable(scope.row)"
v-hasPermi="['tool:gen:code']" v-hasPermi="['tool:gen:code']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 预览界面 --> <!-- 预览界面 -->
<el-dialog <el-dialog
:title="preview.title" :title="preview.title"
v-model="preview.open" v-model="preview.open"
width="80%" width="80%"
top="5vh" top="5vh"
destroy-on-close destroy-on-close
append-to-body append-to-body
class="scrollbar" class="scrollbar"
> >
<el-tabs v-model="preview.activeName"> <el-tabs v-model="preview.activeName">
<el-tab-pane <el-tab-pane
v-for="(value, key) in preview.data" v-for="(value, key) in preview.data"
:label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))" :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))"
:name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))" :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))"
:key="value" :key="value"
> >
<el-link <el-link
:underline="false" :underline="false"
icon="DocumentCopy" icon="DocumentCopy"
v-copyText="value" v-copyText="value"
v-copyText:callback="copyTextSuccess" v-copyText:callback="copyTextSuccess"
style="float: right" style="float: right"
>&nbsp;复制 >&nbsp;复制
</el-link> </el-link>
<highlightjs :code="value"></highlightjs> <highlightjs :code="value"></highlightjs>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-dialog> </el-dialog>
<import-table ref="importRef" @ok="handleQuery"/> <import-table ref="importRef" @ok="handleQuery" />
</div> </div>
</template> </template>
<script setup name="Gen" lang="jsx"> <script setup name="Gen" lang="jsx">
import {delTable, listTable, previewTable, syncTable} from "@/api/tool/gen"; import { delTable, listTable, previewTable, syncTable } from "@/api/tool/gen";
import router from "@/router"; import router from "@/router";
import importTable from "./importTable"; import importTable from "./importTable";
import {ElMessageBox} from "element-plus"; import { ElMessageBox } from "element-plus";
import {ref} from "vue"; import { ref } from "vue";
import useSettingsStore from "@/store/modules/settings"; import useSettingsStore from "@/store/modules/settings";
import DictTag from "@/components/DictTag/index.vue"; import DictTag from "@/components/DictTag/index.vue";
import {doc_flag_dict, excel_flag_dict} from "@/constant/dict"; import { doc_flag_dict, excel_flag_dict } from "@/constant/dict";
const route = useRoute(); const route = useRoute();
const {proxy} = getCurrentInstance(); const { proxy } = getCurrentInstance();
const tableList = ref([]); const tableList = ref([]);
const loading = ref(true); const loading = ref(true);
@ -276,7 +265,7 @@ const data = reactive({
}, },
}); });
const {queryParams, preview} = toRefs(data); const { queryParams, preview } = toRefs(data);
onActivated(() => { onActivated(() => {
const time = route.query.t; const time = route.query.t;
@ -312,16 +301,16 @@ function handleGenTable(row) {
downloadArg.value = useSettingsStore().downloadGenCodeType; downloadArg.value = useSettingsStore().downloadGenCodeType;
// jsx vnode 单选:全部, Java, SQL // jsx vnode 单选:全部, Java, SQL
const h = () => ( const h = () => (
<el-form> <el-form>
<el-form-item prop="downloadArg"> <el-form-item prop="downloadArg">
<el-radio-group v-model={downloadArg.value}> <el-radio-group v-model={downloadArg.value}>
<el-radio label="all">全部</el-radio> <el-radio label="all">全部</el-radio>
<el-radio label="vue">vue</el-radio> <el-radio label="vue">vue</el-radio>
<el-radio label="java">Java</el-radio> <el-radio label="java">Java</el-radio>
<el-radio label="sql">SQL</el-radio> <el-radio label="sql">SQL</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
); );
ElMessageBox.confirm(h, "下载类型", { ElMessageBox.confirm(h, "下载类型", {
"custom-class": "gen-download-type", "custom-class": "gen-download-type",
@ -329,8 +318,8 @@ function handleGenTable(row) {
}).then(() => { }).then(() => {
useSettingsStore().setDownloadGenCodeType(downloadArg.value); useSettingsStore().setDownloadGenCodeType(downloadArg.value);
proxy.$download.zip( proxy.$download.zip(
`/tool/gen/download/${row.tableId}/${downloadArg.value}`, `/tool/gen/download/${row.tableId}/${downloadArg.value}`,
`${row.tableName}_${downloadArg.value}.zip` `${row.tableName}_${downloadArg.value}.zip`
); );
}); });
} }
@ -339,15 +328,14 @@ function handleGenTable(row) {
function handlesyncTable(row) { function handlesyncTable(row) {
const tableName = row.tableName; const tableName = row.tableName;
proxy.$modal proxy.$modal
.confirm('确认要强制同步"' + tableName + '"表结构吗？') .confirm('确认要强制同步"' + tableName + '"表结构吗？')
.then(function () { .then(function () {
return syncTable(row.tableId); return syncTable(row.tableId);
}) })
.then(() => { .then(() => {
proxy.$modal.msgSuccess("同步成功"); proxy.$modal.msgSuccess("同步成功");
}) })
.catch(() => { .catch(() => {});
});
} }
/** 打开导入表弹窗 */ /** 打开导入表弹窗 */
@ -368,8 +356,8 @@ function handlePreview(row) {
preview.value.open = true; preview.value.open = true;
const firstTab = Object.keys(response.data)[0]; const firstTab = Object.keys(response.data)[0];
preview.value.activeName = firstTab.substring( preview.value.activeName = firstTab.substring(
firstTab.lastIndexOf("/") + 1, firstTab.lastIndexOf("/") + 1,
firstTab.indexOf(".qb") firstTab.indexOf(".qb")
); );
}); });
} }
@ -392,7 +380,7 @@ function handleEditTable(row) {
const tableId = row.tableId || ids.value[0]; const tableId = row.tableId || ids.value[0];
router.push({ router.push({
path: "/tool/gen-edit/index/" + tableId, path: "/tool/gen-edit/index/" + tableId,
query: {pageNum: queryParams.value.pageNum}, query: { pageNum: queryParams.value.pageNum },
}); });
} }
@ -400,16 +388,15 @@ function handleEditTable(row) {
function handleDelete(row) { function handleDelete(row) {
const tableIds = row.tableId || ids.value; const tableIds = row.tableId || ids.value;
proxy.$modal proxy.$modal
.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？') .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？')
.then(function () { .then(function () {
return delTable(tableIds); return delTable(tableIds);
}) })
.then(() => { .then(() => {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}) })
.catch(() => { .catch(() => {});
});
} }
getList(); getList();