Skip to content

S
SEMI
提交 0b731f60 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

更新需求

上级 ddb8c169
隐藏空白字符变更
内嵌 并排
正在显示 包含 147 行增加 和 80 行删除
src/services/api/systemApi/log/logApi.ts
浏览文件 @ 0b731f60
...@@ -9,7 +9,8 @@ export function getkingdeeLog( ...@@ -9,7 +9,8 @@ export function getkingdeeLog(
name?: string, name?: string,
flag?: any, flag?: any,
costTimeFrom?: number, costTimeFrom?: number,
costTimeTo?: number costTimeTo?: number,
queueId?: string
) { ) {
return request({ return request({
url: "/api/kingdee/log/list", url: "/api/kingdee/log/list",
...@@ -23,6 +24,7 @@ export function getkingdeeLog( ...@@ -23,6 +24,7 @@ export function getkingdeeLog(
flag, flag,
costTimeFrom, costTimeFrom,
costTimeTo, costTimeTo,
queueId,
}, },
}); });
} }
......
src/views/manage/kingdeeLog.vue
浏览文件 @ 0b731f60
<template> <template>
<div class="router"> <div class="router">
<el-card> <el-card>
<el-space direction="vertical" alignment="align-items: left" style="margin-top: 30px"> <!-- <el-space direction="vertical" alignment="align-items: left" style="margin-top: 30px"> -->
<!-- 过滤条件框 --> <!-- 过滤条件框 -->
<div> <el-form :model="filterForm" style="width: 100%" label-width="125px">
<el-form :model="filterForm"> <el-row :gutter="24">
<el-space :size="40"> <el-col :span="8">
<el-form-item label="选择时间："> <el-form-item label="选择时间：">
<el-date-picker v-model="dateTime" type="datetimerange" range-separator="至" start-placeholder="开始时间" <el-date-picker v-model="dateTime" type="datetimerange" range-separator="至" start-placeholder="开始时间"
end-placeholder="结束时间" @change="dateChange" /> end-placeholder="结束时间" @change="dateChange" />
</el-form-item> </el-form-item>
<el-form-item label="名称：" width="60px"> </el-col>
<el-input v-model="filterForm.name" placeholder="请输入名称" clearable /> <el-col :span="6">
</el-form-item> <el-form-item label="名称：" width="60px">
<el-form-item label="同步时间 / ms："> <el-input v-model="filterForm.name" placeholder="请输入名称" clearable />
<el-row> </el-form-item>
<el-input v-model="filterForm.costTimeFrom" controls-position="right" @change="handleNumberFrom" </el-col>
:input-style="{ width: '30%' }" placeholder="开始同步时间" /> <el-col></el-col>
<span style="margin: 0 20px;">至</span> <el-col :span="8">
<el-form-item label="同步时间 / 毫秒：">
<el-row justify="start">
<el-col :span="10">
<el-input v-model="filterForm.costTimeFrom" controls-position="right" @input="handleNumberChangeFrom"
placeholder="开始同步时间" />
</el-col>
<span style="margin: 0 20px;">至</span>
<el-col :span="10">
<el-input v-model="filterForm.costTimeTo" controls-position="right" placeholder="结束同步时间" <el-input v-model="filterForm.costTimeTo" controls-position="right" placeholder="结束同步时间"
@change="handleNumberTo" :input-style="{ width: '30%' }" /> @input="handleNumberChangeTo" />
</el-row> </el-col>
</el-form-item> </el-row>
<!-- <el-form-item label="开始同步时间："> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="唯一标识：" width="60px">
<el-input v-model="filterForm.queueId" placeholder="请输入唯一标识" clearable />
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: center;">
<el-button type="primary" @click="handleScreen">筛选</el-button>
</el-col>
</el-row>
</el-form>
</el-form-item> -->
<el-form-item style="margin-left: -200%; ">
<el-button type="primary" @click="handleScreen">筛选</el-button>
</el-form-item>
</el-space>
</el-form>
</div>
</el-space>
<el-divider /> <el-divider />
...@@ -40,19 +51,27 @@ ...@@ -40,19 +51,27 @@
@selection-change="handleSelectionChange" @filter-change="filterChange"> @selection-change="handleSelectionChange" @filter-change="filterChange">
<!-- <el-table-column type="selection" width="55" /> --> <!-- <el-table-column type="selection" width="55" /> -->
<el-table-column type="index" :index="indexMethod(1)" /> <el-table-column type="index" :index="indexMethod(1)" />
<el-table-column prop="flag" label="同步状态" :filters="[ <el-table-column prop="flag" label="是否成功" :filters="[
{ text: '同步成功', value: '1' }, { text: '成功', value: '1' },
{ text: '同步失败', value: '0' }, { text: '失败', value: '0' },
]" :filter-multiple="false" filter-placement="bottom-end" align="center" width="155px"> ]" :filter-multiple="false" filter-placement="bottom-end" align="center" width="135px">
<template #default="scope"> <template #default="scope">
<el-tag :type="scope.row.flag === 1 ? 'success' : ''" disable-transitions>{{ scope.row.flag === 1 ? "同步成功" : <el-tag :type="scope.row.flag === 1 ? 'success' : ''" disable-transitions>{{ scope.row.flag === 1 ? "成功" :
"同步失败" "失败"
}}</el-tag> }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="单据名称" align="center" /> <el-table-column prop="name" label="单据名称" align="center" />
<el-table-column prop="costTime" label="同步时长 / ms" align="center" /> <el-table-column prop="costTime" label="同步时长 / 毫秒" align="center" />
<el-table-column prop="message" label="错误信息" align="center" show-overflow-tooltip /> <el-table-column prop="queueId" label="唯一标识" align="center" />
<el-table-column prop="message" label="错误信息" align="center">
<template #default="scope">
<el-tooltip class="box-item" effect="dark" :content="scope.row.message" placement="left"
popper-class="tooltip-class">
<span style="white-space: nowrap">{{ scope.row.message }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center" /> <el-table-column prop="createTime" label="创建时间" align="center" />
<el-table-column label="操作" align="center" width="155px"> <el-table-column label="操作" align="center" width="155px">
<template #default="scope"> <template #default="scope">
...@@ -73,14 +92,17 @@ ...@@ -73,14 +92,17 @@
<el-form-item label="单据名称："> <el-form-item label="单据名称：">
<el-input v-model="detailForm.name" placeholder="单据名称为" /> <el-input v-model="detailForm.name" placeholder="单据名称为" />
</el-form-item> </el-form-item>
<el-form-item label="同步状态："> <el-form-item label="是否成功：">
<el-tag :type="detailForm.flag === 1 ? 'success' : ''" disable-transitions>{{ detailForm.flag === 1 ? "同步成功" : <el-tag :type="detailForm.flag === 1 ? 'success' : ''" disable-transitions>{{ detailForm.flag === 1 ? "成功" :
"同步失败" "失败"
}}</el-tag> }}</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="同步时长 / ms："> <el-form-item label="同步时长 / 毫秒：">
<el-input v-model="detailForm.costTime" placeholder="同步时长为" /> <el-input v-model="detailForm.costTime" placeholder="同步时长为" />
</el-form-item> </el-form-item>
<el-form-item label="唯一标识：">
<el-input v-model="detailForm.queueId" placeholder="唯一标识为" />
</el-form-item>
<el-form-item label="创建时间："> <el-form-item label="创建时间：">
<el-input v-model="detailForm.createTime" placeholder="创建时间为" /> <el-input v-model="detailForm.createTime" placeholder="创建时间为" />
</el-form-item> </el-form-item>
...@@ -121,7 +143,8 @@ const filterForm = ref({ ...@@ -121,7 +143,8 @@ const filterForm = ref({
dateTo: "", dateTo: "",
name: "", name: "",
costTimeFrom: <any>undefined, costTimeFrom: <any>undefined,
costTimeTo: <any>undefined costTimeTo: <any>undefined,
queueId: ''
}); });
const detailForm = ref<any>({ const detailForm = ref<any>({
flag: "", flag: "",
...@@ -129,6 +152,7 @@ const detailForm = ref<any>({ ...@@ -129,6 +152,7 @@ const detailForm = ref<any>({
request: "", request: "",
response: "", response: "",
message: "", message: "",
queueId: ''
}); });
const indexMethod = (index: number) => { const indexMethod = (index: number) => {
return index++; return index++;
...@@ -158,7 +182,8 @@ const filterChange = (value: any) => { ...@@ -158,7 +182,8 @@ const filterChange = (value: any) => {
filterForm.value.name, filterForm.value.name,
filters.value, filters.value,
filterForm.value.costTimeFrom, filterForm.value.costTimeFrom,
filterForm.value.costTimeTo filterForm.value.costTimeTo,
filterForm.value.queueId
); );
}); });
}; };
...@@ -193,7 +218,8 @@ const handleScreen = () => { ...@@ -193,7 +218,8 @@ const handleScreen = () => {
filterForm.value.name, filterForm.value.name,
filters.value, filters.value,
filterForm.value.costTimeFrom, filterForm.value.costTimeFrom,
filterForm.value.costTimeTo filterForm.value.costTimeTo,
filterForm.value.queueId
); );
}; };
// 筛选 // 筛选
...@@ -206,6 +232,7 @@ const page = ( ...@@ -206,6 +232,7 @@ const page = (
flag?: any, flag?: any,
costTimeFrom?: number, costTimeFrom?: number,
costTimeTo?: number, costTimeTo?: number,
queueId?: string
) => { ) => {
getkingdeeLog( getkingdeeLog(
pageNo, pageNo,
...@@ -215,7 +242,8 @@ const page = ( ...@@ -215,7 +242,8 @@ const page = (
name, name,
flag, flag,
costTimeFrom, costTimeFrom,
costTimeTo costTimeTo,
queueId
).then((res: any) => { ).then((res: any) => {
if (res.code === 200) { if (res.code === 200) {
tableList.value = res.data.records; tableList.value = res.data.records;
...@@ -236,7 +264,8 @@ const handleSizeChange = (val: number) => { ...@@ -236,7 +264,8 @@ const handleSizeChange = (val: number) => {
filterForm.value.name, filterForm.value.name,
filters.value, filters.value,
filterForm.value.costTimeFrom, filterForm.value.costTimeFrom,
filterForm.value.costTimeTo filterForm.value.costTimeTo,
filterForm.value.queueId
); );
// if (val === pageSize.value) return; // if (val === pageSize.value) return;
// page(val, pageSize.value); // page(val, pageSize.value);
...@@ -252,14 +281,24 @@ const handleCurrentChange = (val: number) => { ...@@ -252,14 +281,24 @@ const handleCurrentChange = (val: number) => {
filterForm.value.name, filterForm.value.name,
filters.value, filters.value,
filterForm.value.costTimeFrom, filterForm.value.costTimeFrom,
filterForm.value.costTimeTo filterForm.value.costTimeTo,
filterForm.value.queueId
); );
}; };
const handleNumberFrom = (value: any) => filterForm.value.costTimeFrom = value const handleNumberChangeFrom = (value: any) => {
const handleNumberTo = (value: any) => { let regPos = /^\+?[1-9][0-9]*$/; // 非负整数
if (regPos.test(value)) {
filterForm.value.costTimeFrom = value
} else {
filterForm.value.costTimeFrom = ''
ElMessage({ type: 'warning', message: '请输入整数' })
}
}
const handleNumberChangeTo = (value: any) => {
filterForm.value.costTimeTo = value filterForm.value.costTimeTo = value
// 比较同步时间大小 // 比较同步时间大小
let regPos = /^\+?[1-9][0-9]*$/; // 非负整数
if (filterForm.value.costTimeFrom >= filterForm.value.costTimeTo) { if (filterForm.value.costTimeFrom >= filterForm.value.costTimeTo) {
filterForm.value.costTimeTo = '' filterForm.value.costTimeTo = ''
ElMessage({ type: 'warning', message: '同步结束时间不得小于开始同步时间' }) ElMessage({ type: 'warning', message: '同步结束时间不得小于开始同步时间' })
...@@ -267,5 +306,8 @@ const handleNumberTo = (value: any) => { ...@@ -267,5 +306,8 @@ const handleNumberTo = (value: any) => {
} }
</script> </script>
<style scoped> <style>
.tooltip-class {
max-width: 20%;
}
</style> </style>
src/views/manage/thirdPartyLog.vue
浏览文件 @ 0b731f60
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
<el-form-item label="名称：" width="60px"> <el-form-item label="名称：" width="60px">
<el-input v-model="filterForm.name" placeholder="请输入名称" clearable /> <el-input v-model="filterForm.name" placeholder="请输入名称" clearable />
</el-form-item> </el-form-item>
<el-form-item label="唯一标识：" width="60px">
<el-input v-model="filterForm.queueId" placeholder="请输入唯一标识" clearable />
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleScreen">筛选</el-button> <el-button type="primary" @click="handleScreen">筛选</el-button>
</el-form-item> </el-form-item>
...@@ -28,20 +31,28 @@ ...@@ -28,20 +31,28 @@
@selection-change="handleSelectionChange" @filter-change="filterChange"> @selection-change="handleSelectionChange" @filter-change="filterChange">
<!-- <el-table-column type="selection" width="55" /> --> <!-- <el-table-column type="selection" width="55" /> -->
<el-table-column type="index" :index="indexMethod(1)" /> <el-table-column type="index" :index="indexMethod(1)" />
<el-table-column prop="flag" label="同步状态" :filters="[ <el-table-column prop="flag" label="是否成功" :filters="[
{ text: '同步成功', value: '1' }, { text: '成功', value: '1' },
{ text: '同步失败', value: '0' }, { text: '失败', value: '0' },
]" :filter-multiple="false" filter-placement="bottom-end" align="center" width="155px"> ]" :filter-multiple="false" filter-placement="bottom-end" align="center" width="135px">
<template #default="scope"> <template #default="scope">
<el-tag :type="scope.row.flag === 1 ? 'success' : ''" disable-transitions>{{ scope.row.flag === <el-tag :type="scope.row.flag === 1 ? 'success' : ''" disable-transitions>{{ scope.row.flag ===
1 ? "同步成功" : 1 ? "成功" :
"同步失败" "失败"
}}</el-tag> }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="单据名称" align="center" /> <el-table-column prop="name" label="单据名称" align="center" />
<el-table-column prop="code" label="DocType" align="center" /> <el-table-column prop="code" label="DocType" align="center" />
<el-table-column prop="message" label="错误信息" align="center" show-overflow-tooltip /> <el-table-column prop="queueId" label="唯一标识" align="center" />
<el-table-column prop="message" label="错误信息" align="center" show-overflow-tooltip effect="light">
<template #default="scope">
<el-tooltip class="box-item" effect="dark" :content="scope.row.message" placement="left"
popper-class="tooltip-class">
<span style="white-space: nowrap">{{ scope.row.message }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center" /> <el-table-column prop="createTime" label="创建时间" align="center" />
<el-table-column label="操作" align="center" width="155px"> <el-table-column label="操作" align="center" width="155px">
<template #default="scope"> <template #default="scope">
...@@ -63,18 +74,18 @@ ...@@ -63,18 +74,18 @@
<el-form-item label="单据名称："> <el-form-item label="单据名称：">
<el-input v-model="detailForm.name" placeholder="DocType为" /> <el-input v-model="detailForm.name" placeholder="DocType为" />
</el-form-item> </el-form-item>
<el-form-item label="同步状态："> <el-form-item label="是否成功：">
<el-tag :type="detailForm.flag === 1 ? 'success' : ''" disable-transitions>{{ detailForm.flag === 1 <el-tag :type="detailForm.flag === 1 ? 'success' : ''" disable-transitions>{{ detailForm.flag === 1
? "同步成功" : ? "成功" :
"同步失败" "失败"
}}</el-tag> }}</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="DocType："> <el-form-item label="DocType：">
<el-input v-model="detailForm.code" placeholder="内容为" /> <el-input v-model="detailForm.code" placeholder="内容为" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="同步时长(毫秒)："> <el-form-item label="唯一标识：">
<el-input v-model="detailForm.costTime" placeholder="同步时长为为" /> <el-input v-model="detailForm.queueId" placeholder="唯一标识为" />
</el-form-item> --> </el-form-item>
<el-form-item label="创建时间："> <el-form-item label="创建时间：">
<el-input v-model="detailForm.createTime" placeholder="创建时间为" /> <el-input v-model="detailForm.createTime" placeholder="创建时间为" />
</el-form-item> </el-form-item>
...@@ -116,6 +127,7 @@ const filterForm = ref({ ...@@ -116,6 +127,7 @@ const filterForm = ref({
dateTo: "", dateTo: "",
name: "", name: "",
code: "", code: "",
queueId: ''
}); });
const detailForm = ref({ const detailForm = ref({
flag: <any>"", flag: <any>"",
...@@ -126,6 +138,7 @@ const detailForm = ref({ ...@@ -126,6 +138,7 @@ const detailForm = ref({
message: "", message: "",
// costTime: "", // costTime: "",
createTime: "", createTime: "",
queueId: ''
}); });
const indexMethod = (index: number) => { const indexMethod = (index: number) => {
return index++; return index++;
...@@ -153,10 +166,12 @@ const filterChange = (value: any) => { ...@@ -153,10 +166,12 @@ const filterChange = (value: any) => {
filterForm.value.dateFrom, filterForm.value.dateFrom,
filterForm.value.dateTo, filterForm.value.dateTo,
filterForm.value.name, filterForm.value.name,
filters.value filters.value,
filterForm.value.queueId
); );
}); });
}; };
// 日期变化值
const dateChange = (value: any) => { const dateChange = (value: any) => {
filterForm.value.dateFrom = moment(value[0]).format("YYYY-MM-DD HH:mm:ss"); filterForm.value.dateFrom = moment(value[0]).format("YYYY-MM-DD HH:mm:ss");
filterForm.value.dateTo = moment(value[1]).format("YYYY-MM-DD HH:mm:ss"); filterForm.value.dateTo = moment(value[1]).format("YYYY-MM-DD HH:mm:ss");
...@@ -186,7 +201,8 @@ const handleScreen = () => { ...@@ -186,7 +201,8 @@ const handleScreen = () => {
filterForm.value.dateFrom, filterForm.value.dateFrom,
filterForm.value.dateTo, filterForm.value.dateTo,
filterForm.value.name, filterForm.value.name,
filters.value filters.value,
filterForm.value.queueId
); );
}; };
// 筛选 // 筛选
...@@ -196,7 +212,8 @@ const page = ( ...@@ -196,7 +212,8 @@ const page = (
dateFrom?: string, dateFrom?: string,
dateTo?: string, dateTo?: string,
name?: string, name?: string,
flag?: any flag?: any,
queueId?: string
) => { ) => {
getThirdPartyLog( getThirdPartyLog(
pageNo, pageNo,
...@@ -204,7 +221,8 @@ const page = ( ...@@ -204,7 +221,8 @@ const page = (
dateFrom, dateFrom,
dateTo, dateTo,
name, name,
flag flag,
queueId
).then((res: any) => { ).then((res: any) => {
if (res.code === 200) { if (res.code === 200) {
tableList.value = res.data.records; tableList.value = res.data.records;
...@@ -223,7 +241,8 @@ const handleSizeChange = (val: number) => { ...@@ -223,7 +241,8 @@ const handleSizeChange = (val: number) => {
filterForm.value.dateFrom, filterForm.value.dateFrom,
filterForm.value.dateTo, filterForm.value.dateTo,
filterForm.value.name, filterForm.value.name,
filters.value filters.value,
filterForm.value.queueId
); );
// if (val === pageSize.value) return; // if (val === pageSize.value) return;
// page(val, pageSize.value); // page(val, pageSize.value);
...@@ -237,9 +256,13 @@ const handleCurrentChange = (val: number) => { ...@@ -237,9 +256,13 @@ const handleCurrentChange = (val: number) => {
filterForm.value.dateFrom, filterForm.value.dateFrom,
filterForm.value.dateTo, filterForm.value.dateTo,
filterForm.value.name, filterForm.value.name,
filters.value filters.value,
filterForm.value.queueId
); );
}; };
</script> </script>
<style scoped> <style>
.tooltip-class {
max-width: 20%;
}
</style> </style>
src/views/system/userManage.vue
浏览文件 @ 0b731f60
<template> <template>
<div class="router"> <div class="router" style="padding: 20px;">
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="账号"> <el-form-item label="账号">
<el-input placeholder="账号模糊查询"></el-input> <el-input placeholder="账号模糊查询"></el-input>
...@@ -83,18 +83,18 @@ const tableColumn = reactive([ ...@@ -83,18 +83,18 @@ const tableColumn = reactive([
// label:'职位', // label:'职位',
// prop:'fposition' // prop:'fposition'
// }, // },
{ // {
label: '入职日期', // label: '入职日期',
prop: 'finductionDate' // prop: 'finductionDate'
}, // },
{ {
label: '英文名', label: '英文名',
prop: 'fenglishName' prop: 'fenglishName'
}, },
{ // {
label: '部门', // label: '部门',
prop: 'fdept' // prop: 'fdept'
}, // },
{ {
label: '头像', label: '头像',
prop: 'avatar' prop: 'avatar'
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论