yangjun
/
DBSD_ZJPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.115.223.229:8888/yangjun/DBSD_ZJPT 

# Conflicts:
#	jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue
This commit is contained in:
yangjun 2024-09-14 10:59:19 +08:00
parent 7ba53bc668 866c15e416
commit 4b0aaf0ee0
6 changed files with 209 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
jeecgboot-vue3/src/assets/images/Course-selection.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 KiB

30
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue
View File

@ -2,14 +2,15 @@
<div class="p-2">
<div v-if="sfxk == 0">
<div style="text-align: center">
<div style="color: red; font-weight: 700; font-size: 20; margin-top: 200px">您还没有选课，请先选择课程</div>
<img src="../../../assets/images/Course-selection.png" style="margin-top:200px; width:600px" />
<div style="color:#606266; font-weight: 700; font-size: 20; margin-top:20px">您还没有选课，请先选择课程</div>
<a-button type="primary" style="margin-left: 10px; margin-top: 10px" @click="handleXuanke">选课</a-button>
</div>
</div>
<!-- 选课信息 -->
<div v-if="sfxk == 1">
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery2" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery2" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="zjxnxq">
@ -115,7 +116,7 @@
<div v-if="sfxk == 999">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="zjxnxq">
@ -197,7 +198,7 @@
</div>
<!-- 表单区域 -->
<XxhbjwxtjxrwModal ref="registerModal" @success="handleSuccess"></XxhbjwxtjxrwModal>
<XxhbjwxtjxrwModal ref="registerModal" @success="handleSuccess"></XxhbjwxtjxrwModal class="table-style">
</div>
</template>
@ -474,4 +475,25 @@ onMounted(() => {
width: 100%;
}
}
.query-criteria{
padding-top: 22px;
border:1px solid #eaeef6;
border-radius:4px;
}
.query-criteria:hover{
border:1px solid #e8ecf4;
box-shadow: 2px 2px 10px 2px #e8ecf4;
border-radius:4px;
}
.table-style{
padding: 10px;
background: #fff;
border:1px solid #eaeef6;
border-radius:4px;
}
.table-style:hover{
border:1px solid #e8ecf4;
box-shadow: 2px 2px 10px 2px #e8ecf4;
border-radius:4px;
}
</style>

55
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue
View File

@ -2,33 +2,33 @@
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :span="12"> <span style="font-size: 22px;font-weight: 700;margin-left: 20px;">学生成绩</span> </a-col>
<a-col :span="12"><span class="seleciton-line">1</span><span class="selection-title">成绩单</span> </a-col>
<a-col :span="12" style="text-align: right">
<a-button type="primary" @click="handleFanhui">返回</a-button>
</a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size: 16px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<div style="padding-left:14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">选课人数</span> ：<span>{{ jxrwInfo?.value.jxbrs }}</span>
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>
@ -40,7 +40,7 @@
详细信息
</div> -->
<!--引用表格-->
<BasicTable @register="registerTable">
<BasicTable @register="registerTable" class="table-style">
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
@ -223,4 +223,39 @@ defineExpose({
width: 100%;
}
}
.selection-title{
font-size:18px;
font-weight: 700;
padding-left: 10px;
}
.seleciton-line{
background: #1890ff;
border-radius:10px ;
color: #1890ff;
}
.header-title{
font-size:16px;
color: #666;
}
.query-criteria{
padding:10px 10px 15px 10px;
border:1px solid #e4e9f2;
border-radius:4px;
}
.query-criteria:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
.table-style{
padding: 10px;
background: #fff;
border:1px solid #e4e9f2;
border-radius:4px;
}
.table-style:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
</style>

55
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue
View File

