Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
shidongli 2024-07-15 16:57:00 +08:00
commit 4104787581

View File

@ -1,7 +1,14 @@
<template> <template>
<div class="app-container" ref="layout"> <div class="app-container" ref="layout">
<div ref="topform" class="form"> <div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="画像标签和知识库字段表id" prop="termCode"> <!-- <el-form-item label="画像标签和知识库字段表id" prop="termCode">
<el-input <el-input
v-model="queryParams.termCode" v-model="queryParams.termCode"
@ -11,7 +18,12 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="内容名称" prop="termName"> <el-form-item label="内容名称" prop="termName">
<el-input v-model="queryParams.termName" placeholder="请输入内容名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.termName"
placeholder="请输入内容名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="父编码" prop="parentTermCode"> <!-- <el-form-item label="父编码" prop="parentTermCode">
<el-input <el-input
@ -38,35 +50,80 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div ref="mb8" class="mb8"> <div ref="mb8" class="mb8">
<el-row :gutter="10" class=""> <el-row :gutter="10" class="">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['system:bank:add']">新增</el-button> type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:bank:add']"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button
v-hasPermi="['system:bank:edit']">修改</el-button> type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:bank:edit']"
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button
v-hasPermi="['system:bank:remove']">删除</el-button> type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:bank:remove']"
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button
v-hasPermi="['system:bank:export']">导出</el-button> type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:bank:export']"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
</div> </div>
<div ref="table"> <div ref="table">
<el-table :max-height="maxTableHeight" v-loading="loading" :data="bankList" <el-table
@selection-change="handleSelectionChange"> :max-height="maxTableHeight"
v-loading="loading"
:data="bankList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> --> <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<!-- <el-table-column <!-- <el-table-column
@ -79,24 +136,60 @@
<!-- <el-table-column label="父编码" align="center" prop="parentTermCode" /> --> <!-- <el-table-column label="父编码" align="center" prop="parentTermCode" /> -->
<el-table-column label="层级" align="center" prop="termLevel" /> <el-table-column label="层级" align="center" prop="termLevel" />
<el-table-column label="内容排序" align="center" prop="termSort" /> <el-table-column label="内容排序" align="center" prop="termSort" />
<el-table-column label="内容备注信息" align="center" prop="termRemark" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="内容备注信息"
align="center"
prop="termRemark"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button
v-hasPermi="['system:bank:edit']">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" type="text"
v-hasPermi="['system:bank:edit']"></el-button> icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:bank:remove']">删除</el-button> v-hasPermi="['system:bank:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:bank:edit']"
></el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:bank:remove']"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改常用术语(知识库)对话框 --> <!-- 添加或修改常用术语(知识库)对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" :inline="true"> <el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
:inline="true"
>
<!-- <el-form-item label="画像标签和知识库字段表id" prop="termCode"> <!-- <el-form-item label="画像标签和知识库字段表id" prop="termCode">
<el-input <el-input
v-model="form.termCode" v-model="form.termCode"
@ -111,14 +204,20 @@
<!-- <editor v-model="form.termContent" :min-height="192" /> --> <!-- <editor v-model="form.termContent" :min-height="192" /> -->
</el-form-item> </el-form-item>
<el-form-item label="父级编码" prop="parentTermCode"> <el-form-item label="父级编码" prop="parentTermCode">
<el-input v-model="form.parentTermCode" placeholder="请输入父级编码" disabled /> <el-input
v-model="form.parentTermCode"
placeholder="请输入父级编码"
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="内容排序" prop="termSort"> <el-form-item label="内容排序" prop="termSort">
<el-input v-model="form.termSort" placeholder="请输入内容排序" /> <el-input v-model="form.termSort" placeholder="请输入内容排序" />
</el-form-item> </el-form-item>
<el-form-item label="内容备注信息" prop="termRemark"> <el-form-item label="内容备注信息" prop="termRemark">
<el-input v-model="form.termRemark" placeholder="请输入内容备注信息" /> <el-input
v-model="form.termRemark"
placeholder="请输入内容备注信息"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -197,8 +296,8 @@ export default {
}; };
}, },
mounted() { mounted() {
this.getMaxTableHeight() this.getMaxTableHeight();
this.screenChange() this.screenChange();
}, },
created() { created() {
// console.log(this.$route.query, "parentTermCode"); // console.log(this.$route.query, "parentTermCode");
@ -230,9 +329,8 @@ export default {
// this.bankList=[] // this.bankList=[]
if (e.termLevel == 3) { if (e.termLevel == 3) {
this.bankList.push(e); this.bankList.push(e);
console.log(this.bankList) console.log(this.bankList);
this.total = this.bankList.length; this.total = this.bankList.length;
} }
}); });
} else { } else {
@ -270,13 +368,14 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.bankList = [] this.bankList = [];
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.parentTermCode = this.$route.query.parentTermCode;
this.handleQuery(); this.handleQuery();
}, },
// //
@ -287,7 +386,6 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
// this.form.name = this.$route.query.termContent; // this.form.name = this.$route.query.termContent;
@ -317,14 +415,14 @@ export default {
updateBank(this.form).then((response) => { updateBank(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.bankList = [] this.bankList = [];
this.getList(); this.getList();
}); });
} else { } else {
addBank(this.form).then((response) => { addBank(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.bankList = [] this.bankList = [];
this.getList(); this.getList();
}); });
} }
@ -340,12 +438,12 @@ export default {
return delBank(ids); return delBank(ids);
}) })
.then(() => { .then(() => {
this.bankList = [] this.bankList = [];
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { }); .catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -359,26 +457,27 @@ export default {
}, },
// //
getMaxTableHeight() { getMaxTableHeight() {
const windowInnerHeight = window.innerHeight // const windowInnerHeight = window.innerHeight; //
const layoutDiv = this.$refs.layout const layoutDiv = this.$refs.layout;
const formDiv = this.$refs.topform const formDiv = this.$refs.topform;
const mb8Div = this.$refs.mb8 const mb8Div = this.$refs.mb8;
this.maxTableHeight = this.maxTableHeight =
windowInnerHeight - 134 - windowInnerHeight -
134 -
this.getBoxPadding(layoutDiv) - this.getBoxPadding(layoutDiv) -
this.getBoxHeight(mb8Div) - this.getBoxHeight(mb8Div) -
this.getBoxHeight(formDiv) this.getBoxHeight(formDiv);
}, },
// resize // resize
screenChange() { screenChange() {
// resizeresize // resizeresize
window.addEventListener('resize', this.getMaxTableHeight, true) window.addEventListener("resize", this.getMaxTableHeight, true);
// //
// //
// beforeDestroy // beforeDestroy
this.$once('hook:beforeDestroy', () => { this.$once("hook:beforeDestroy", () => {
window.removeEventListener('resize', this.getMaxTableHeight, true) window.removeEventListener("resize", this.getMaxTableHeight, true);
}) });
}, },
}, },
}; };