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

修改bug

This commit is contained in:
yangjun 2024-08-05 10:02:34 +08:00
parent b4a7b8f07e
commit 4bd1531ef5
9 changed files with 776 additions and 705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/components/Form/src/jeecg/components/JUpload/JUpload.vue
View File

@ -139,12 +139,12 @@
watch(fileList, () => nextTick(() => addActionsListener()), { immediate: true });
const loadBizFn = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getBizPath', params }, { isTransformResponse: false })
const loadBizFn = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getBizPath', params }, { isTransformResponse: false });
function loadBiz(param) {
otherData.value.loading = true;
// otherClass.value = { 'upload-disabled': true, }
loadBizFn(param).then(res => {
loadBizFn(param).then((res) => {
//otherData.value
if (res.success) {
otherData.value.biz = res.result;
@ -156,8 +156,8 @@
});
}
watch(() => props.getBizParam,
watch(
() => props.getBizParam,
(param, oldParam) => {
if (JSON.stringify(param) != JSON.stringify(oldParam)) {
nextTick(() => {
@ -281,8 +281,10 @@
//扩展验证(目前仅支持扩展名验证)
if (props.forceAcceptVerify) {
let fileName = file?.name;
console.log('👩‍⚕️', fileName);
if (fileName.indexOf('.')) {
let suffix = fileName.split('.')[1];
let suffix = fileName.split('.').pop().toLowerCase();
console.log('🤶', suffix);
let fileTypes = unref(bindProps).accept;
if (fileTypes) {
if (fileTypes.indexOf(',')) {
@ -299,7 +301,7 @@
// 扩展 beforeUpload 验证
if (typeof props.beforeUpload === 'function') {
return props.beforeUpload(file, unref(bindProps), () => uploadGoOn.value = false );
return props.beforeUpload(file, unref(bindProps), () => (uploadGoOn.value = false));
}
return true;
}
@ -411,7 +413,7 @@
*/
function openWindowWithLoading(url) {
spinning.value = true;
let fileName = url.substring(url.lastIndexOf("/")+1);
let fileName = url.substring(url.lastIndexOf('/') + 1);
let uploadAxiosHttpConfig = {
//超时时间，分钟 * 秒 * 毫秒 60分钟
timeout: 60 * 60 * 1000,
@ -420,9 +422,17 @@
//自定义前缀
apiUrl: '',
//不自动处理
isTransformResponse: false
}
ajaxDownloadFileFn(url, fileName, {}, () => { spinning.value = false; }, uploadAxiosHttpConfig);
isTransformResponse: false,
};
ajaxDownloadFileFn(
url,
fileName,
{},
() => {
spinning.value = false;
},
uploadAxiosHttpConfig
);
//spinning.value = false;
// let xhr = new XMLHttpRequest();
// xhr.open('GET',url,true);
@ -501,7 +511,7 @@
let total = file.size;
let cuLoaded = 0;
let time = 1;
console.info("文件大小：" + file.size);
console.info('文件大小：' + file.size);
//读取一段成功
reader.onload = (e) => {
//console.log("开始读取第"+time+"段");
@ -519,11 +529,11 @@
resolve(hash + buildUUID());
}
time++;
}
};
reader.onerror = (e) => {
console.error('读取文件MD5出现错误 =>', e);
reject(e);
}
};
//开始读取
readBlob(0);
//指定开始位置，分块读取文件
@ -541,9 +551,6 @@
});
}
//请求接口的数据返回
// function upSearch(data){
// return new Promise((resolve,reject)=>{
@ -585,22 +592,21 @@
//limitUp([1,2,3,4,5,6,7,8], 3)
async function limitPromise(promises, limit) {
const results = []
const results = [];
for (let i = 0; i <= promises.length; i += limit) {
const tasks = []
const tasks = [];
// 切片 Promise.all 的参数
for (const promise of promises.slice(i, i + limit)) {
tasks.push(promise)
tasks.push(promise);
}
// 用 await 以确保后面的任务不会在执行当前任务时执行
const result = await Promise.all(tasks)
results.push(...result)
const result = await Promise.all(tasks);
results.push(...result);
}
return results
return results;
}
//分片大小 5m
@ -616,8 +622,8 @@
//自定义前缀
apiUrl: baseUploadUrl,
//不自动处理
isTransformResponse: false
}
isTransformResponse: false,
};
const defUploadFn = (params) => defHttp.post({ url: '/sys/common/upload', params }, uploadAxiosHttpConfig);
@ -625,7 +631,7 @@
const bigFileUploadUpload = (params) => defHttp.post({ url: '/sys/common/sectionUpload/upload', params }, uploadAxiosHttpConfig);
const bigFileUploadEnd = (params) => defHttp.post({ url: '/sys/common/sectionUpload/end', params }, uploadAxiosHttpConfig)
const bigFileUploadEnd = (params) => defHttp.post({ url: '/sys/common/sectionUpload/end', params }, uploadAxiosHttpConfig);
/**
* 自定义文件上传方法，小于5m的走默认上传，大于5m的走切片上传
@ -638,38 +644,40 @@
if (fileSize <= chunkSize) {
let formData = new FormData();
Object.keys(data).forEach(key => {
Object.keys(data).forEach((key) => {
formData.append(key, data[key]);
});
formData.append('file', file);
//传统直传
defUploadFn(formData).then(res => {
defUploadFn(formData)
.then((res) => {
console.log(`🚀 ~ 传统直传 - defUploadFn ~ res:`, res);
if (res.success) {
onProgress({ percent: 100 }, file) // 进度条
onSuccess(res, file) // 上传文件的状态
onProgress({ percent: 100 }, file); // 进度条
onSuccess(res, file); // 上传文件的状态
} else {
onError(res, res, file);
}
}).catch(err => {
})
.catch((err) => {
console.log(`🚀 ~ 传统直传 - defUploadFn ~ err:`, err);
onError(err, err, file);
});
} else {
//计算当前选择文件需要的分片数量
const chunkCount = Math.ceil(fileSize / chunkSize);
console.log("文件大小：",(file.size / 1024 / 1024) + "Mb","分片数：",chunkCount);
console.log('文件大小：', file.size / 1024 / 1024 + 'Mb', '分片数：', chunkCount);
//获取文件md5
console.log('第一步，计算文件的md5', calFileMd5, file);
calFileMd5(file).then(fileMd5 => {
calFileMd5(file).then((fileMd5) => {
console.log(`🚀 ~ 文件的md5是:`, fileMd5);
const initUploadParams = { chunkCount, fileMd5 , ...data, };
const initUploadParams = { chunkCount, fileMd5, ...data };
let successNum = 0;
let taskAllList = [];
//切片上传（开始）
console.log('第二步，根据md5创建文件夹', initUploadParams);
bigFileUploadInit(initUploadParams).then(res => {
bigFileUploadInit(initUploadParams).then((res) => {
console.log('第三步，准备切片文件', res);
if (res.success) {
onProgress({ percent: 0 }, file); // 进度条
@ -679,79 +687,81 @@
partNumber: i,
...initUploadParams,
file: null,
}
};
//分片开始位置
let start = (i - 1) * chunkSize
let start = (i - 1) * chunkSize;
//分片结束位置
let end = Math.min(fileSize, start + chunkSize)
let end = Math.min(fileSize, start + chunkSize);
//取文件指定范围内的byte，从而得到分片数据
let _chunkFile = file.slice(start, end)
console.log("第四步，开始准备文件第" + i + "个分片" + "，切片范围从" + start + "到" + end)
let _chunkFile = file.slice(start, end);
console.log('第四步，开始准备文件第' + i + '个分片' + '，切片范围从' + start + '到' + end);
uploadParams.file = _chunkFile;
let uploadFormData = new FormData();
Object.keys(uploadParams).forEach(key => {
Object.keys(uploadParams).forEach((key) => {
uploadFormData.append(key, uploadParams[key]);
});
console.log('第五步，准备切片文件上传参数', uploadFormData);
taskAllList.push(new Promise((resolve, reject) => {
taskAllList.push(
new Promise((resolve, reject) => {
console.log('第六步，准备切片文件上传前，', uploadFormData);
bigFileUploadUpload(uploadFormData).then(res => {
bigFileUploadUpload(uploadFormData)
.then((res) => {
console.log('第七步，切片文件上传后，', uploadFormData, res);
if (res.success) {
successNum++;
let percent = Number(Number(successNum/chunkCount*100).toFixed(0))
onProgress({ percent }, file) // 进度条
let percent = Number(Number((successNum / chunkCount) * 100).toFixed(0));
onProgress({ percent }, file); // 进度条
resolve(res);
} else {
reject(res);
}
}).catch(err => {
reject(err)
})
.catch((err) => {
reject(err);
});
}));
})
);
}
//任务分片,一次20片
console.log('第八步，全部切片，根据指定线程数执行，', limitPromise, taskAllList);
limitPromise(taskAllList, runBatchNum).then(resList => {
limitPromise(taskAllList, runBatchNum)
.then((resList) => {
console.log('第九步，全部切片，根据指定线程数执行完成后的结果，', resList);
//完成后再执行一个合并
let endUploadParams = {
...initUploadParams,
fileName: file.name,
}
};
console.log('第十步，全部切片，发生合并指令，', endUploadParams);
bigFileUploadEnd(endUploadParams).then(res => {
bigFileUploadEnd(endUploadParams)
.then((res) => {
console.log(`第十一步 ~ 合并返回值 defHttp.post ~ res:`, res);
//返回跟单个上传一样的返回值，
if (res.success) {
onProgress({ percent: 100 }, file) // 进度条
onSuccess(res, file) // 上传文件的状态
onProgress({ percent: 100 }, file); // 进度条
onSuccess(res, file); // 上传文件的状态
} else {
onError(res, res, file);
}
}).catch(err => {
})
.catch((err) => {
console.error(`🚀 ~ 合并出现错误！ defHttp.post ~ err:`, err);
onError(err, err, file);
});
})
}).catch(err => {
.catch((err) => {
console.error(`🚀 ~ 全部完成后，其中有错误limitPromise ~ err:`, err);
//有错误，，
onError(err, err, file);
});
}
//return
})
})
});
});
}
// Promise.all(uploadPromiseList).then(resList => {
// });

2
src/views/site/studentWdkc/teacherDbtx.vue
View File

@ -6,7 +6,7 @@
<a-tabs v-model:activeKey="activeKey" style="padding: 10px">
<a-tab-pane key="1" tab="未读">
<div style="width: 100%; text-align: right; ">
<RouterLink target='_blank' to="/site/teacherYiyueMore">查看更多</RouterLink>
<RouterLink target='_blank' to="/site/teacherWeiduMore">查看更多</RouterLink>
</div>
<div style="min-height: 70px">
<a-row>

4
src/views/site/studentWdkc/teacherWeiduMore.vue
View File

@ -8,7 +8,7 @@
<a-layout-content>
<a-card class="rowGutter" id="jcgkkDom">
<template #title>
<div style="font-size: 24px; font-weight: bold">已读信息</div>
<div style="font-size: 24px; font-weight: bold">未读信息</div>
</template>
<a-row :gutter="[16, 16]" style="margin-top: 20px">
<a-col v-for="(item, index) in listData" :key="index" :span="24">
@ -17,7 +17,7 @@
<div style="margin-top: 5px">{{ index + 1 }}、{{ item.content }}</div>
</a-col>
<a-col :span="2" style="text-align: right">
<a-button type="primary" @click="openKecheng(item)" style="margin-left: 10px">已读</a-button>
<a-button type="primary" @click="openKecheng(item)" style="margin-left: 10px">查看</a-button>
</a-col>
</a-row>
</a-col>

44
src/views/zy/jiaoXueDanYuanNeiRong/index.vue
View File

@ -380,7 +380,7 @@ import { Input, Popover, Pagination, Empty, Affix as aAffix } from 'ant-design-v
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { useRouter } from 'vue-router';
import { randomString, simpleDebounce, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { randomString, simpleDebounce, getFileAccessHttpUrl, baseApiUrl } from '/@/utils/common/compUtils';
import { useFileList } from '/@/components/jeecg/comment/useComment';
import draggable from 'vuedraggable';
@ -391,6 +391,11 @@ import stuIndex from './stuIndex.vue';
import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api';
import zykYylistPage from '/@/views/zyk/ZykInfoYinyongModal.vue';
import Base64 from 'crypto-js/enc-base64';
import { dataURLtoBlob, urlToBase64 } from '/@/utils/file/base64Conver';
import UTF8 from 'crypto-js/enc-utf8';
import { encryptByBase64 } from '/@/utils/cipher';
const spinning = ref<boolean>(false);
//当前路由信息
const { currentRoute } = useRouter();
@ -416,6 +421,8 @@ const videoOpen = ref<boolean>(false);
const controls = ref(true);
const autoplay = ref(false);
const loop = ref(false);
// 文件预览地址的domain 在后台配置的
let onlinePreviewDomain = '';
const playVideoInFullscreen = async () => {
console.log('💋', videoPlayer);
@ -801,20 +808,47 @@ function editThreePage(two, three, threeIndex) {
threePageData.value = { two, three, threeIndex };
}
function viewThreePage(three) {
async function viewThreePage(three) {
console.log('🙇‍♂️', three);
if (three.value.type == 'video') {
if (three.type == 'video') {
handleVideo(three);
} else if (three.value.type == 'document') {
} else if (three.type == 'document') {
// var file = 'https://kczxcs.nenu.edu.cn/jeecg-boot/temp/0731课程作业问题汇总_1722673666833.docx';
// var file = baseApiUrl + "/"+three.filePath;
// console.log('🤬', file);
// let url = getFileAccessHttpUrl(encodeURIComponent(file));
// var t2 = encryptByBase64(url);
// window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(t2));
} else if (three.value.type == 'richText') {
// var file = 'https://kczxcs.nenu.edu.cn/jeecg-boot/temp/ylhpsf.pdf';
var file = baseApiUrl + "/"+three.filePath;
console.log('🤬', file);
// let url = getFileAccessHttpUrl(encodeURIComponent(file));
// var t2 = encryptByBase64(url);
window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
} else if (three.type == 'richText') {
threePageOpen.value = true;
threePageDisableSubmit.value = true;
threePageData.value = { three };
}
}
const getViewFileDomain = () => defHttp.get({ url: '/sys/comment/getFileViewDomain' });
/**
* 初始化domain
*/
async function initViewDomain() {
if (!onlinePreviewDomain) {
onlinePreviewDomain = await getViewFileDomain();
}
if (!onlinePreviewDomain.startsWith('http')) {
onlinePreviewDomain = 'http://' + onlinePreviewDomain;
}
}
function delThree(e, two, three) {
stop(e);
delThreeFetch({ id: three.id }).then((res) => {

11
src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
View File

@ -213,12 +213,13 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
import { useRouter } from 'vue-router';
import { randomString, simpleDebounce, getFileAccessHttpUrl } from '/@/utils/common/compUtils'
import { randomString, simpleDebounce, getFileAccessHttpUrl, baseApiUrl } from '/@/utils/common/compUtils'
import draggable from 'vuedraggable';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
import downloadAssembly from '/@/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue';
import { encryptByBase64 } from '/@/utils/cipher';
//当前路由信息
const { currentRoute } = useRouter();
@ -550,11 +551,19 @@ function handleVideo(three){
}
function viewThreePage(three) {
if (three.type == 'video') {
handleVideo(three);
} else if (three.type == 'document') {
var file = baseApiUrl + "/"+three.filePath;
window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
} else if (three.type == 'richText') {
threePageOpen.value = true;
threePageDisableSubmit.value = true;
threePageData.value = { three };
}
}
function threePageHandleOk(){
threePageOpen.value = false;
}

2
src/views/zy/zyInfo/StudentZyInfoList.vue
View File

@ -35,7 +35,7 @@
<a-col :span="24" class="zyCon">
<span style="text-align: left;width:50%;display: block;float:left;">作业得分：{{ item.stuscore ? item.stuscore : '未评' }}分</span>
<span style="text-align: right;width:50%;display: block;float:left;" class="wpopen" v-if="handleSfkshp(item)" @click="handleHpfs(item)">互评分数:{{ item.xshpfs ? item.xshpfs : '未评' }}分</span>
<span style="text-align: left;width:50%;display: block;float:left;" v-if="handleSfkshp(item)">绩效分数：{{ item.jxfs ? item.jxfs : '未评' }}分</span>
<span style="text-align: left;width:50%;display: block;float:left;" v-if="handleSfkshp(item)">互评奖励：{{ item.jxfs ? item.jxfs : '未评' }}分</span>
<span style="text-align: right;width:50%;display: block;float:left;">总分:{{ item.zzdf ? item.zzdf : '未评' }}分</span>
</a-col>
<a-col :span="24" class="zyCon">

12
src/views/zy/zyInfo/ZyInfoV2List.vue
View File

@ -113,7 +113,8 @@ d<template>
<a-form-item label="作业要求" v-bind="validateInfos.content">
<j-editor v-model:value="zyInfo.content" v-if="zyyqShow" @blur="handleZyyqShow(0)" />
<div style="color: #777777" v-html="zyInfo.content" v-if="!zyyqShow"></div>
<div @click="handleZyyqShow(1)"><span style="cursor: pointer; color: #18a689">温馨提示：点击可编辑作业要求</span></div>
<div @click="handleZyyqShow(1)" class="tishi" v-if="zyInfo.xshpkg == '1'">温馨提示：点击可编辑作业要求</div>
<!-- <div @click="handleZyyqShow(1)"><span style="cursor: pointer; color: #18a689">温馨提示：点击可编辑作业要求</span></div> -->
</a-form-item>
</a-col>
<a-col :span="24">
@ -143,6 +144,7 @@ d<template>
<a-col :span="24">
<div class="region">
<div class="region-title">学生互评</div>
<div style="float:right;margin-right:8px;" v-if="zyInfo.xshpkg == '1'"><span style="color:#18a689; cursor: pointer;" @click="handleHpsf">预览互评算法</span></div>
<a-form-item label="学生互评">
<div class="tishi" v-if="zyInfo.xshpkg == '1'">温馨提示：每份作业至少互评3次，每个学生互评5份作业</div>
<j-dict-select-tag
@ -183,7 +185,7 @@ d<template>
style="margin-top: 15px"
/> -->
</a-form-item>
<a-form-item label="互评开始时间" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
<a-form-item label="互评开始时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
<a-date-picker
placeholder="请选择互评开始时间"
v-model:value="zyInfo.xshpkssj"
@ -194,7 +196,7 @@ d<template>
style="width: 100%"
/>
</a-form-item>
<a-form-item label="互评结束时间" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
<a-form-item label="互评结束时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
<a-date-picker
placeholder="请选择互评结束时间"
v-model:value="zyInfo.xshpjssj"
@ -249,7 +251,7 @@ d<template>
</a-form-item>
</div>
</a-col>
<a-col :span="24" style="text-align: left; margin-top: 10px; margin-bottom: 40px; margin-left: 140px">
<a-col :span="24" style="text-align: center; margin-top: 10px; margin-bottom: 40px; ">
<a-button type="primary" @click="submitForm">保存</a-button>
<a-button type="primary" @click="reloadZy" style="margin-left: 15px">返回</a-button>
</a-col>
@ -1154,7 +1156,7 @@ const columnsCcjg = [
},
},
{
title: '查重率',
title: '查重率（%）',
dataIndex: 'percentage',
key: 'percentage',
},

2
src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
View File

@ -94,7 +94,7 @@ export const newcolumns: BasicColumn[] = [
slots: { customRender: 'xshpfsaction' },
},
{
title: '绩效分',
title: '互评奖励',
align: "center",
dataIndex: 'jxzf',
},

18
src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
View File

@ -1,6 +1,11 @@
<template>
<div style="background: #fff; margin: 10px 0;padding:10px;">
<div style="text-align: right;width:100%;"><a-button type="primary" @click="handleback">返回</a-button></div>
<div style="width:100%;">
<a-row>
<a-col :span="12" style="text-align: left;"><span style="color:#18a689; cursor: pointer;" @click="handleHpsf">预览互评算法</span></a-col>
<a-col :span="12" style="text-align: right;"><a-button type="primary" @click="handleback">返回</a-button></a-col>
</a-row>
</div>
<a-tabs v-model:activeKey="activeKey" @change="handleChange">
<a-tab-pane key="1" tab="待互评">
<ZyInfoStudentHpList ref="dhpPage"/>
@ -20,9 +25,12 @@ import { ref, reactive, onMounted, unref } from 'vue';
import ZyInfoStudentHpList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue'
import ZyInfoStudentHpYpyList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpYpyList.vue'
import ZyInfoStudentHpMyhpfsList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpMyhpfsList.vue'
import { useGlobSetting } from '/@/hooks/setting';
import { useRouter } from 'vue-router';
import { defHttp } from '/@/utils/http/axios';
const globSetting = useGlobSetting();
const baseApiUrl = globSetting.domainUrl;
var activeKey = ref('1');
const dhpPage = ref();
const yhpPage = ref();
@ -42,6 +50,14 @@ function handleChange(record) {
wdhpPage.value.reload();
}
}
//预览互评算法
function handleHpsf(){
// openByUrl({url:'/downPath/ylhpsf.pdf',target: '_blank',fileName:'算法说明.pdf'})
// window.open(pdfUrl.value, '_blank');
// window.open(require('../../../downPath/ylhpsf.pdf'), '_blank');
window.open(baseApiUrl+'/temp/ylhpsf.pdf');
}
function handleback(){
var href = "/stuzy/studentDqzy";
router.push({path:href,query: {rwbh,xqxn,type,teano}});