整合代码

This commit is contained in:
zhangsir
2024-05-15 14:15:18 +08:00
parent 154027ee7c
commit 3fb33edc46
2 changed files with 49 additions and 27 deletions

View File

@@ -61,17 +61,17 @@ const InitReview = () => {
const teacherid = ref(null) const teacherid = ref(null)
//发起评审 //发起评审
const startReviewSave = async () => { const startReviewSave = async () => {
if (formState.reviewname.trim()==="" ) {
return message.info('请填写评审名称');
}
if (formState.time==="") { if (formState.time==="") {
return message.info('请填写评审名称和评审时间'); return message.info('请填写评审时间');
} }
if (formState.reviewname==="" ) {
return message.info('请填写评审名称和评审时间');
}
if (!rwname.value) { if (!rwname.value) {
reviewSave({ reviewSave({
@@ -113,10 +113,7 @@ const startReviewSave = async () => {
message.info('编辑成功'); message.info('编辑成功');
InitiateReviewShow.value = false InitiateReviewShow.value = false
formState = {
reviewname: '',
time: '',
};
rwname.value = null rwname.value = null
} }
@@ -241,6 +238,7 @@ const downLoadCoures = (id) => {
//老师重置 //老师重置
const resetTeacher = () => { const resetTeacher = () => {
teacherValue.value = '' teacherValue.value = ''
addTeacherList() addTeacherList()
} }
//老师搜索 //老师搜索
@@ -264,7 +262,7 @@ const addTeacherList = async () => {
const res = await addTeacher({ const res = await addTeacher({
"examineId": route.query.id, "examineId": route.query.id,
"pageSize": 10, "pageSize": 15,
"pageNo": teacherCurrent1.value, "pageNo": teacherCurrent1.value,
"teacherSearch": "" "teacherSearch": ""
}) })
@@ -303,10 +301,11 @@ const getReviewList = async () => {
const res = await getReview({ const res = await getReview({
examineId:route.query.id, examineId:route.query.id,
pageNo: ReviewPageNo.value, pageNo: ReviewPageNo.value,
pageSize: 8, pageSize: 15,
reviewName: "" reviewName: ""
}) })
console.log(res, 'pings'); console.log(res, 'pings');
revieTotal.value = res.data.total
reviewdata.value = res.data.records reviewdata.value = res.data.records
} }
@@ -358,7 +357,10 @@ const reviewdelete = async (id) => {
await delreview({ await delreview({
reviewId: id reviewId: id
}) })
if (reviewdata.value.length == 1) {
ReviewPageNo.value = ReviewPageNo.value - 1
}
getReviewList() getReviewList()
} }
@@ -385,7 +387,7 @@ const searchReview = async () => {
const res = await getReview({ const res = await getReview({
examineId:route.query.id, examineId:route.query.id,
pageNo: ReviewPageNo.value, pageNo: ReviewPageNo.value,
pageSize: 8, pageSize: 15,
reviewName: reviewValue.value reviewName: reviewValue.value
}) })
@@ -408,6 +410,7 @@ const delteacherIdList = async () => {
await deleTeTeacher( await deleTeTeacher(
{ "teacherIds": selectedRowKeysList.value } { "teacherIds": selectedRowKeysList.value }
) )
message.info('删除成功');
console.log('sha c sss'); console.log('sha c sss');
getTeacher() getTeacher()
} }
@@ -415,7 +418,12 @@ const delteacherIdList = async () => {
const exportExcel = () => { const exportExcel = () => {
window.open(`/activityApi/teacher/export?examineId=${route.query.id}`) window.open(`/activityApi/teacher/export?examineId=${route.query.id}`)
} }
function batchhandleOper() { const batchhandleOper =()=>{
if (selectedRowKeysList.value.length == 0) {
message.info('请选择要删除的教师')
return
}
dialog({ dialog({
content: "确认删除吗?数据删除后不可恢复", content: "确认删除吗?数据删除后不可恢复",
ok: () => { ok: () => {
@@ -424,6 +432,7 @@ function batchhandleOper() {
} }
}); });
} }
function handleOper(record, type, status = "") { function handleOper(record, type, status = "") {
dialog({ dialog({
content: "确认删除吗?数据删除后不可恢复", content: "确认删除吗?数据删除后不可恢复",
@@ -670,12 +679,12 @@ const twiceolumnsTwo = [
key: 'score', key: 'score',
}, },
] ]
const selectedRowKeysList = ref(null) const selectedRowKeysList = ref([])
const rowSelection = { const rowSelection = {
onChange: async (selectedRowKeys, selectedRows) => { onChange: async (selectedRowKeys, selectedRows) => {
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
selectedRowKeysList.value = selectedRowKeys selectedRowKeysList.value = selectedRowKeys
console.log(selectedRowKeysList.value.length);
}, },
}; };
@@ -1108,7 +1117,7 @@ const vwtext = ref(null)
</a-table> </a-table>
</div> </div>
<div style="text-align: center; margin-top: 18px;"> <div style="text-align: center; margin-top: 18px;">
<a-pagination v-model:current="ReviewPageNo" show-quick-jumper :total="revieTotal" <a-pagination v-model:current="ReviewPageNo" defaultPageSize="15" show-quick-jumper :total="revieTotal"
@change="onChangeReview" /> @change="onChangeReview" />
</div> </div>
@@ -1138,6 +1147,11 @@ const vwtext = ref(null)
{{ text === 0 ? '通过' : (text === 1 ? '未通过' : (text === 2 ? '进行中' : '已报名')) }} {{ text === 0 ? '通过' : (text === 1 ? '未通过' : (text === 2 ? '进行中' : '已报名')) }}
</span> </span>
</template> </template>
<template v-else-if="column.key === '平均分'">
<span :style="{ color: text >= 80 ? '#44e778' : (text < 80 ? '#f5222d' : '#3da8f0') }">
{{ text >= 80 ? '已通过' : (text < 80 ? '未通过' : text) }}
</span>
</template>
</template> </template>
</a-table> </a-table>
@@ -1164,7 +1178,7 @@ const vwtext = ref(null)
<!-- 发起评审 --> <!-- 发起评审 -->
<a-drawer v-model:visible="InitiateReviewShow" class="custom-class" :closable="false" placement="right" <a-drawer v-model:visible="InitiateReviewShow" class="custom-class" :closable="false" placement="right"
width="726px"> width="726px">
<div class="header"> <div class="header" style=" margin-bottom: 20px;">
<div class="headerTitle">{{ rwname ? '编辑评审' : '发起评审' }}</div> <div class="headerTitle">{{ rwname ? '编辑评审' : '发起评审' }}</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png" <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="InitiateReviewShow = false, rwname = null" /> @click="InitiateReviewShow = false, rwname = null" />
@@ -1176,7 +1190,7 @@ const vwtext = ref(null)
<a-form :model="formState" name="basic" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }" <a-form :model="formState" name="basic" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }"
autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed"> autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
<a-form-item style="margin-top: 29px;" label="评审名称" :rules="[{ required: true, message: '请填写评审名称' }]"> <a-form-item style="margin-top: 29px;" label="评审名称" :rules="[{ required: true, message: '请填写评审名称' }]">
<a-input placeholder="请输入评审名称" v-model:value="formState.reviewname" /> <a-input showCount="ture" maxlength="50" placeholder="请输入评审名称" v-model:value="formState.reviewname" />
</a-form-item> </a-form-item>
<a-form-item label="评审时间" :rules="[{ required: true, message: '请填写评审时间' }]"> <a-form-item label="评审时间" :rules="[{ required: true, message: '请填写评审时间' }]">
@@ -1186,7 +1200,7 @@ const vwtext = ref(null)
<div>选择讲师</div> <div>选择讲师</div>
<div style="width: 430px; height: 1px;background-color: #e2e0e0;margin-top: 8px;"></div> <div style="width: 430px; height: 1px;background-color: #e2e0e0;margin-top: 8px;"></div>
<div style="display: flex;margin-top: 13px;"> <div style="display: flex;margin-top: 13px;">
<a-input v-model:value="teacherValue" placeholder="请输入姓名/工号" style="width: 150px;" /> <a-input v-model:value="teacherValue" placeholder="请输入姓名/工号" style="width: 150px;" />
<a-button @click="SearchTeacher()" type="primary" <a-button @click="SearchTeacher()" type="primary"
style="width: 70px; height: 31px; border-radius: 5px;margin-left: 15px;background: #3da8f0;">搜索</a-button> style="width: 70px; height: 31px; border-radius: 5px;margin-left: 15px;background: #3da8f0;">搜索</a-button>
<a-button @click="resetTeacher()" type="primary" <a-button @click="resetTeacher()" type="primary"
@@ -1232,7 +1246,7 @@ const vwtext = ref(null)
</div> </div>
</div> </div>
<div style="width: 100%;margin-top: 65px;text-align: center;"> <div style="width: 100%;margin-top: 0px;text-align: center;">
<a-button type="primary" @click="CancelReview()" <a-button type="primary" @click="CancelReview()"
style="background: #3da8f0;width: 100px; height: 38px; border-radius: 8px ;margin: 0 15px 0 15px;margin-left: 30px">取消</a-button> style="background: #3da8f0;width: 100px; height: 38px; border-radius: 8px ;margin: 0 15px 0 15px;margin-left: 30px">取消</a-button>
<a-button @click="startReviewSave()" html-type="submit" type="primary" <a-button @click="startReviewSave()" html-type="submit" type="primary"

View File

@@ -18,10 +18,18 @@
</div> </div>
<div class="downloadCode" style=""> <div class="downloadCode" style="">
<div class="qrm_body"> <div class="qrm_body">
<div class="qrm_body_info"> <div class="qrm_body_info" style=" text-align: center;
<div class="codename" v-if="courseName">项目{{ courseName }}</div> display: flex;
align-self: center;
flex-wrap: wrap;
flex-direction: column-reverse;
align-content: center;
justify-content: center;
margin-bottom: 10px;
">
<div class="codename">{{ name }}</div> <div class="codename">{{ name }}</div>
<div class="codename" v-if="createName">讲师{{ createName }}</div>
</div> </div>
<QrcodeVue :value="url" :size="size" style="width: 200px; height: 200px"></QrcodeVue> <QrcodeVue :value="url" :size="size" style="width: 200px; height: 200px"></QrcodeVue>
</div> </div>
@@ -173,7 +181,7 @@
align-items: center; align-items: center;
.qrm_body_info{ .qrm_body_info{
width: 100%; width: 100%;
margin-left: 278px;
} }
.codename { .codename {
font-size: 18px; font-size: 18px;