yangjun
/
DBSD_ZJPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-11-27 16:27:16 +08:00
parent a7ed61c34f
commit df1938f556
6 changed files with 174 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/utils/SFTPUtil.java
View File

@ -64,10 +64,10 @@ public class SFTPUtil {
channel.connect();
sftp = (ChannelSftp) channel;
logger.info("登录成功");
}else{
Channel channel = sshSession.openChannel("sftp");
channel.connect();
sftp = (ChannelSftp) channel;
// }else{
// Channel channel = sshSession.openChannel("sftp");
// channel.connect();
// sftp = (ChannelSftp) channel;
}
} catch (Exception e){
try{

1
jeecgboot-vue3/src/utils/encryption/signMd5Utils.js
View File

@ -39,7 +39,6 @@ export default class signMd5Utils {
//update-end---author:wangshuai---date:2024-04-16---for:【QQYUN-9005】发送短信加签---
let requestBody = this.sortAsc(jsonObj);
delete requestBody._t;
console.log('sign requestBody:', requestBody);
return md5(JSON.stringify(requestBody) + signatureSecret).toUpperCase();
}

51
jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue
View File

@ -21,7 +21,11 @@
<a-button type="primary" style="margin-left: 10px; margin-bottom: 15px" @click="handleFanhui">查看材料</a-button>
</a-form>
</div>
<a-table :columns="columns2" :data-source="checkData" :pagination="false">
<a-table :columns="columns2" :data-source="checkData"
v-model:current="paginationYxkcProp.current"
:total="paginationYxkcProp.total"
:pagination="paginationYxkcProp"
@change="onPageYxkcChange">
<template #title><span class="seleciton-line">1</span> <span class="selection-title">已选论文</span></template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
@ -531,6 +535,12 @@ const paginationProp = ref<any>({
pageSize: 10,
pageNo: 1,
});
const paginationYxkcProp = ref<any>({
total: 1,
current: 1,
pageSize: 10,
pageNo: 1,
});
/**
* 查询
*/
@ -543,6 +553,13 @@ function handleXuanke() {
searchQuery2();
}
//翻页方法
async function onPageYxkcChange(record) {
paginationYxkcProp.value.current = record.current;
paginationYxkcProp.value.pageSize = record.pageSize;
console.log("🚀 ~ onPageYxkcChange ~ paginationYxkcProp.value:", paginationYxkcProp.value)
await init2();
}
//选课提交
function handleXUanze(record) {
record.mainId = record.id;
@ -566,9 +583,16 @@ async function handleDel(record) {
function xtsuccess() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
checkData.value = res.records;
if(res.current>res.pages){
paginationYxkcProp.value.current =res.pages
xtsuccess()
}else{
paginationYxkcProp.value.current = res.current;
}
paginationYxkcProp.value.total = res.total;
});
searchQuery2();
}
@ -577,10 +601,11 @@ function xtsuccess() {
*/
function searchQuery2() {
queryParam2.value.pageNo = paginationProp.value.current;
defHttp.get({ url: '/lwKhcl/lwKhcl/getXkList', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => {
console.log("🚀 ~ searchQuery2 ~ paginationProp.value:", paginationProp.value)
defHttp.get({ url: '/lwKhcl/lwKhcl/getXkList', params: { pageNo: paginationProp.value.current,pageSize:paginationProp.value.pageSize, ...queryParam2.value } }).then((res) => {
dataList.value = res.records;
paginationProp.value.total = res.total;
paginationProp.value.current = res.pageNo;
paginationProp.value.current = res.current;
});
}
@ -588,6 +613,8 @@ function searchQuery2() {
async function onPageChange(record) {
console.log('👬', record);
paginationProp.value.current = record.current;
paginationProp.value.pageSize = record.pageSize;
console.log("🚀 ~ onPageChange ~ paginationProp.value:", paginationProp.value)
await searchQuery2();
}
@ -598,7 +625,7 @@ function handleFanhui() {
function init() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
if (res.records.length == 0) {
sfxk.value = 0;
@ -606,12 +633,22 @@ function init() {
} else {
sfxk.value = 999;
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
paginationYxkcProp.value.current = res.current;
paginationYxkcProp.value.total = res.total;
}
});
}
function init2() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
checkData.value = res.records;
paginationYxkcProp.value.current = res.current;
paginationYxkcProp.value.total = res.total;
});
}
// 自动请求并暴露内部方法
onMounted(() => {
init();

52
jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue
View File

@ -21,7 +21,11 @@
<a-button type="primary" style="margin-left: 10px; margin-bottom: 15px" @click="handleFanhui">查看材料</a-button>
</a-form>
</div>
<a-table :columns="columns2" :data-source="checkData" :pagination="false">
<a-table :columns="columns2" :data-source="checkData"
v-model:current="paginationYxkcProp.current"
:total="paginationYxkcProp.total"
:pagination="paginationYxkcProp"
@change="onPageYxkcChange">
<template #title><span class="seleciton-line">1</span> <span class="selection-title">已选论文</span></template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
@ -518,6 +522,12 @@ const paginationProp = ref<any>({
pageSize: 10,
pageNo: 1,
});
const paginationYxkcProp = ref<any>({
total: 1,
current: 1,
pageSize: 10,
pageNo: 1,
});
/**
* 查询
*/
@ -552,9 +562,16 @@ async function handleDel(record) {
function xtsuccess() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: {pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
checkData.value = res.records;
if(res.current>res.pages){
paginationYxkcProp.value.current =res.pages
xtsuccess()
}else{
paginationYxkcProp.value.current = res.current;
}
paginationYxkcProp.value.total = res.total;
});
searchQuery2();
}
@ -563,10 +580,10 @@ function xtsuccess() {
*/
function searchQuery2() {
queryParam2.value.pageNo = paginationProp.value.current;
defHttp.get({ url: '/lwKhcl/lwKhcl/getXkList', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => {
defHttp.get({ url: '/lwKhcl/lwKhcl/getXkList', params: { pageNo: paginationProp.value.current,pageSize:paginationProp.value.pageSize, ...queryParam2.value } }).then((res) => {
dataList.value = res.records;
paginationProp.value.total = res.total;
paginationProp.value.current = res.pageNo;
// paginationProp.value.current = res.pageNo;
});
}
@ -574,33 +591,36 @@ function searchQuery2() {
async function onPageChange(record) {
console.log('👬', record);
paginationProp.value.current = record.current;
paginationProp.value.pageSize = record.pageSize;
await searchQuery2();
}
//翻页方法
async function onPageYxkcChange(record) {
paginationYxkcProp.value.current = record.current;
paginationYxkcProp.value.pageSize = record.pageSize;
console.log("🚀 ~ onPageYxkcChange ~ paginationYxkcProp.value:", paginationYxkcProp.value)
await init();
}
//返回首页
function handleFanhui() {
sfxk.value = 999;
init();
}
function init() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
if (res.records.length == 0) {
sfxk.value = 0;
checkData.value = [];
} else {
sfxk.value = 999;
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
}
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
});
}
function init2() {
//获取是否有选课信息
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
if (res.records.length == 0) {
sfxk.value = 0;
@ -608,8 +628,8 @@ function init2() {
} else {
sfxk.value = 1;
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
searchQuery2();
}
});

56
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue
View File

@ -25,7 +25,11 @@
</div>
<a-table :columns="columns2" :data-source="checkData" :pagination="false">
<a-table :columns="columns2" :data-source="checkData"
v-model:current="paginationYxkcProp.current"
:total="paginationYxkcProp.total"
:pagination="paginationYxkcProp"
@change="onPageYxkcChange">
<template #title><span class="seleciton-line">1</span> <span class="selection-title">已选课程</span></template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
@ -395,6 +399,12 @@ const paginationProp = ref<any>({
pageSize: 10,
pageNo: 1,
});
const paginationYxkcProp = ref<any>({
total: 1,
current: 1,
pageSize: 10,
pageNo: 1,
});
//成绩单
function handleCjd(record) {
sfxk.value = 2;
@ -428,7 +438,15 @@ function handleXsysclxq(record) {
function handleFanhui() {
init();
}
function init2() {}
function init2() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛11111', res);
checkData.value = res.records;
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
});
}
//选课确认
function handleQueren(record) {
@ -448,9 +466,15 @@ async function handleDel(record) {
function xtsuccess() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageSize: -1 } }).then((res) => {
console.log('🧛', res);
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
checkData.value = res.records;
if(res.current>res.pages){
paginationYxkcProp.value.current =res.pages
xtsuccess()
}else{
paginationYxkcProp.value.current = res.current;
}
paginationYxkcProp.value.total = res.total;
});
searchQuery2();
}
@ -458,8 +482,18 @@ function xtsuccess() {
async function onPageChange(record) {
console.log('👬', record);
paginationProp.value.current = record.current;
paginationProp.value.pageSize = record.pageSize;
await searchQuery2();
}
//翻页方法
async function onPageYxkcChange(record) {
paginationYxkcProp.value.current = record.current;
paginationYxkcProp.value.pageSize = record.pageSize;
console.log("🚀 ~ onPageYxkcChange ~ paginationYxkcProp.value:", paginationYxkcProp.value)
await init2();
}
//下载本地文件
function textDown(type, downame) {
var a = document.createElement('a'); //创建一个<a></a>标签
@ -578,11 +612,10 @@ function searchQuery() {
function searchQuery2() {
queryParam2.value.pageNo = paginationProp.value.current;
queryParam2.value.fileShztmc = '审核通过';
console.log('🧛', queryParam2);
defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => {
defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current,pageSize:paginationProp.value.pageSize, ...queryParam2.value } }).then((res) => {
dataList.value = res.records;
paginationProp.value.total = res.total;
paginationProp.value.current = res.pageNo;
// paginationProp.value.current = res.pageNo;
});
}
@ -598,16 +631,17 @@ function searchReset() {
function init() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageSize: -1 } }).then((res) => {
console.log('🧛', res);
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛11111', res);
if (res.records.length == 0) {
sfxk.value = 0;
checkData.value = [];
} else {
sfxk.value = 999;
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
console.log("🚀 ~ defHttp.get ~ paginationYxkcProp.value:", paginationYxkcProp.value)
}
});
}

