修改bug
This commit is contained in:
parent
5fdb9598dd
commit
e14993b4f4
|
@ -30,9 +30,9 @@
|
|||
</a-form>
|
||||
</div>
|
||||
<a-row>
|
||||
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
|
||||
<a-col :span="24" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
|
||||
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
|
||||
<a-card style="height: 210px;border: 1px solid rgb(28, 132, 198);">
|
||||
<a-card style="height: 130px;border: 1px solid rgb(28, 132, 198);">
|
||||
<div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div>
|
||||
<a-row style="top: -48px;position: relative;">
|
||||
<a-col :span="24" style="margin-bottom: 10px;height:53px;overflow:hidden;">
|
||||
|
@ -40,20 +40,17 @@
|
|||
</a-col>
|
||||
<a-col :span="24" class="zyCon">
|
||||
<a-row>
|
||||
<a-col :span="24" class="zyCon">
|
||||
时间:{{dayjs(item.startTime).format('YYYY.MM.DD')}} - {{dayjs(item.endTime).format('YYYY.MM.DD')}}
|
||||
<a-col :span="18" class="zyCon">
|
||||
时间:{{dayjs(item.startTime).format('MM.DD HH-mm')}} - {{dayjs(item.endTime).format('MM.DD HH-mm')}}
|
||||
</a-col>
|
||||
<a-col :span="6" style="text-align:center;">
|
||||
<a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='-1'">开始测验</a-button>
|
||||
<a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff" v-if="item.flag=='0'" disabled>正在批卷</a-button>
|
||||
<a-button type="primary" @click="handleDjjg(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='1'">查看结果</a-button>
|
||||
</a-col>
|
||||
<!-- <a-col :span="16" class="zyCon">
|
||||
<a-col :span="24" class="zyCon">从{{item.startTime}}</a-col>
|
||||
<a-col :span="24" class="zyCon">至{{item.endTime}}</a-col>
|
||||
</a-col> -->
|
||||
</a-row>
|
||||
</a-col>
|
||||
<a-col :span="24" style="text-align:center;margin-top:20px;">
|
||||
<a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='-1'">开始测验</a-button>
|
||||
<a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff" v-if="item.flag=='0'" disabled>正在批卷</a-button>
|
||||
<a-button type="primary" @click="handleDjjg(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='1'">查看结果</a-button>
|
||||
</a-col>
|
||||
|
||||
</a-row>
|
||||
</a-card>
|
||||
</a-col>
|
||||
|
@ -249,7 +246,7 @@
|
|||
padding: 19px 10px 3px 10px;
|
||||
position: relative;
|
||||
top: -54px;
|
||||
right: -131px;
|
||||
right: -408px;
|
||||
text-align: center;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
|
|
@ -1,32 +1,11 @@
|
|||
<template>
|
||||
<div style="background: #fff; overflow-y: auto; overflow-x: hidden; margin: 10px 5px">
|
||||
<!--查询区域-->
|
||||
<!-- <div class="jeecg-basic-table-form-container">
|
||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||
<a-row :gutter="24">
|
||||
<a-col :lg="8">
|
||||
<a-form-item label="作业名称">
|
||||
<j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||
<a-col :lg="6">
|
||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
||||
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
|
||||
</a-col>
|
||||
</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div> -->
|
||||
<div style="background: #fff; overflow-y: auto; overflow-x: hidden; margin: 10px 5px;height: calc(100% - 10px);">
|
||||
<a-row>
|
||||
<a-col :span="24" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px; border-radius: 10px; overflow: hidden;">
|
||||
<div style="width: 100%; height:40px;border-radius: 10px 10px 0 0; background-color: #f7f7f7">
|
||||
<a-col :span="24" style="height:40px; line-height:40px; padding-left:15px; color:#333; overflow: hidden;" >
|
||||
<!-- <div style="font-size: 18px;font-weight: bold;" class="ellipsis">{{item.title}}</div> -->
|
||||
<!-- <a-col :span="24" style="height:40px; line-height:40px; padding-left:15px; color:#333; overflow: hidden;" > -->
|
||||
<div style="font-size: 18px; font-weight: bold">第{{ item.sort }}次作业(本次作业在期末成绩中的占比:{{item.zyzb}}%)</div>
|
||||
</a-col>
|
||||
<!-- </a-col> -->
|
||||
</div>
|
||||
<a-card style="height: 240px; border: 1px solid #eeeeee">
|
||||
<div class="rotate" :style="classFun(item)">{{ callText(item) }}</div>
|
||||
|
@ -45,18 +24,6 @@
|
|||
><span v-else>未设置互评</span></a-col
|
||||
>
|
||||
<a-col :span="12" class="zyCon Score-List">
|
||||
<!-- <div class="Score-List-row">
|
||||
<span class="List-row-number">{{ item.stuscore ? item.stuscore : '未评' }}分</span>
|
||||
<span class="List-row-word">作业得分</span>
|
||||
</div>
|
||||
<div class="Score-List-row" v-if="handleSfkshp(item)" @click="handleHpfs(item)">
|
||||
<span class="List-row-number">{{ item.xshpfs ? item.xshpfs : '未评' }}分</span>
|
||||
<span class="List-row-word">互评分数</span>
|
||||
</div>
|
||||
<div class="Score-List-row" v-if="handleSfkshp(item)">
|
||||
<span class="List-row-number">{{ item.jxfs ? item.jxfs : '未评' }}分</span>
|
||||
<span class="List-row-word">互评奖励</span>
|
||||
</div> -->
|
||||
<a-popover title="得分情况">
|
||||
<template #content>
|
||||
<p>作业得分:{{ item.stuscore && item.scoreFabu == '1' ? item.stuscore : '未评' }}分</p>
|
||||
|
@ -86,29 +53,13 @@
|
|||
<span class="zyCon-word" style="cursor: pointer" @click="handleOpenCcjg(item, '2')">Aigc查重:</span>{{ getCctype(item, '3') }}
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- <p><span class="zyCon-word">维普资源库查重:</span>{{ getCctype(item, '1') }}</p>
|
||||
<p><span class="zyCon-word">本次作业查重:</span>{{ getCctype(item, '2') }}</p>
|
||||
<p><span class="zyCon-word">学校作业库查重:</span>{{ getCctype(item, '4') }}</p>
|
||||
<p><span class="zyCon-word">Aigc查重:</span>{{ getCctype(item, '3') }}</p> -->
|
||||
</template>
|
||||
<div class="Score-List-row">
|
||||
<span class="List-row-number">{{ item.zgccl && item.zgccl != '0' ? item.zgccl : '-' }}</span>
|
||||
<span class="List-row-word">查重率</span>
|
||||
</div>
|
||||
</a-popover>
|
||||
<!-- <div class="Score-List-row">
|
||||
<span class="List-row-number">{{ item.zgccl?item.zgccl:'-' }}</span>
|
||||
<span class="List-row-word">查重率</span>
|
||||
</div> -->
|
||||
</a-col>
|
||||
<!-- <a-col :span="24" class="zyCon">
|
||||
<div style="float: left" class="wpopen" :title="item.wwsftg" @click="handleOpenCcjg(item, '0')"><span class="zyCon-word">维普资源库查重:</span>{{ getCctype(item, '1') }}</div>
|
||||
<div style="float: right" class="wpopen" :title="item.nwsftg" @click="handleOpenCcjg(item, '1')"><span class="zyCon-word">本次作业查重:</span>{{ getCctype(item, '2') }}</div>
|
||||
</a-col>
|
||||
<a-col :span="24" class="zyCon">
|
||||
<div style="float: left" class="wpopen" :title="item.xnsftg" @click="handleOpenCcjg(item, '3')"><span class="zyCon-word">学校作业库查重:</span>{{ getCctype(item, '4') }}</div>
|
||||
<div style="float: right" class="wpopen" :title="item.aigcsftg" @click="handleOpenCcjg(item, '2')"><span class="zyCon-word">Aigc查重:</span>{{ getCctype(item, '3') }}</div>
|
||||
</a-col> -->
|
||||
<a-col :span="24" style="text-align: left; border-top: 1px solid #f6f6f6; padding-top: 10px">
|
||||
<a-button class="zyCon-button" type="primary" @click="handleDetail(item)"> 详情 </a-button>
|
||||
<a-button class="zyCon-button" type="primary" @click="handleShangchuan(item)" v-if="!item.stuFilePath"> 上传 </a-button>
|
||||
|
@ -546,14 +497,8 @@ onMounted(() => {
|
|||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
<<<<<<< .mine
|
||||
text-indent: 20px;
|
||||
padding: 5px 15px;
|
||||
border-radius: 0 30px 30px 0;
|
||||
=======
|
||||
margin-left:24px;
|
||||
|
||||
|
||||
>>>>>>> .theirs
|
||||
}
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue