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

Compare commits

base: yangjun:4b0aaf0ee056e32b2ed7235333a920fbca14743e
Branches Tags
yangjun:main
...
compare: yangjun:bc15e700fe2ea75cb9209e7b380d6113199ad657
Branches Tags
yangjun:main

2 Commits
4b0aaf0ee0 ... bc15e700fe

Author SHA1 Message Date
kbing1981 bc15e700fe Merge branch 'main' of http://47.115.223.229:8888/yangjun/DBSD_ZJPT into main 
# Conflicts:
#	jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue
 2024-09-14 11:56:11 +08:00
kbing1981 4b5392ecdc 修改 2024-09-14 11:47:00 +08:00
4 changed files with 57 additions and 34 deletions
Show Stats Expand all files Collapse all files

4
jeecgboot-vue3/.env.development
View File

@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/jeecgboot","http://192.168.2.13:8080/jeecg-boot"],["/upload","http://192.168.2.13:3300/upload"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot VITE_GLOB_DOMAIN_URL=http://192.168.2.13:8080/jeecg-boot
#后台接口父地址(必填) #后台接口父地址(必填)
VITE_GLOB_API_URL=/jeecgboot VITE_GLOB_API_URL=/jeecgboot

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

@ -3,7 +3,7 @@
<div v-if="sfxk == 0"> <div v-if="sfxk == 0">
<div style="text-align: center"> <div style="text-align: center">
<img src="../../../assets/images/Course-selection.png" style="margin-top:200px; width:600px" /> <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> <div style="color:#606266; font-weight: 700; font-size: 20px; margin-top:20px">您还没有选课，请先选择课程</div>
<a-button type="primary" style="margin-left: 10px; margin-top: 10px" @click="handleXuanke">选课</a-button> <a-button type="primary" style="margin-left: 10px; margin-top: 10px" @click="handleXuanke">选课</a-button>
</div> </div>
</div> </div>
@ -13,20 +13,20 @@
<a-form ref="formRef" @keyup.enter.native="searchQuery2" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria"> <a-form ref="formRef" @keyup.enter.native="searchQuery2" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zjxnxq"> <a-form-item name="xn">
<template #label><span title="学年学期">学年学期</span></template> <template #label><span title="学年" class="xn-title">学年</span></template>
<j-dict-select-tag placeholder="请选择学年学期" v-model:value="queryParam2.zjxnxq" :dictCode="`v_xqxn,xqxn,xqxn`" allow-clear /> <j-dict-select-tag placeholder="请选择学年" v-model:value="queryParam2.xn" :dictCode="`v_xn,xn,xn`" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :lg="6"> <a-col :lg="6">
<a-form-item name="xqmc"> <a-form-item name="xqmc">
<template #label><span title="学期">学期</span></template> <template #label><span title="学期" class="xn-title">学期</span></template>
<j-dict-select-tag placeholder="请选择学期" v-model:value="queryParam2.xqmc" dictCode="cjxq" allow-clear /> <j-dict-select-tag placeholder="请选择学期" v-model:value="queryParam2.xqmc" dictCode="cjxq" allow-clear />
</a-form-item> </a-form-item>
</a-col> --> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kkyxmc"> <a-form-item name="kkyxmc">
<template #label><span title="开课单位名称">开课单位名称</span></template> <template #label><span title="开课单位名称" class="xn-title">开课单位名称</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择开课单位名称" placeholder="请选择开课单位名称"
v-model:value="queryParam2.kkyxmc" v-model:value="queryParam2.kkyxmc"
@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zhunaye"> <a-form-item name="zhunaye">
<template #label><span title="所属专业">所属专业</span></template> <template #label><span title="所属专业" class="xn-title">所属专业</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择所属专业" placeholder="请选择所属专业"
v-model:value="queryParam2.zhuanye" v-model:value="queryParam2.zhuanye"
@ -47,14 +47,14 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="teaxm"> <a-form-item name="kcmc">
<template #label><span title="任课教师">任课教师</span></template> <template #label><span title="任课教师" class="xn-title">任课教师</span></template>
<j-input placeholder="请输入任课教师" v-model:value="queryParam2.teaxm" allow-clear></j-input> <j-input placeholder="请输入任课教师" v-model:value="queryParam2.teaxm" allow-clear></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zhicheng"> <a-form-item name="zhicheng">
<template #label><span title="职称">职称</span></template> <template #label><span title="职称" class="xn-title">职称</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择职称" placeholder="请选择职称"
v-model:value="queryParam2.zhicheng" v-model:value="queryParam2.zhicheng"
@ -63,7 +63,7 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="18" style="text-align: right"> <a-col :span="12" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button>
</a-col> </a-col>
</a-row> </a-row>
@ -79,7 +79,7 @@
> >
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'"> <template v-if="column.dataIndex === 'action'">
<a @click="handleQueren(record)">选择</a> <a @click="handleQueren(record)">确认</a>
</template> </template>
</template> </template>
</a-table> </a-table>
@ -87,7 +87,7 @@
<a-table :columns="columns2" :data-source="checkData" :pagination="false"> <a-table :columns="columns2" :data-source="checkData" :pagination="false">
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'"> <template v-if="column.dataIndex === 'action'">
<a @click="handleDel(record)">移除</a> <a @click="handleDel(record)">删除</a>
</template> </template>
</template> </template>
</a-table> </a-table>
@ -96,7 +96,7 @@
<a-button type="primary" style="margin-left: 10px; margin-top: 10px" @click="handleFanhui">返回</a-button> <a-button type="primary" style="margin-left: 10px; margin-top: 10px" @click="handleFanhui">返回</a-button>
</div> </div>
</div> </div>
<!-- 学生成绩 --> <!-- 成绩单 -->
<div v-show="sfxk == 2"> <div v-show="sfxk == 2">
<CjdForm ref="cjdFormModal" @callback="init"></CjdForm> <CjdForm ref="cjdFormModal" @callback="init"></CjdForm>
</div> </div>
@ -118,15 +118,35 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24"> <a-row :gutter="24">
<!-- <a-col :span="24" style="text-align: right;margin-bottom: 20px;">
模板下载：
<a-popover placement="topRight" type="primary">
<template #content>
<a-button type="primary" style="margin-left: 10px;margin-top: 10px" @click="textDown('a1','课堂教学评价表')">课堂教学评价表</a-button>
<a-button type="primary" style="margin-left: 10px;margin-top: 10px" @click="textDown('a2','试卷评价表')">试卷评价表</a-button>
<a-button type="primary" style="margin-left: 10px;margin-top: 10px" @click="textDown('a3','本科毕业论文（设计）评价表')">本科毕业论文（设计）评价表</a-button>
</template>
<template #title>
<span>专家用评价表</span>
</template>
<a-button>专家用评价表</a-button>
</a-popover>
</a-col> -->
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zjxnxq"> <a-form-item name="xn">
<template #label><span title="学年学期">学年学期</span></template> <template #label><span title="学年" class="xn-title">学年</span></template>
<j-dict-select-tag placeholder="请选择学年学期" v-model:value="queryParam.zjxnxq" :dictCode="`v_xqxn,xqxn,xqxn`" allow-clear /> <j-dict-select-tag placeholder="请选择学年" v-model:value="queryParam.xn" :dictCode="`v_xn,xn,xn`" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="xqmc">
<template #label><span title="学期" class="xn-title">学期</span></template>
<j-dict-select-tag placeholder="请选择学期" v-model:value="queryParam.xqmc" dictCode="cjxq" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kkyxmc"> <a-form-item name="kkyxmc">
<template #label><span title="开课单位名称">开课单位名称</span></template> <template #label><span title="开课单位名称" class="xn-title">开课单位名称</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择开课单位名称" placeholder="请选择开课单位名称"
v-model:value="queryParam.kkyxmc" v-model:value="queryParam.kkyxmc"
@ -137,7 +157,7 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zhunaye"> <a-form-item name="zhunaye">
<template #label><span title="所属专业">所属专业</span></template> <template #label><span title="所属专业" class="xn-title">所属专业</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择所属专业" placeholder="请选择所属专业"
v-model:value="queryParam.zhuanye" v-model:value="queryParam.zhuanye"
@ -148,13 +168,13 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kcmc"> <a-form-item name="kcmc">
<template #label><span title="任课教师">任课教师</span></template> <template #label><span title="任课教师" class="xn-title">任课教师</span></template>
<j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear></j-input> <j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="zhicheng"> <a-form-item name="zhicheng">
<template #label><span title="职称">职称</span></template> <template #label><span title="职称" class="xn-title">职称</span></template>
<j-dict-select-tag <j-dict-select-tag
placeholder="请选择职称" placeholder="请选择职称"
v-model:value="queryParam.zhicheng" v-model:value="queryParam.zhicheng"
@ -170,17 +190,17 @@
<j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear ></j-input> <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear ></j-input>
</a-form-item> </a-form-item>
</a-col> --> </a-col> -->
<a-col :span="18" style="text-align: right"> <a-col :span="12" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <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-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button> --> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="handleXuanke" style="margin-left: 8px"> 选课</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="handleXuanke" style="margin-left: 8px"> 选课</a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!--引用表格--> <!--引用表格-->
<BasicTable @register="registerTable"> <BasicTable @register="registerTable" class="table-style">
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="getTableAction(record)" /> <TableAction :actions="getTableAction(record)" />
@ -280,7 +300,7 @@ const paginationProp = ref<any>({
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
}); });
//学生成绩 //成绩单
function handleCjd(record) { function handleCjd(record) {
sfxk.value = 2; sfxk.value = 2;
cjdFormModal.value.init(record); cjdFormModal.value.init(record);
@ -386,7 +406,7 @@ function handleSuccess() {
function getTableAction(record) { function getTableAction(record) {
return [ return [
{ {
label: '学生成绩', label: '成绩单',
onClick: handleCjd.bind(null, record), onClick: handleCjd.bind(null, record),
}, },
{ {
@ -481,7 +501,7 @@ onMounted(() => {
border-radius:4px; border-radius:4px;
} }
.query-criteria:hover{ .query-criteria:hover{
border:1px solid #e8ecf4; border:1px solid #c5d8ff;
box-shadow: 2px 2px 10px 2px #e8ecf4; box-shadow: 2px 2px 10px 2px #e8ecf4;
border-radius:4px; border-radius:4px;
} }
@ -496,4 +516,8 @@ onMounted(() => {
box-shadow: 2px 2px 10px 2px #e8ecf4; box-shadow: 2px 2px 10px 2px #e8ecf4;
border-radius:4px; border-radius:4px;
} }
.xn-title{
font-size:16px;
font-weight:700;
}
</style> </style>

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

@ -214,7 +214,6 @@ font-size:18px;
font-weight: 700; font-weight: 700;
padding-left:10px; padding-left:10px;
line-height: 30px; line-height: 30px;
margin-top: 10px;
} }
.seleciton-line{ .seleciton-line{
background: #1890ff; background: #1890ff;
@ -226,7 +225,7 @@ margin-top: 10px;
color: #666; color: #666;
} }
.query-criteria{ .query-criteria{
padding:15px 10px 15px 10px; padding:10px 10px 15px 10px;
border:1px solid #e4e9f2; border:1px solid #e4e9f2;
border-radius:4px; border-radius:4px;
} }

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

@ -160,7 +160,7 @@ function handleDown(record) {
* 批量下载事件 * 批量下载事件
*/ */
async function batchHandleDown() { async function batchHandleDown() {
var downName = '《'+jxrwInfo?.value.kcmc+'》学生原始材料' + dayjs().format('YYYYMMDDHHmmss') + ''; var downName = '学生原始材料' + dayjs().format('YYYYMMDDHHmmss') + '';
console.log('👩‍🦰', selectedRowKeys.value); console.log('👩‍🦰', selectedRowKeys.value);
defHttp.post({ url: "/xxhbjwxtxsmd/xxhbjwxtxsmd/getBatchDown", params: { studentNo: selectedRowKeys.value,downName,cdlx:jxrwInfo.value.khfs,kcrwdm:jxrwInfo.value.kcrwdm } }).then((res) => { defHttp.post({ url: "/xxhbjwxtxsmd/xxhbjwxtxsmd/getBatchDown", params: { studentNo: selectedRowKeys.value,downName,cdlx:jxrwInfo.value.khfs,kcrwdm:jxrwInfo.value.kcrwdm } }).then((res) => {
console.log(res); console.log(res);