修改bug

This commit is contained in:
yangjun 2024-06-26 21:57:51 +08:00
parent 74b180333f
commit b9987b0d99
8 changed files with 852 additions and 1 deletions

View File

@ -0,0 +1,72 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/blLoginLog/blLoginLog/list',
save='/blLoginLog/blLoginLog/add',
edit='/blLoginLog/blLoginLog/edit',
deleteOne = '/blLoginLog/blLoginLog/delete',
deleteBatch = '/blLoginLog/blLoginLog/deleteBatch',
importExcel = '/blLoginLog/blLoginLog/importExcel',
exportXls = '/blLoginLog/blLoginLog/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

View File

@ -0,0 +1,107 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '日志内容',
align: "center",
dataIndex: 'logContent'
},
{
title: '操作用户账号',
align: "center",
dataIndex: 'userid'
},
{
title: '操作用户名称',
align: "center",
dataIndex: 'username'
},
{
title: 'IP',
align: "center",
dataIndex: 'ip'
},
{
title: '登录时间',
align: "center",
dataIndex: 'createTime'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '日志类型1登录日志2操作日志, 3.租户操作日志)',
field: 'logType',
component: 'InputNumber',
},
{
label: '日志内容',
field: 'logContent',
component: 'Input',
},
{
label: '操作类型',
field: 'operateType',
component: 'InputNumber',
},
{
label: '操作用户账号',
field: 'userid',
component: 'Input',
},
{
label: '操作用户名称',
field: 'username',
component: 'Input',
},
{
label: 'IP',
field: 'ip',
component: 'Input',
},
{
label: '请求java方法',
field: 'method',
component: 'Input',
},
{
label: '请求路径',
field: 'requestUrl',
component: 'Input',
},
{
label: '请求参数',
field: 'requestParam',
component: 'InputTextArea',
},
{
label: '请求类型',
field: 'requestType',
component: 'Input',
},
{
label: '耗时',
field: 'costTime',
component: 'InputNumber',
},
{
label: '租户ID',
field: 'tenantId',
component: 'InputNumber',
},
// TODO 主键隐藏字段目前写死为ID
{
label: '',
field: 'id',
component: 'Input',
show: false,
},
];

View File

@ -0,0 +1,234 @@
<template>
<div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item label="用户账号">
<j-input placeholder="请输入用户账号" v-model:value="queryParam.userid"></j-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="用户名称">
<j-input placeholder="请输入用户名称" v-model:value="queryParam.username"></j-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="开始时间">
<a-date-picker
:showTime="false"
valueFormat="YYYY-MM-DD"
:placeholder="'请选择开始时间'"
v-model:value="queryParam.startTime"
style="width:200px;"
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="结束时间">
<a-date-picker
:showTime="false"
valueFormat="YYYY-MM-DD"
:placeholder="'请选择结束时间'"
v-model:value="queryParam.endTime"
style="width:200px;"
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 10px;"> 导出</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable">
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<!--省市区字段回显插槽-->
<!--<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>-->
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<BlLoginLogModal ref="registerModal" @success="handleSuccess"></BlLoginLogModal>
</div>
</template>
<script lang="ts" name="blLoginLog-blLoginLog" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './BlLoginLog.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BlLoginLog.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import BlLoginLogModal from './components/BlLoginLogModal.vue'
import { JInput } from '/@/components/Form';
const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
api: list,
columns,
canResize:false,
useSearchForm: false,
showActionColumn: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => {
params.column = '',params.order = '';//
return Object.assign(params, queryParam.value);
},
},
exportConfig: {
name: "登录日志",
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs: { span: 24 },
sm: { span: 7 },
});
const wrapperCol = reactive({
xs: { span: 24 },
sm: { span: 16 },
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
queryParam.value = {};
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
width: calc(50% - 15px);
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
}
</style>

View File

@ -0,0 +1,72 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<BlLoginLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BlLoginLogForm>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import BlLoginLogForm from './BlLoginLogList.vue'
const title = ref<string>('');
const width = ref<string>('80%');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

View File

@ -0,0 +1,193 @@
<template>
<a-spin :spinning="confirmLoading">
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="24">
<a-form-item label="日志类型1登录日志2操作日志, 3.租户操作日志)" v-bind="validateInfos.logType">
<a-input-number v-model:value="formData.logType" placeholder="请输入日志类型1登录日志2操作日志, 3.租户操作日志)" style="width: 100%" :disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="日志内容" v-bind="validateInfos.logContent">
<a-input v-model:value="formData.logContent" placeholder="请输入日志内容" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="操作类型" v-bind="validateInfos.operateType">
<a-input-number v-model:value="formData.operateType" placeholder="请输入操作类型" style="width: 100%" :disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="操作用户账号" v-bind="validateInfos.userid">
<a-input v-model:value="formData.userid" placeholder="请输入操作用户账号" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="操作用户名称" v-bind="validateInfos.username">
<a-input v-model:value="formData.username" placeholder="请输入操作用户名称" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="IP" v-bind="validateInfos.ip">
<a-input v-model:value="formData.ip" placeholder="请输入IP" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="请求java方法" v-bind="validateInfos.method">
<a-input v-model:value="formData.method" placeholder="请输入请求java方法" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="请求路径" v-bind="validateInfos.requestUrl">
<a-input v-model:value="formData.requestUrl" placeholder="请输入请求路径" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="请求参数" v-bind="validateInfos.requestParam">
<a-textarea v-model:value="formData.requestParam" rows="4" placeholder="请输入请求参数" :disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="请求类型" v-bind="validateInfos.requestType">
<a-input v-model:value="formData.requestType" placeholder="请输入请求类型" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="耗时" v-bind="validateInfos.costTime">
<a-input-number v-model:value="formData.costTime" placeholder="请输入耗时" style="width: 100%" :disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="租户ID" v-bind="validateInfos.tenantId">
<a-input-number v-model:value="formData.tenantId" placeholder="请输入租户ID" style="width: 100%" :disabled="disabled"/>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../BlLoginLog.api';
import { Form } from 'ant-design-vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: ()=>{} },
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
logType: undefined,
logContent: '',
operateType: undefined,
userid: '',
username: '',
ip: '',
method: '',
requestUrl: '',
requestParam: '',
requestType: '',
costTime: undefined,
tenantId: undefined,
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
//
Object.assign(formData, record);
});
}
/**
* 提交数据
*/
async function submitForm() {
//
await validate();
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
min-height: 500px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
</style>

View File

@ -0,0 +1,75 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<BlLoginLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BlLoginLogForm>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import BlLoginLogForm from './BlLoginLogForm.vue'
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

View File

@ -49,7 +49,7 @@
<a-button type="primary" class="yyyClass" @click="toLivePage(item)" disabled>听课</a-button>
</a-col> -->
<a-col :span="24" style="text-align: center;">
<a-button type="primary" class="yyClass" @click="funpingjia(item)" >评价</a-button>
<a-button type="primary" class="yyClass" @click="funpingjia(item)" :disabled="handleDis(item)" >评价</a-button>
</a-col>
</a-row>
@ -99,6 +99,17 @@ function isNow(item){
}
}
function handleDis(item){
console.log(`🚀 ~ handleDis ~ item:`, item)
const jssj = dayjs(item.skrq + " " +item.jssj, 'YYYY-MM-DD hh:mm:ss');
var dqsj = dayjs(new Date());
if(dqsj.unix() < jssj.unix()){
return true;
}else{
return false;
}
}
/**
* 报错事件
*/

