This commit is contained in:
yuping
2023-02-20 04:48:24 +08:00
parent e83decf74d
commit c094909fd0
2 changed files with 32 additions and 26 deletions

View File

@@ -33,7 +33,7 @@
<span style="margin-right: 3px">选择测评</span>
</div>
<div class="btnbox">
<EvList v-model:evaluationTypeName="formData.evaluationTypeId">
<EvList v-model:evaluationTypeName="formData.evaluationTypeName" v-model:evaluationTypeId="formData.evaluationTypeId">
<button class="checkEval">
选择测评
</button>
@@ -58,6 +58,7 @@
:disabled-time="disabledRangeTime"
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="dateTime"
format="YYYY-MM-DD HH:mm"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']"/>
</div>
@@ -98,6 +99,8 @@ const formData = ref({
evaluationTypeId: '',
evaluationTypeName: '',
evaluationExplain: '',
evaluationStartTime: '',
evaluationEndTime: '',
})
const emit = defineEmits({})
const taskIndex = ref(-1);

View File

@@ -61,7 +61,9 @@ import {message} from "ant-design-vue";
import {useStore} from "vuex";
const props = defineProps({
taskList: []
taskList: [],
evaluationTypeId: String,
evaluationTypeName: Number
})
const visible = ref(false)
const emit = defineEmits({})
@@ -119,7 +121,7 @@ const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, {
init: false,
result: res => {
let newArr = []
for(let i=0;i<res.result.data.length;i++){
for (let i = 0; i < res.result.data.length; i++) {
res.result.data[i].id = res.result.data[i].quiz_kid;
newArr.push(res.result.data[i])
}
@@ -128,7 +130,7 @@ const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, {
totalPage: res => res.result.total_page_num,
total: res => res.result.count
})
console.log(data,222)
console.log(data, 222)
watch(taskIndex, () => {
if (taskIndex.value >= 0) {
rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
@@ -192,28 +194,29 @@ function confirm() {
message.warning("请选择测评");
return
}
if (taskIndex.value === -1) {
let list = props.taskList
console.log(props,222,list);
if(list!=undefined){
list.push({
name: selectsData.value[0].title,
type: 3,
courseId: selectsData.value[0].id,
info: {...selectsData.value[0]}
})
}
} else {
const data = props.taskList[taskIndex.value]
data.name = selectsData.value[0].title
data.courseId = selectsData.value[0].id
data.info = selectsData.value[0]
}
if(props.taskList!=undefined){
emit('update:taskList', [...props.taskList])
}
// if (taskIndex.value === -1) {
// let list = props.taskList
// console.log(props,222,list);
// if(list!=undefined){
// list.push({
// name: selectsData.value[0].title,
// type: 3,
// courseId: selectsData.value[0].id,
// info: {...selectsData.value[0]}
// })
// }
//
// } else {
// const data = props.taskList[taskIndex.value]
// data.name = selectsData.value[0].title
// data.courseId = selectsData.value[0].id
// data.info = selectsData.value[0]
// }
// if(props.taskList!=undefined){
// emit('update:taskList', [...props.taskList])
// }
emit('update:evaluationTypeId', selectsData.value[0].id)
emit('update:evaluationTypeName', selectsData.value[0].title)
closeDrawer()
}