Merge pull request 'baigl' (#48) from baigl into main

Reviewed-on: #48
This commit is contained in:
baigl 2024-11-21 11:22:15 +08:00
commit a34226f29f
1 changed files with 30 additions and 18 deletions

View File

@ -77,7 +77,8 @@
/> />
</el-form-item> </el-form-item>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('title')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('title')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('title')">识别</el-button>
</div> </div>
</div> </div>
@ -106,7 +107,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
</div> </div>
</div> </div>
@ -141,7 +143,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
</div> </div>
</div> </div>
@ -169,7 +172,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
</div> </div>
</div> </div>
@ -205,7 +209,8 @@
}" /> }" />
</el-form-item> </el-form-item>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workanswer')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workanswer')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workanswer')">识别</el-button>
</div> </div>
<!-- subjList --> <!-- subjList -->
@ -273,7 +278,8 @@
<el-tag v-else type="danger" style=" margin-left: 10px ">温馨提示这里 - 号删除的是最后一道题目哟</el-tag> <el-tag v-else type="danger" style=" margin-left: 10px ">温馨提示这里 - 号删除的是最后一道题目哟</el-tag>
</el-form-item> </el-form-item>
<div class="item-cropper-btn-multi"> <div class="item-cropper-btn-multi">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
</div> </div>
@ -394,7 +400,8 @@
<!-- 答案分析 --> <!-- 答案分析 -->
<div class="questForm-item-cover"> <div class="questForm-item-cover">
<el-form-item label="答案分析" prop="method"> <el-form-item label="答案分析" prop="method">
<Tinymce v-model="questForm.method" <Tinymce
v-model="questForm.method"
:upFileParams = "{ :upFileParams = "{
deptId: userStore.deptId, deptId: userStore.deptId,
userId: userStore.userId, userId: userStore.userId,
@ -405,7 +412,8 @@
}" /> }" />
</el-form-item> </el-form-item>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('method')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('method')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('method')">识别</el-button>
</div> </div>
</div> </div>
@ -423,7 +431,8 @@
}" /> }" />
</el-form-item> </el-form-item>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('analyse')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('analyse')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('analyse')">识别</el-button>
</div> </div>
</div> </div>
@ -441,7 +450,8 @@
}" /> }" />
</el-form-item> </el-form-item>
<div class="item-cropper-btn"> <div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('discuss')"></el-button> <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('discuss')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('discuss')">识别</el-button>
</div> </div>
</div> </div>
@ -466,7 +476,7 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user const userStore = useUserStore().user
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
// emit // emit
const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-questForm-item']) const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-form-item'])
const props = defineProps({ const props = defineProps({
bookobj: { bookobj: {
type: Object, type: Object,
@ -521,7 +531,7 @@ const initKonwPointFlagByUpdateForm = ref(true);
// [] // []
const curKnowledgePointList = ref([]); const curKnowledgePointList = ref([]);
// //
let questForm = reactive({ const questForm = reactive({
id: 0, id: 0,
title: '', title: '',
worktype: '单选题', worktype: '单选题',
@ -717,7 +727,7 @@ const checkBoxChangefh=(item, index, indexOp)=>{
}; };
/** 表单重置 */ /** 表单重置 */
const resetForm = () =>{ const resetForm = () =>{
questForm = { Object.assign(questForm, {
id: 0, id: 0,
title: '', title: '',
worktype: '单选题', worktype: '单选题',
@ -768,7 +778,7 @@ const resetForm = () =>{
}, },
], ],
}, },
}; });
}; };
/** /**
* @desc: 赋值表单 * @desc: 赋值表单
@ -1061,7 +1071,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
}); });
} }
questForm = { Object.assign(questForm,{
id: item.id, id: item.id,
title: item.worktype == '复合题' ? titleMulList : item.title, title: item.worktype == '复合题' ? titleMulList : item.title,
worktype: item.worktype, worktype: item.worktype,
@ -1090,7 +1100,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
worktype: '填空题', worktype: '填空题',
params: newSubjListparams, params: newSubjListparams,
}, },
}; });
// proxy.resetForm("questFormRef"); // proxy.resetForm("questFormRef");
// //
@ -1654,7 +1664,7 @@ const cropperFormItem=(curItem)=> {
// : ///// // : /////
const examType = questForm.worktype; const examType = questForm.worktype;
emit('cropper-exam-questForm-item', examType, curItem); emit('cropper-exam-form-item', examType, curItem);
}; };
/** /**
@ -1712,6 +1722,7 @@ const myMessageShow=(title, msg, status)=>{
// deep: true // // deep: true //
// }, // },
// }, // },
watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => { watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
console.log(props.bookobj,'课程选择') console.log(props.bookobj,'课程选择')
// props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId // props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId
@ -1721,7 +1732,8 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
// () // ()
defineExpose({ defineExpose({
updateForm updateForm,
cropperFormItemCallBack,
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">