62
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue
View File

@ -25,7 +25,12 @@
</div>
<a-table :columns="columns2" :data-source="checkData" :pagination="false">
<a-table :columns="columns2" :data-source="checkData"
v-model:current="paginationYxkcProp.current"
:total="paginationYxkcProp.total"
:pagination="paginationYxkcProp"
@change="onPageYxkcChange"
>
<template #title><span class="seleciton-line">1</span> <span class="selection-title">已选课程</span></template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
@ -395,6 +400,15 @@ const paginationProp = ref<any>({
pageSize: 10,
pageNo: 1,
});
const paginationYxkcProp = ref<any>({
total: 1,
current: 1,
pageSize: 10,
pageNo: 1,
});
//成绩单
function handleCjd(record) {
sfxk.value = 2;
@ -447,9 +461,16 @@ async function handleDel(record) {
function xtsuccess() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
checkData.value = res.records;
if(res.current>res.pages){
paginationYxkcProp.value.current =res.pages
xtsuccess()
}else{
paginationYxkcProp.value.current = res.current;
}
paginationYxkcProp.value.total = res.total;
});
searchQuery2();
}
@ -457,8 +478,20 @@ function xtsuccess() {
async function onPageChange(record) {
console.log('👬', record);
paginationProp.value.current = record.current;
paginationProp.value.pageSize = record.pageSize;
console.log("🚀 ~ onPageChange ~ paginationProp.value.current:", paginationProp.value)
await searchQuery2();
}
//翻页方法
async function onPageYxkcChange(record) {
paginationYxkcProp.value.current = record.current;
paginationYxkcProp.value.pageSize = record.pageSize;
await init();
}
//下载本地文件
function textDown(type, downame) {
var a = document.createElement('a'); //创建一个<a></a>标签
@ -576,11 +609,13 @@ function searchQuery() {
*/
function searchQuery2() {
queryParam2.value.pageNo = paginationProp.value.current;
console.log("🚀 ~ searchQuery2 ~ paginationProp:", paginationProp)
queryParam2.value.fileShztmc = '审核通过';
defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => {
console.log("🚀 ~ searchQuery2 ~ queryParam2:", queryParam2)
defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current,pageSize:paginationProp.value.pageSize, ...queryParam2.value } }).then((res) => {
dataList.value = res.records;
paginationProp.value.total = res.total;
paginationProp.value.current = res.pageNo;
// paginationProp.value.current = res.pageNo;
});
}
@ -596,22 +631,15 @@ function searchReset() {
function init() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageSize: -1 } }).then((res) => {
console.log('🧛', res);
if (res.records.length == 0) {
sfxk.value = 0;
checkData.value = [];
} else {
sfxk.value = 999;
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
}
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
});
}
function init2() {
//获取是否有选课信息
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageSize: -1 } }).then((res) => {
defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => {
console.log('🧛', res);
if (res.records.length == 0) {
sfxk.value = 0;
@ -619,8 +647,8 @@ function init2() {
} else {
sfxk.value = 1;
checkData.value = res.records;
paginationProp.value.total = res.records.total;
paginationProp.value.current = res.records.pages;
paginationYxkcProp.value.total = res.total;
paginationYxkcProp.value.current = res.current;
searchQuery2();
}
});