zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge pull request 'zouyf_dev' (#78) from zouyf_dev into main 

Reviewed-on: #78
This commit is contained in:
zouyf 2024-12-02 17:29:44 +08:00
parent e64311e8a4 330a9acddb
commit 051aa6bd56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/components/set-homework/index.vue
View File

@ -41,7 +41,7 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click.stop="cloneDialog(ruleFormRef)">取消</el-button> <el-button @click.stop="cloneDialog(ruleFormRef)">取消</el-button>
<el-button type="primary" @click.stop="onSubmit(ruleFormRef)"> 确定 </el-button> <el-button :loading="setLoading" type="primary" @click.stop="onSubmit(ruleFormRef)"> 确定 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>

10
src/renderer/src/components/tinymce/tinymce.vue
View File

@ -284,23 +284,23 @@ const init = reactive({
formData.append("filetype", "image"); formData.append("filetype", "image");
formData.append("suffix", "image"); formData.append("suffix", "image");
formData.append("status", '1'); formData.append("status", '1');
if(userStore.deptId && userStore.deptId != null){ if(userStore.deptId != null){
formData.append("entpid", userStore.deptId); formData.append("entpid", userStore.deptId);
} }
if(userStore.userId && userStore.userId != null){ if(userStore.userId != null){
formData.append("userid", userStore.userId); formData.append("userid", userStore.userId);
} }
if(userStore.edudegree && userStore.edudegree != null){ if(userStore.edudegree && userStore.edudegree != ''){
let edudegree = userStore.edudegree.toString(); let edudegree = userStore.edudegree.toString();
if(edudegree != '' && edudegree.indexOf('年级') == -1){ if(edudegree != '' && edudegree.indexOf('年级') == -1){
edudegree += '年级'; edudegree += '年级';
} }
formData.append("edudegree", edudegree); formData.append("edudegree", edudegree);
} }
if(userStore.edusubject && userStore.edusubject != null){ if(userStore.edusubject && userStore.edusubject != ''){
formData.append("edusubject", userStore.edusubject); formData.append("edusubject", userStore.edusubject);
} }
if(userStore.edustage && userStore.edustage != null){ if(userStore.edustage && userStore.edustage != ''){
formData.append("edustage", userStore.edustage); formData.append("edustage", userStore.edustage);
} }
if(props.upFileParams?.hasOwnProperty('lessionId')){ if(props.upFileParams?.hasOwnProperty('lessionId')){