View File

@ -0,0 +1,87 @@
<template>
<div class="indexBackClass" id="stuwdkcDom">
<div style="margin-top: 20px;">
<span style="margin-left: 30px;font-size: 24px;font-weight: 600;">工作台</span>
</div>
<div style="min-height:70px;">
<a-row>
<a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 10px;margin-bottom: 10px;" v-for="(item,index2) in dataSource" :key="index2">
<a-row style="margin-top: 15px;">
<a-col :span="18" style="text-align:left;padding-left:15px;">
<!-- {{item.content}} -->
<div>{{index2+1}}{{item.content}}</div>
<div>发布时间{{item.createTime}}</div>
</a-col>
<a-col :span="6" style="text-align:right">
<a-button type="primary" @click="openKecheng(item)">查看</a-button>
</a-col>
</a-row>
</a-col>
<a-col :span="24" v-show="dataSource.length == 0" style="text-align: center;">
<!-- <a-empty/> -->
<span>暂无通知</span>
</a-col>
</a-row>
</div>
</div>
</template>
<script lang="ts" setup>
import { defHttp } from '/@/utils/http/axios';
import { ref, onMounted } from 'vue';
import { getSysConfig } from '/@/views/site/utils/index';
//
import { useUserStore } from '/@/store/modules/user';
const userStore = useUserStore();
const dataSource = ref([]);
//
onMounted(() => {
loaddata()
});
function loaddata(){
defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,pageNo:1,createBy:userStore.getUserInfo.username} }).then((res) => {
dataSource.value = res.records;
});
}
function openKecheng(record){
console.log(`🚀 ~ openKecheng ~ record:`, record)
defHttp.post({ url: '/zyDbtx/zyDbtx/deleteById',params:{id:record.id} }).then((res) => {
loaddata()
});
var url = "/stuzy/studentMain";
if(record.type=='0'||record.type=='1'){//+
url = "/stuzy/studentDqzy";
}else if(record.type=='2'){//
url = "/stuzy/stuCeshiWenjuan";
}else if(record.type=='3'){//
url = "/stuzy/stuDcwjWenjuan";
}else if(record.type=='4'){//
url = "/stuzy/stuTlq";
}else if(record.type=='9'){//
url = "/stuzy/StudentGonggaoList";
}
url = url +"?rwbh="+record.rwbh+"&xqxn="+getSysConfig().flag1+"&teano="+record.fbr;
window.open(url,'_blank')
}
</script>
<style lang="less" scoped>
.indexBackClass{
background: #fff;
margin: 20px 0;
padding-bottom: 20px;
}
.jtkcTitleClass{
background-image: linear-gradient(to right ,#1c84c6, #67b4e5);
color: white;
line-height: 30px;
padding: 3px 0 0 10px;
font-weight: 600;
height: 30px;
}
</style>