@ -2,33 +2,33 @@
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :span="12"> <span style="font-size: 22px; font-weight: 700; margin-left: 20px">考核评价材料</span> </a-col>
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">考核评价材料</span> </a-col>
<a-col :span="12" style="text-align: right">
<a-button type="primary" style="margin-left: 8px" @click="handleFanhui">返回</a-button>
</a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size: 16px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
<div style="text-align: center; font-size: 24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<div style="padding-left: 14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">选课人数</span> ：<span>{{ jxrwInfo?.value.jxbrs }}</span>
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>
@ -37,7 +37,7 @@
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<BasicTable @register="registerTable" :rowSelection="rowSelection" class="table-style">
<template #tableTitle>
<a-button type="primary" v-if="selectedRowKeys.length > 0" @click="batchHandleDown"> 批量下载 </a-button>
</template>
@ -298,4 +298,39 @@ defineExpose({
width: 100%;
}
}
.selection-title{
font-size:18px;
font-weight: 700;
padding-left:10px;
}
.seleciton-line{
background: #1890ff;
border-radius:10px ;
color: #1890ff;
}
.header-title{
font-size: 16px;
color: #666;
}
.query-criteria{
padding:10px 10px 15px 10px;
border:1px solid #e4e9f2;
border-radius:4px;
}
.query-criteria:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
.table-style{
padding: 10px;
background: #fff;
border:1px solid #e4e9f2;
border-radius:4px;
}
.table-style:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
</style>

57
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue
View File

@ -2,33 +2,33 @@
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :span="12"> <span style="font-size: 22px; font-weight: 700; margin-left: 20px">学生原始材料 </span> </a-col>
<a-col :span="12"><span class="seleciton-line">1</span><span class="selection-title">学生原始材料</span> </a-col>
<a-col :span="12" style="text-align: right">
<a-button type="primary" @click="handleFanhui">返回</a-button>
</a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size: 16px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<div style="padding-left:14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">选课人数</span> ：<span>{{ jxrwInfo?.value.jxbrs }}</span>
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>
@ -40,7 +40,7 @@
详细信息
</div> -->
<!--引用表格-->
<BasicTable @register="registerTable">
<BasicTable @register="registerTable" class="table-style">
<template #headerCell="{ column }">
<template v-if="column.key === 'cdlx'">
<a-popover placement="topRight" class="">
@ -209,4 +209,41 @@ defineExpose({
width: 100%;
}
}
.selection-title{
font-size:18px;
font-weight: 700;
padding-left:10px;
line-height: 30px;
margin-top: 10px;
}
.seleciton-line{
background: #1890ff;
border-radius:10px ;
color: #1890ff;
}
.header-title{
font-size:16px;
color: #666;
}
.query-criteria{
padding:15px 10px 15px 10px;
border:1px solid #e4e9f2;
border-radius:4px;
}
.query-criteria:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
.table-style{
padding: 10px;
background: #fff;
border:1px solid #e4e9f2;
border-radius:4px;
}
.table-style:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
</style>

56
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue
View File

@ -3,33 +3,33 @@
<!--查询区域-->
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24" v-if="jxrwInfo?.value">
<a-col :span="12"> <span style="font-size: 22px; font-weight: 700; margin-left: 20px">{{ jxrwInfo?.value?.khfs }}[{{ jxrwInfo?.value?.zb }}] </span> </a-col>
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">{{ jxrwInfo?.value?.khfs }}[{{ jxrwInfo?.value?.zb }}] </span> </a-col>
<a-col :span="12" style="text-align: right">
<a-button type="primary" @click="handleFanhui">返回</a-button>
</a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size: 16px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">选课人数</span> ：<span>{{ jxrwInfo?.value.jxbrs }}</span>
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>
@ -41,7 +41,7 @@
详细信息
</div> -->
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<BasicTable @register="registerTable" :rowSelection="rowSelection" class="table-style">
<template #tableTitle>
<a-button type="primary" v-if="selectedRowKeys.length > 0" @click="batchHandleDown"> 批量下载 </a-button>
</template>
@ -258,4 +258,40 @@ defineExpose({
width: 100%;
}
}
.selection-title{
font-size:18px;
font-weight: 700;
padding-left:10px;
line-height: 30px;
}
.seleciton-line{
background: #1890ff;
border-radius:10px ;
color: #1890ff;
}
.query-criteria{
padding:15px 10px 15px 10px;
border:1px solid #e4e9f2;
border-radius:4px;
}
.query-criteria:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
.table-style{
padding: 10px;
background: #fff;
border:1px solid #e4e9f2;
border-radius:4px;
}
.table-style:hover{
border:1px solid #e4e9f2;
box-shadow: 2px 2px 10px 2px #e4e9f2;
border-radius:4px;
}
.header-title{
font-size:16px;
color: #666;
}
</style>