Compare commits

..

No commits in common. "main" and "2.5.20" have entirely different histories.
main ... 2.5.20

18 changed files with 271 additions and 596 deletions

View File

@ -1,6 +0,0 @@
declare module '@/api/file' {
// 定义 uploadFile 函数的类型
// export function uploadFile(file: File): Promise<any>;
export function sessionToken(): Promise<any>;
export function uploadSingleFileToEos(data: SingleUploadData): Promise<any>;
}

View File

@ -110,11 +110,3 @@ export const sessionToken = () => {
method: 'get'
})
}
export const uploadSingleFileToEos = (params) => {
return request({
url: '/common/uploadSingleFileToEos',
method: 'post',
params
})
}

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1739948469020') format('woff2'),
url('iconfont.woff?t=1739948469020') format('woff'),
url('iconfont.ttf?t=1739948469020') format('truetype');
src: url('iconfont.woff2?t=1737434703828') format('woff2'),
url('iconfont.woff?t=1737434703828') format('woff'),
url('iconfont.ttf?t=1737434703828') format('truetype');
}
.iconfont {
@ -13,10 +13,6 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-zhongxinshiyang:before {
content: "\e67b";
}
.icon-siweidaotu:before {
content: "\e606";
}

File diff suppressed because one or more lines are too long

View File

@ -5,13 +5,6 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "4320365",
"name": "重新试样",
"font_class": "zhongxinshiyang",
"unicode": "e67b",
"unicode_decimal": 59003
},
{
"icon_id": "11685410",
"name": "思维导图",

View File

@ -5,8 +5,7 @@
<script setup>
import {ref, onMounted} from "vue"
import {sessionToken} from "@/api/file";
import {uploadSingleToEos} from '@/utils/fileUpload'
import {createSignature, sessionToken} from "@/api/file";
const S3Data = {
apiVersion: "2006-03-01",
@ -26,24 +25,30 @@ const handleFileChange = (event)=> {
const uploadMessage = ref(null)
const callUploadSuccess = (e)=> {
console.log(e)
}
const callProgress = (e,p)=> {
console.log(e,p)
}
const uploadFile = ()=>{
if (selectedFile) {
let res = uploadSingleToEos(selectedFile, null,{callUploadSuccess,callProgress})
console.log(res)
console.log(S3Data)
// AWS.S3
const s3 = new AWS.S3(S3Data);
let params = {
Key: selectedFile.name,
Bucket: "wzyzoss",
ContentType: selectedFile.type,
Body: selectedFile
}
console.log(params)
console.log(s3)
s3.putObject(params, function (err, data) {
console.log(err,data)
});
}
}
onMounted(()=>{
console.log(AWS)
sessionToken().then(res=>{
uploadMessage.value = res.data
console.log(res.data)
S3Data.accessKeyId = res.data.accessKeyId
// S3Data.accessKeyId = "kzOm2cc7nT12ao907Tc"
S3Data.secretAccessKey = res.data.secretAccessKey

View File

@ -1,9 +1,9 @@
<template>
<el-dialog v-model="model" :show-close="false" width="800" append-to-body destroy-on-close>
<el-dialog v-model="isDialog" :show-close="false" width="800" append-to-body destroy-on-close>
<template #header>
<div class="custom-header flex">
<span>{{ item.name }}</span>
<i class="iconfont icon-guanbi" @click="model = false"></i>
<i class="iconfont icon-guanbi" @click="isDialog = false"></i>
</div>
</template>
<div class="dialog-content">
@ -15,9 +15,7 @@
</div>
<div class="flex-start flex" v-else>
<div class="flex" v-loading="!item.msg">
<div class="chart-item robot">
<v-md-editor v-model="item.msg" mode="preview" />
</div>
<div class="chart-item robot">{{ item.msg }}</div>
</div>
<div class="flex flex-end replace-item">
<span @click="saveAdjust(item)"><i class="iconfont icon-tihuan"></i>替换分析结果</span>
@ -56,7 +54,7 @@
</template>
<script setup>
import { ref, reactive, onMounted, watch, onUnmounted } from 'vue'
import { ref, reactive, onMounted, onUnmounted } from 'vue'
import { completion, docList } from '@/api/mode/index'
import { sessionStore } from '@/utils/store'
import { dataSetJson } from '@/utils/comm.js'
@ -68,7 +66,7 @@ const userInfo = useUserStore().user
const textarea = ref('')
const model = defineModel()
const isDialog = defineModel()
const props = defineProps({
item: {
@ -91,12 +89,6 @@ const props = defineProps({
}
})
watch(model, (newVal) =>{
if(newVal){
msgList.value.length = 0
}
})
const emit = defineEmits(['saveEdit'])
const loaded = ref(false)
@ -156,7 +148,7 @@ const getCompletion = async (val) => {
}
const saveAdjust = (item) =>{
model.value = false
isDialog.value = false
emitter.emit('onSaveAdjust', item.msg)
}
@ -166,17 +158,12 @@ const dataset_id = ref('')
const fileList = ref([])
const getList = () =>{
docList({
createUser: userInfo.userId,
datasetId: dataset_id.value,
edustage: curNode.edustage,
edusubject: curNode.edusubject
userId: userInfo.userId,
dataset_id: dataset_id.value
}).then( res =>{
if(res.rows.length){
fileList.value = res.rows
Object.assign(curFile, fileList.value[0])
params.document_ids = fileList.value[0].docId
}
})
}
emitter.on('changeCurFile', (item) =>{
@ -252,7 +239,6 @@ onUnmounted(() => {
.robot {
background: #409EFF;
color: #FFF;
width: 100%;
}
.replace-item{
font-size: 12px;
@ -346,13 +332,4 @@ onUnmounted(() => {
display: flex;
margin-bottom: 10px;
}
:deep(.v-md-editor){
background-color: #409EFF;
}
:deep(.github-markdown-body) {
font-size: 14px;
padding: 10px;
}
</style>

View File

@ -13,7 +13,7 @@
<el-input v-model="form.name" />
</el-form-item>
<el-form-item label="提示词" v-if="item.ex3 == '1' ? false : true">
<el-input v-model="form.prompt" type="textarea" autosize :rows="2" />
<el-input v-model="form.prompt" type="textarea" />
</el-form-item>
</el-form>
</div>

View File

@ -137,9 +137,7 @@ const curFile = reactive({})
const getList = () => {
docList({
createUser: userInfo.userId,
datasetId: dataset_id.value,
edustage: curNode.edustage,
edusubject: curNode.edusubject
datasetId: dataset_id.value
}).then((res) => {
fileList.value = [...res.rows]
if(res.rows.length){

View File

@ -4,12 +4,12 @@
<div class="container-right-header flex">
<el-dropdown @command="changeTemplate" :hide-on-click="false">
<span class="el-dropdown-link">
{{ curTemplate.ex3 ? `${curTemplate.name}(平台)` : `${curTemplate.name}(个人)` }}
{{ curTemplate.name }}
<i class="iconfont icon-xiangxia"></i>
</span>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.ex3 ? `${item.name}(平台)` : `${item.name}(个人)`
<el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
}}</el-dropdown-item>
</el-dropdown-menu>
</template>
@ -18,20 +18,20 @@
<el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
<el-option v-for="item in modeOptions" :key="item.value" :disabled="item.disabled" :label="item.label" :value="item.value" />
</el-select>
<el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)" v-if="curTemplate.ex3 != 1">
<el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
删除
</el-button>
<el-button type="primary" link :disabled="!(templateList.length)" @click="onAdd">
<i class="iconfont icon-jiahao"></i>
{{ curTemplate.ex3 == 1 ? '复制并创建个人模板' : '添加提示词' }}
{{curTemplate.ex3 === '1' ? '复制并创建个人模板' : '添加提示词'}}
</el-button>
<el-button type="primary" :disabled="!(childTempList.length)" @click="getModelResult('')">一键研读</el-button>
<el-button type="primary" :disabled="!(childTempList.length)" @click="getCompletion">一键研读</el-button>
</div>
</div>
<!--List-->
<div class="container-right-list" ref="outerContainer">
<div class="container-right-list" ref="listRef">
<template v-for="(item, index) in childTempList">
<div class="template-item" v-loading="item.loading" ref="messageElements">
<div class="template-item" v-loading="item.loading">
<div class="item-header">
<div>
<span class="blue">#</span>{{ item.name }}
@ -50,26 +50,18 @@
<div class="item-text">
{{ item.prompt }}
</div>
<div class="item-text text-answer">
<div class="item-text text-answer" v-if="item.answer">
<div class="item-icon">
<i class="iconfont icon-ai"></i>
</div>
<div class="item-answer">
<!-- <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
@complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" /> -->
<TypingEffect
:text="item.answer"
:showTypewriter="item.showTypewriter"
:speed="30"
:charsPerFrame="15"
@scroll="handleScroll(index)"
@done="handleDone(index)"
/>
<TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
@complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
</div>
</div>
<div class="ai-btn" v-if="item.answer">
<el-button type="primary" link @click="getModelResult(index, item)">
<i class="iconfont icon-zhongxinshiyang"></i>
<el-button type="primary" link @click="againResult(index, item)">
<i class="iconfont icon-ai1"></i>
重新研读
</el-button>
<el-button type="primary" link @click="onAdjust(index, item)">
@ -107,6 +99,7 @@ import TypingEffect from '@/components/typing-effect/index.vue'
import useUserStore from '@/store/modules/user'
import emitter from '@/utils/mitt';
import { dataSetJson } from '@/utils/comm.js'
import { cloneDeep } from 'lodash'
const props = defineProps(['type'])
const { user } = useUserStore()
@ -130,7 +123,7 @@ const modeOptions = ref([
},
{
label: 'deepseek模型',
value: 3,
value: 3
}
])
@ -145,7 +138,7 @@ const modeOptions = ref([
const isWordDialog = ref(false)
const editItem = reactive({})
const onAdd = () => {
console.log(curTemplate)
Object.assign(editItem, curTemplate)
editItem.isAdd = true
isWordDialog.value = true
@ -183,252 +176,60 @@ const getTemplateList = () => {
}
})
}
const getChildTemplate = (val) => {
const getChildTemplate = () => {
tempLoading.value = true
modelList({ model: props.type, type: 2, parentId: curTemplate.id, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
childTempList.value = res.rows
if (childTempList.value.length) {
childTempList.value.forEach(item => {
item.answer = '';
item.showTypewriter = false
})
childTempList.value.forEach(item => item.answer = '')
}
//
getTempResult(val)
getTempResult()
}).finally(() => {
tempLoading.value = false
})
}
const isStarted = ref([]);
const listRef = ref()
//
const getTempResult = (val) => {
tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(async res => {
const getTempResult = () => {
tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(res => {
let rows = res.rows
childTempList.value.forEach(item => {
rows.forEach(el => {
if (item.id == el.modelId) {
item.answer = el.content
item.answer = getResult(el.content)
item.resultId = el.id
}
})
})
// val : true
if(val){
// dom
await nextTick()
//
let lastIndex = childTempList.value.length - 1
getModelResult(lastIndex, childTempList.value[lastIndex], true)
if (rows.length > 0) {
isStarted.value = new Array(rows.length).fill(true)
}
})
}
const prompt = ref('')
const scrollToBottom = (height, index) => {
//
const isAgain = ref(false)
if (listRef.value) {
let sum = 0
let listDom = listRef.value.children
//
const getModelResult = async (index, item, isLast) => {
/**
*
* index: 当前项索引
* item: 当前项
* isLast: 是否最后一项 用于添加子模板后研读
*/
let str = prompt.value
//
if(index !== ''){
isAgain.value = true
//
childTempList.value[index].answer = ''
//
childTempList.value[index].showTypewriter = true
//
if (messageElements.value[index]) {
messageElements.value[index].scrollIntoView({
behavior: 'smooth',
block: 'start',
});
}
// prompt
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
try {
childTempList.value[index].loading = true
const data = await requestModelData()
childTempList.value[index].answer = data.answer;
if(isLast){
await onSaveTemp(childTempList.value[index])
}else{
//
onEditResult(data.answer, index)
}
} finally {
childTempList.value[index].loading = false
}
}
//
else{
//
childTempList.value.forEach(item => {
if (item.answer) {
item.answer = ''
}
})
//
messageElements.value[0].scrollIntoView({
behavior: 'smooth',
block: 'start',
})
processNext(0)
}
}
//
const processNext = async (index) =>{
let str = prompt.value
//
const item = childTempList.value[index]
item.loading = true
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
try {
const data = await requestModelData()
item.answer = data.answer
item.showTypewriter = true
//
await onSaveTemp(item)
} finally {
item.loading = false
}
}
//
const handleDone = (index) =>{
if(isAgain.value){
isAgain.value = false
return
}
else{
if(index == childTempList.value.length - 1) return
outerContainer.value.scrollTo({
top: outerContainer.value.scrollHeight,
behavior: 'smooth',
});
processNext(index + 1)
}
}
// ms:
const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
// or
const requestModelData = async () =>{
//
let data = null
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
// 1s
if(!isAdjust.value){
await delay(1000); // 1
}
data = res.data
}
//
else {
if (curMode.value == 3) {
params.llm = 'deepseek-r1:8b'
}
const res = await completion(params)
data = res.data
}
return data
}
const messageElements = ref([]); //
//
// const animationId = ref(null)
const animationIDs = ref([])
const outerContainer = ref()
let lastScrollTime = 0;
const scrollInterval = 200
const handleScroll = (index) => {
const now = Date.now();
if (now - lastScrollTime >= scrollInterval) {
const container = document.querySelector('.container-right-list');
if(isAgain.value){
scrollToTmp(index)
}
else{
if (container) {
if (index == 0) {
const item = messageElements.value[index]
if(item.clientHeight > outerContainer.value.clientHeight ){
item.scrollIntoView({ behavior: 'smooth', block: 'end' })
// 220
let screenHeight = window.innerHeight - 220
if (height > screenHeight) {
listRef.value.scrollTop = (height - screenHeight + 50)
}
}
else {
//
const id = requestAnimationFrame(() => {
container.scrollTo({
top: container.scrollHeight,
behavior: 'smooth',
});
});
animationIDs.value.push(id)
for (let i = 0; i < index; i++) {
sum += listDom[i].clientHeight
}
listRef.value.scrollTop = sum + height
}
}
}
lastScrollTime = now;
}
}
//
const scrollToTmp = (index) =>{
//
if(index == childTempList.value.length - 1){
const id = requestAnimationFrame(() => {
outerContainer.value.scrollTo({
top: outerContainer.value.scrollHeight,
behavior: 'smooth',
});
});
animationIDs.value.push(id)
}
else{
const item = messageElements.value[index]
if(item.clientHeight > outerContainer.value.clientHeight ){
item.scrollIntoView({ behavior: 'smooth', block: 'end' })
}
}
}
//
const changeTemplate = (val) => {
@ -497,10 +298,122 @@ const onEdit = (index, item) => {
isEdit.value = true
}
//
const onEditResult = async (answer, index) => {
//
const prompt = ref('')
//
const isAgain = ref(false)
const againResult = async (index, item) => {
isAgain.value = true
isStarted.value[index] = false
childTempList.value[index].answer = ''
if (index == 0) {
listRef.value.scrollTop = 0
} else {
scrollToBottom(50, index)
}
try {
await nextTick()
childTempList.value[index].loading = true
item.aiShow = true
let str = cloneDeep(prompt.value)
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
let data = null;
//
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
data = res.data
} else {
if (curMode.value == 3) {
params.llm = 'deepseek-r1:8b'
}
//
const res = await completion(params)
data = res.data
}
childTempList.value[index].answer = getResult(data.answer);
isStarted.value[index] = true
} finally {
childTempList.value[index].loading = false
}
}
const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
//
const getCompletion = async () => {
isStarted.value = new Array(childTempList.length).fill(false)
isStarted.value[0] = true
childTempList.value.forEach(item => {
if (item.answer) {
item.answer = ''
}
})
for (let item of childTempList.value) {
try {
item.loading = true
item.aiShow = true
let str = cloneDeep(prompt.value)
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
let data = null
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
await delay(1000); // 1
data = res.data
}
//
else {
if (curMode.value == 3) {
params.llm = 'deepseek-r1:8b'
}
const res = await completion(params)
data = res.data
}
item.answer = getResult(data.answer)
onSaveTemp(item)
} finally {
item.loading = false
}
}
}
const handleCompleteText = async (answer, index) => {
if (index < childTempList.value.length - 1) {
isStarted.value[index + 1] = true; //
}
if (isAgain.value) {
try {
await editTempResult({ id: childTempList.value[index].resultId, content: answer })
} finally {
isAgain.value = false
}
}
}
//
@ -533,13 +446,19 @@ const onSaveTemp = async (item) => {
}
}
// ### **
let getResult = (str) => {
let newStr = str.replace(/#+|(\*\*)/g, '');
newStr = newStr.replace(/<think>[\s\S]*?<\/think>/g, '');
return newStr
}
//
//
emitter.on('onGetChild', () => {
getChildTemplate(true)
getChildTemplate()
})
//
emitter.on('onGetMain====》', () => {
emitter.on('onGetMain', () => {
getTemplateList()
})
@ -605,11 +524,7 @@ onUnmounted(() => {
emitter.off('onGetMain');
emitter.off('onGetChild');
emitter.off('onSaveAdjust');
//
animationIDs.value.forEach(id => cancelAnimationFrame(id))
})
</script>
<style lang="scss" scoped>
@ -701,15 +616,14 @@ onUnmounted(() => {
.iconfont {
margin-right: 3px;
font-size: 18px;
}
:deep(.el-button) {
font-size: 14px;
font-size: 13px;
}
.icon-zhongxinshiyang {
font-size: 20px;
.icon-ai1 {
font-size: 18px;
}
}
}

View File

@ -1,109 +1,85 @@
<template>
<div class="typing-effect" ref="typingEffectRef">
<!-- <span v-html="displayedText"></span> -->
<!-- <el-input
v-model="currentText"
<el-input
v-model="displayedText"
:autosize="{ minRows: 2 }"
type="textarea"
readonly
resize="none"
style="width: 100%;"
input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
/> -->
<v-md-editor v-model="currentText" mode="preview" />
/>
</div>
</template>
<script setup>
import { ref, onMounted, watch, onUnmounted } from 'vue';
import { ref, onMounted, watch, nextTick } from 'vue';
const props = defineProps({
text: {
type: String,
required: true,
type: [String, Object],
required: true
},
speed: {
delay: {
type: Number,
default: 50, //
},
charsPerFrame: {
type: Number,
default: 1, //
},
showTypewriter: {
type: Boolean,
default: true, //
default: 100 //
},
aiShow: {
type: [Boolean] // true
}
});
const typingEffectRef = ref(null);
const emit = defineEmits(['complete', 'updateScroll']);
const displayedText = ref('');
const index = ref(0);
// emits
const emit = defineEmits(['scroll','done']);
//
const currentText = ref(''); //
const currentCharIndex = ref(0); //
const isTyping = ref(false); //
const animationFrameId = ref(null); // requestAnimationFrame ID
//
const typeText = () => {
if (currentCharIndex.value < props.text.length) {
// charsPerFrame
currentText.value += props.text.slice(
currentCharIndex.value,
currentCharIndex.value + props.charsPerFrame
);
currentCharIndex.value += props.charsPerFrame;
emit('scroll'); //
// 使 requestAnimationFrame
animationFrameId.value = requestAnimationFrame(() => {
const type = async () => {
await nextTick()
if(!props.aiShow) {
displayedText.value = props.text
return
}
//ms
let allLength = props.text.length
let allTime = 3000
let addIndex = allLength/(allTime/props.delay);
//5
for (let i = 0; i < addIndex; i++) {
if (index.value <= allLength) {
displayedText.value += props.text.charAt(index.value);
index.value++;
} else {
break;
}
}
if (index.value <= props.text.length) {
// displayedText.value += props.text.charAt(index.value);
// index.value++;
setTimeout(() => {
typeText();
}, props.speed);
});
type();
emit('updateScroll', typingEffectRef.value.clientHeight); //
}, props.delay);
} else {
isTyping.value = false;
emit('done')
// complete
emit('complete',displayedText.value);
}
};
//
const showFullText = () =>{
currentText.value = props.text
}
//
const startTypeWriter = () => {
isTyping.value = true;
currentText.value = '';
currentCharIndex.value = 0;
typeText();
};
// text
watch(
() => props.text,
() => {
if(props.showTypewriter && props.text){
startTypeWriter();
} else {
showFullText();
}
}
);
//
onMounted(() => {
// startTypeWriter();
resetAndType();
});
//
onUnmounted(() => {
if (animationFrameId.value) {
cancelAnimationFrame(animationFrameId.value);
const resetAndType = () =>{
displayedText.value = '';
index.value = 0;
type();
}
});
// props 便 text delay
watch([() => props.text, () => props.delay], resetAndType);
</script>
@ -111,12 +87,4 @@ onUnmounted(() => {
:deep(.el-textarea__inner:hover){
box-shadow: none;
}
.typing-effect{
:deep(.github-markdown-body){
padding: 0;
font-size: 14px;
}
}
</style>

View File

@ -86,7 +86,7 @@ const defaultImg = ['/img/avatar-default.jpg','/images/img-avatar.png','/src/ass
//
const isStadium = () => {
// console.log('isStadium',userStore.roles )
console.log('isStadium',userStore.roles )
let user = userStore.user
let roles = user.roles
return roles.some(item => item.roleKey === 'stadium')

View File

@ -1,160 +0,0 @@
import {sessionToken, uploadSingleFileToEos} from "@/api/file";
import CryptoJS from 'crypto-js'
import {ElMessageBox} from "element-plus";
/**
* @description
* @param {Function} callGetToken - token回调
* @param {Function} callUpload - EOS回调
* @param {Function} callProgress -
* @param {Function} callUploadSuccess -
*/
type CallBack = {
callGetToken?: (e:any)=>any;
callUploadFile?: (e:any)=>any;
callProgress?: (e:any,p:number)=>any;
callUploadSuccess?: (e:any)=>any;
}
/**
* @description
* @param {string} _bucket -
* @param {string} id - id
* @param {string} filePath -
* @param {string} fileMd5 - MD5
* @param {string} fileNewName -
* @param {string} fileName -
* @param {string} fileSize -
* @param {string} fileSuffix -
* @param {string} fileType -
*/
type SingleUploadData = {
_bucket?: string,
id?: string,
filePath?: string,
fileMd5?: string,
fileNewName?: string,
fileName?: string,
fileSize?: number,
fileSuffix?: string,
fileType?: string,
}
const S3Data = {
apiVersion: "2006-03-01",
accessKeyId: "", // 服务端获取到的 access key ID
secretAccessKey: "", // 服务端获取到的 secret access key
endpoint: "",
sessionToken: '',
signatureVersion: "v2",
sslEnabled: true // 是否启用 HTTPS 连接
}
/**
* @description
* @param file
* @param {SingleUploadData} uploadData
* @param {CallBack} callBack -
*/
const uploadSingleToEos = async (file:File, uploadData: SingleUploadData, callBack?: CallBack) => {
console.log(file)
//去服务端拿授权
let res = await sessionToken().catch((err:any)=>{
ElMessageBox.alert(err)
});
S3Data.accessKeyId = res.data.accessKeyId
S3Data.secretAccessKey = res.data.secretAccessKey
S3Data.endpoint = res.data.endPoint
S3Data.sessionToken = res.data.sessionToken
uploadData = uploadData?uploadData:{}
uploadData._bucket = res.data.bucket
//如果文件名不存在,则使用时间戳为名字
uploadData.id = crypto.randomUUID();
uploadData.fileMd5 = await getFileMD5(file);
uploadData.fileName = file.name?file.name:(new Date().getTime()+"");
if (uploadData.fileName.lastIndexOf(".") === -1) {
uploadData.fileSuffix = ""
uploadData.fileNewName = uploadData.id
}else {
uploadData.fileSuffix = uploadData.fileName.substring(uploadData.fileName.lastIndexOf(".")+1)
uploadData.fileNewName = uploadData.id + "." + uploadData.fileSuffix
}
uploadData.filePath = getEosFileKey(uploadData.id, uploadData.fileSuffix);
uploadData.fileSize = file.size
uploadData.fileType = file.type
console.log(uploadData)
//回调获取token
callBack?.callGetToken && callBack.callGetToken(res.data)
//将文件上传到EOS
let uploadRes = await uploadFile(file,uploadData,callBack).catch((err)=>{
ElMessageBox.alert(err)
});
if (!uploadRes) return
//回调成功上传EOS
callBack?.callGetToken && callBack.callGetToken(uploadRes)
//去服务端确认是否已经完成上传,并保存文件上传信息
let saveUploadRes = await uploadSingleFileToEos(uploadData)
//回调整个文件上传完成
callBack?.callUploadSuccess && callBack.callUploadSuccess(saveUploadRes)
return saveUploadRes
}
/**
* @description
* @param file
* @param uploadData
* @param callBack
*/
const uploadFile = (file:File, uploadData: SingleUploadData,callBack?:CallBack) =>{
return new Promise((resolve, reject) => {
const s3 = new AWS.S3(S3Data);
let params = {
Key: uploadData.filePath,
Bucket: uploadData._bucket,
ContentType: file.type,
Body: file
}
s3.putObject(params, function (err:any, data:any) {
if (err) {
reject(data)
}else {
resolve(data)
}
}).on('httpUploadProgress', function(evt:any) {
//回调上传进度
callBack?.callProgress && callBack.callProgress(evt,Math.round((evt.loaded / evt.total) * 100));
})
})
}
/**
* @description EOS文件key
* @param uuid id
* @param suffix
*/
const getEosFileKey = (uuid:string, suffix:string) => {
let date = new Date()
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
return year + "/" + month + "/" + day + "/" + uuid + "." + suffix;
}
/**
* @description MD5
* @param file
*/
const getFileMD5 = (file:File):Promise<string> => {
return new Promise((resolve, reject) => {
let reader = new FileReader();
reader.readAsArrayBuffer(file);
reader.onload = function () {
let buffer = reader.result as ArrayBuffer;
let md5 = CryptoJS.MD5(buffer).toString();
resolve(md5)
}
})
}
export {uploadSingleToEos}

View File

@ -4,7 +4,7 @@
<el-tab-pane :label="item.label" style="text-align:left" stretch="true">
<template v-if="item.stuList.length > 0">
<template v-for="(stuItem,stuIndex) in item.stuList" :key="stuIndex">
<el-tag style="margin:5px 10px 0 0" type="primary">{{ stuItem.studentname }}:{{ stuItem.point }}</el-tag>
<el-tag style="margin:5px 10px 0 0" type="primary">{{ stuItem.studentname }}:{{ stuItem.getScore }}</el-tag>
</template>
</template>
<template v-else>
@ -93,8 +93,6 @@ watch(() => useOverview.tableList, () => {
}else{
hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
}
console.log(hasStudents.value,'hasStudents.value');
showStudents(0)
},{deep: true})
</script>

View File

@ -376,12 +376,12 @@ const getClassWorkStudentList = (rowId) => {
}
}
}
const allScore = evalarray.reduce((acc, cur) => acc + cur.teacherRating, 0)
const allScore = evalarray.reduce((acc, cur) => acc + cur.score, 0)
//console.log(evalarray, 'evalarray------------------------------------')
if (feedcount > 0) {
// : /*100
response.rows[i].scoingRate = ((score / allScore) * 100).toFixed(0) + '%'
response.rows[i].getScore = allScore
response.rows[i].getScore = score
} else {
response.rows[i].scoingRate = '0%'
response.rows[i].getScore = 0