修改bug
This commit is contained in:
parent
d9ece7c44b
commit
cb0956983e
|
@ -39,7 +39,7 @@
|
|||
<a-collapse-panel :key="index" v-for="(item, index) in zyInfo.tmlbList">
|
||||
<template #header>
|
||||
<a-row :span="24" style="width: 90%">
|
||||
<a-col :span="24" class="title2">{{ item.wjTitle }}</a-col>
|
||||
<a-col :span="24" class="title2"><div v-html="item.wjTitle"></div></a-col>
|
||||
<a-col :span="8" style="color: #909399; display: flex; flex-direction: column; text-align: left; font-size: 12px"
|
||||
><span style="font-weight: bold; font-size: 20px; margin-left: 5px">{{ item.yzd }}</span
|
||||
>已作答人数</a-col
|
||||
|
@ -142,7 +142,7 @@
|
|||
<a-collapse-panel :key="index" v-for="(item, index) in zyInfo.tmlbList">
|
||||
<template #header>
|
||||
<a-row :span="24" style="width: 100%">
|
||||
<a-col :span="24" class="title2">{{ item.wjTitle }}</a-col>
|
||||
<a-col :span="24" class="title2"><div v-html="item.wjTitle"></div></a-col>
|
||||
</a-row>
|
||||
</template>
|
||||
<!-- 单选题 -->
|
||||
|
|
|
@ -866,12 +866,12 @@
|
|||
</a-row>
|
||||
</template>
|
||||
<a-row>
|
||||
<a-col :lg="18" :xs="24">
|
||||
<a-col :lg="16" :xs="24">
|
||||
<a-row>
|
||||
<a-col :md="4" :xs="12">
|
||||
<span style="margin-left: 10px">
|
||||
<a-dropdown>
|
||||
<a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:form-outlined" /> 设计测验 </a>
|
||||
<a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:form-outlined" />设计测验 </a>
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
<a-menu-item>
|
||||
|
@ -935,10 +935,12 @@
|
|||
</a-col>
|
||||
</a-row>
|
||||
</a-col>
|
||||
<a-col :lg="6" :xs="24">
|
||||
<a-col :lg="8" :xs="24">
|
||||
<div style="text-align: right">
|
||||
<a @click="handleEdit(item, false)" class="ant-dropdown-link1">编辑测验</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFenxiang(item)" class="ant-dropdown-link1">分享</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFabu(item)" class="ant-dropdown-link1">发布测验</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleDelete(item)" class="ant-dropdown-link1">删除</a>
|
||||
|
@ -1150,11 +1152,16 @@ function handleCallYinyong(record) {
|
|||
var yyzyid = record.id;//引用作业id
|
||||
var zysort = zyInfo.value.sort;//防止顺序错误
|
||||
var zyid = zyInfo.value.id;//替换原来的id,防止新增
|
||||
var createBy = zyInfo.value.createBy;//替换原来的id,防止新增
|
||||
var rwbh = zyInfo.value.rwbh;//替换原来的id,防止新增
|
||||
record.id = zyid;
|
||||
record.sort = zysort;
|
||||
record.atype = "6";//作业类型,课程作业
|
||||
record.qpublish = "0";
|
||||
record.vid = "";
|
||||
zyInfo.value = record;
|
||||
zyInfo.value.createBy = createBy
|
||||
zyInfo.value.rwbh = rwbh
|
||||
console.log('😠', zyInfo);
|
||||
|
||||
|
||||
|
|
|
@ -73,6 +73,11 @@ export const columns2: BasicColumn[] = [
|
|||
align: "center",
|
||||
dataIndex: 'xqxn'
|
||||
},
|
||||
{
|
||||
title: '分享教师',
|
||||
align: "center",
|
||||
dataIndex: 'yuanTeacherName'
|
||||
},
|
||||
// {
|
||||
// title: '选课人数',
|
||||
// align: "center",
|
||||
|
|
|
@ -142,10 +142,10 @@ function getTableAction(record) {
|
|||
label: '答卷结果',
|
||||
onClick: handlePeizhiDjjg.bind(null, record),
|
||||
},
|
||||
// {
|
||||
// label: '获取结果',
|
||||
// onClick: handleHqjg.bind(null, record),
|
||||
// },
|
||||
//{
|
||||
// label: '获取结果',
|
||||
// onClick: handleHqjg.bind(null, record),
|
||||
//},
|
||||
{
|
||||
label: '主观题评分',
|
||||
onClick: handleZgypf.bind(null, record),
|
||||
|
|
|
@ -1,16 +1,19 @@
|
|||
<template>
|
||||
<div>
|
||||
<a-tabs v-model:activeKey="activeKey" type="card" style="background-color: white;">
|
||||
<a-tab-pane key="1" tab="作业:按课程统计">
|
||||
<a-tab-pane key="1" tab="统计信息">
|
||||
<TjsjList></TjsjList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2" tab="作业:按课程统计">
|
||||
<ZyKctjList></ZyKctjList>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2" tab="作业:按教师统计">
|
||||
<a-tab-pane key="3" tab="作业:按教师统计">
|
||||
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="3" tab="测验:按课程统计">
|
||||
<a-tab-pane key="4" tab="测验:按课程统计">
|
||||
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="4" tab="测验:按教师统计">
|
||||
<a-tab-pane key="5" tab="测验:按教师统计">
|
||||
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
@ -31,6 +34,7 @@
|
|||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
|
||||
import { useGlobSetting } from '/@/hooks/setting';
|
||||
import TjsjList from '/@/views/zy/sysZy/kczygl/TjsjList.vue';
|
||||
import ZyKctjList from '/@/views/zy/sysZy/kczygl/ZyKctjList.vue';
|
||||
|
||||
const globSetting = useGlobSetting();
|
||||
|
|
|
@ -0,0 +1,121 @@
|
|||
<template>
|
||||
<div>
|
||||
<a-row>
|
||||
<a-col :span="6" class="staticCol">
|
||||
<a-card title="本学年使用情况">
|
||||
<a-row>
|
||||
<a-col :span="24" class="staticCol"><span>作业使用总次数:</span><span>{{staticInfo.xn_zy_syzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>作业互评总次数:</span><span>{{staticInfo.xn_zy_hpzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>作业已完成总次数:</span><span>{{staticInfo.xn_zy_ywczcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>测验使用总次数:</span><span>{{staticInfo.xn_cy_syzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>测验已完成总次数:</span><span>{{staticInfo.xn_cy_ywczcs}}</span></a-col>
|
||||
</a-row>
|
||||
</a-card>
|
||||
|
||||
<a-card title="今日使用情况" style="margin-top: 20px;">
|
||||
<a-row>
|
||||
<a-col :span="24" class="staticCol"><span>作业使用总次数:</span><span>{{staticInfo.jr_zy_syzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>作业互评总次数:</span><span>{{staticInfo.jr_zy_hpzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>作业已完成总次数:</span><span>{{staticInfo.jr_zy_ywczcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>测验使用总次数:</span><span>{{staticInfo.jr_cy_syzcs}}</span></a-col>
|
||||
<a-col :span="24" class="staticCol"><span>测验已完成总次数:</span><span>{{staticInfo.jr_cy_ywczcs}}</span></a-col>
|
||||
</a-row>
|
||||
</a-card>
|
||||
</a-col>
|
||||
<a-col :span="9" class="staticCol">
|
||||
<div class="staticTitle">本学年作业使用排行TOP10</div>
|
||||
<a-row>
|
||||
<a-col>
|
||||
<a-table :dataSource="staticInfo.xntop10" :columns="columns" :pagination="false" :bordered="true"/>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-col>
|
||||
<a-col :span="9" class="staticCol">
|
||||
<div class="staticTitle">本学年测验使用排行TOP10</div>
|
||||
<a-row>
|
||||
<a-col>
|
||||
<a-table :dataSource="staticInfo.jrtop10" :columns="columns" :pagination="false" :bordered="true" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="zyJxdg-zyJxdg" setup>
|
||||
import { ref, reactive,onMounted } from 'vue';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
const staticInfo = ref<any>({});
|
||||
|
||||
|
||||
const columns = [
|
||||
{
|
||||
title: '序号',
|
||||
dataIndex: 'rownum',
|
||||
key: 'rownum',
|
||||
width: 62,
|
||||
align: 'center',
|
||||
customRender: function ({ record,text }) {
|
||||
return parseInt(text);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '姓名',
|
||||
dataIndex: 'skjs',
|
||||
key: 'skjs',
|
||||
width: 80,
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '次数',
|
||||
dataIndex: 'count',
|
||||
key: 'count',
|
||||
width: 62,
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: '学院',
|
||||
dataIndex: 'kkdw',
|
||||
key: 'kkdw',
|
||||
ellipsis: true,
|
||||
},
|
||||
]
|
||||
|
||||
function getStaticNo(){
|
||||
defHttp.get({url:'/zyInfo/zyInfo/sysStaticNo'}).then(res=>{
|
||||
staticInfo.value = res;
|
||||
console.log("🚀 ~ defHttp.get ~ staticInfo.value:", staticInfo.value)
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getStaticNo();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.jeecg-basic-table-form-container {
|
||||
.table-page-search-submitButtons {
|
||||
display: block;
|
||||
margin-bottom: 24px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.query-group-cust{
|
||||
width: calc(50% - 15px);
|
||||
min-width: 100px !important;
|
||||
}
|
||||
.query-group-split-cust{
|
||||
width: 30px;
|
||||
display: inline-block;
|
||||
text-align: center
|
||||
}
|
||||
}
|
||||
.staticCol{
|
||||
padding: 10px;
|
||||
}
|
||||
.staticTitle{
|
||||
margin: 10px 0;
|
||||
font-size: 16px;
|
||||
}
|
||||
</style>
|
|
@ -1,15 +1,15 @@
|
|||
<template>
|
||||
<div style="background: #fff; overflow-y: auto; overflow-x: hidden; margin: 10px 5px;height: calc(100% - 10px);">
|
||||
<a-row>
|
||||
<a-row style="height:640px;overflow-y: auto; overflow-x: hidden;">
|
||||
<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.sort }}次作业(本次作业在总成绩中的占比:{{item.zyzb}}%)</div>
|
||||
<!-- </a-col> -->
|
||||
</div>
|
||||
<a-card style="min-height: 240px; border: 1px solid #eeeeee">
|
||||
<a-card style="min-height: 200px; border: 1px solid #eeeeee">
|
||||
<div class="rotate" :style="classFun(item)">{{ callText(item) }}</div>
|
||||
<a-row style="top: -60px; position: relative">
|
||||
<a-row style="margin-top: -40px;">
|
||||
<a-col :span="24" class="zytitle" :title="item.title" @click="handleDetail(item)"
|
||||
><span class="zytitle-back ellipsis">{{ item.title }}</span></a-col
|
||||
>
|
||||
|
|
|
@ -96,6 +96,11 @@ export const columns2: BasicColumn[] = [
|
|||
align: "center",
|
||||
dataIndex: 'xnxq'
|
||||
},
|
||||
{
|
||||
title: '分享教师',
|
||||
align: "center",
|
||||
dataIndex: 'yuanTeacherName'
|
||||
},
|
||||
];
|
||||
|
||||
//列表数据
|
||||
|
|
|
@ -560,6 +560,8 @@
|
|||
<div style="text-align: right; margin-top: 30px">
|
||||
<a @click="handleEdit(item, false)" class="home-status"><Icon icon="ant-design:form-outlined" />编辑作业</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFenxiang(item)" class="home-status"><Icon icon="ant-design:share-alt-outlined" />分享</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFabu(item)" class="home-status"><Icon icon="ant-design:upload-outlined" />发布作业</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleDelete(item)" class="home-status"><Icon icon="ant-design:delete-outlined" />删除</a>
|
||||
|
@ -733,11 +735,18 @@ function handleCallYinyong(record) {
|
|||
console.log('👯♂️', record);
|
||||
var zysort = zyInfo.value.sort; //防止顺序错误
|
||||
var zyid = zyInfo.value.id; //替换原来的id,防止新增
|
||||
var createBy = zyInfo.value.createBy;//替换原来的id,防止新增
|
||||
var rwbh = zyInfo.value.rwbh;//替换原来的id,防止新增
|
||||
record.id = zyid;
|
||||
record.sort = zysort;
|
||||
record.zyLeixing = '1'; //作业类型,期末考试
|
||||
zyInfo.value = record;
|
||||
zyInfo.value.createBy = createBy
|
||||
zyInfo.value.rwbh = rwbh
|
||||
zyInfo.value.zyStatus = "0"
|
||||
console.log('😠', zyInfo);
|
||||
|
||||
|
||||
}
|
||||
function handleXshpkg(record) {
|
||||
console.log('👨👧👦', record);
|
||||
|
|
|
@ -556,6 +556,8 @@
|
|||
<div style="text-align: right; margin-top: 30px">
|
||||
<a @click="handleEdit(item, false)" class="home-status"><Icon icon="ant-design:form-outlined" />编辑作业</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFenxiang(item)" class="home-status"><Icon icon="ant-design:share-alt-outlined" />分享</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleFabu(item)" class="home-status"><Icon icon="ant-design:upload-outlined" />发布作业</a>
|
||||
<a-divider type="vertical" />
|
||||
<a @click="handleDelete(item)" class="home-status"><Icon icon="ant-design:delete-outlined" />删除</a>
|
||||
|
@ -738,10 +740,15 @@ function handleCallYinyong(record) {
|
|||
console.log('👯♂️', record);
|
||||
var zysort = zyInfo.value.sort; //防止顺序错误
|
||||
var zyid = zyInfo.value.id; //替换原来的id,防止新增
|
||||
var createBy = zyInfo.value.createBy;//替换原来的id,防止新增
|
||||
var rwbh = zyInfo.value.rwbh;//替换原来的id,防止新增
|
||||
record.id = zyid;
|
||||
record.sort = zysort;
|
||||
record.zyLeixing = '0'; //作业类型,课程作业
|
||||
zyInfo.value = record;
|
||||
zyInfo.value.createBy = createBy
|
||||
zyInfo.value.rwbh = rwbh
|
||||
zyInfo.value.zyStatus = "0"
|
||||
console.log('😠', zyInfo);
|
||||
}
|
||||
//分享给他人
|
||||
|
|
Loading…
Reference in New Issue