修改 bug

This commit is contained in:
yangjun 2023-08-09 22:25:41 +08:00
parent 5790bd5757
commit c18f120122
8 changed files with 43 additions and 17 deletions

View File

@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '学期学年',
align: "center",
dataIndex: 'xqxn'
},
{ {
title: '课程编号', title: '课程编号',
align: "center", align: "center",

View File

@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '学期学年',
align: "center",
dataIndex: 'xqxn'
},
{ {
title: '课程编号', title: '课程编号',
align: "center", align: "center",

View File

@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '学期学年',
align: "center",
dataIndex: 'xqxn'
},
{ {
title: '课程编号', title: '课程编号',
align: "center", align: "center",

View File

@ -1,6 +1,6 @@
<template> <template>
<!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> --> <!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> -->
<a-list item-layout="horizontal" :data-source="list" :loading="loadingList" > <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="height: 105px;">
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
<a-list-item-meta> <a-list-item-meta>
@ -113,7 +113,7 @@ function txpjFun(item){
let ketangbiaoid = item.ketangbiaoid; let ketangbiaoid = item.ketangbiaoid;
let userid = item.userid; let userid = item.userid;
listTkjlApi({ userid: userid, ketangbiaoid:ketangbiaoid}).then(res => { listTkjlApi({ userid: userid, ketangbiaoid:ketangbiaoid,startDate:getSysConfig().bxqkssj,endDate:getSysConfig().bxqjssj}).then(res => {
var list = res var list = res
console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list) console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list)
if(list.length>0){ if(list.length>0){
@ -145,7 +145,7 @@ function init() {
function loadData(){ function loadData(){
loadingList.value = true loadingList.value = true
console.log(`🚀 ~ file: list.vue:139 ~ listApi ~ props.queryParam:`, props.queryParam) console.log(`🚀 ~ file: list.vue:139 ~ listApi ~ props.queryParam:`, props.queryParam)
listApi({ userid: getUserId(), ...props.queryParam }).then(res => { listApi({ userid: getUserId(), ...props.queryParam ,startDate:getSysConfig().bxqkssj,endDate:getSysConfig().bxqjssj}).then(res => {
total.value = res.total; total.value = res.total;
current.value = res.current; current.value = res.current;
list.value = res.records list.value = res.records

View File

@ -1,6 +1,6 @@
<template> <template>
<!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> --> <!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> -->
<a-list item-layout="horizontal" :data-source="list" :loading="loadingList" > <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="height: 105px;" >
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
<a-list-item-meta> <a-list-item-meta>
@ -100,7 +100,7 @@ watch(
function init() { function init() {
console.log('init'); console.log('init');
loadingList.value = true loadingList.value = true
listApi({ upuserid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => { listApi({ upuserid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj,startDate:getSysConfig().bxqkssj,endDate:getSysConfig().bxqjssj, ...props.queryParam }).then(res => {
list.value = res?.records ?? []; list.value = res?.records ?? [];
total.value = res.total; total.value = res.total;

View File

@ -12,12 +12,15 @@
<span>{{getSysConfig().flag1}} {{dateFormat(getSysConfig().bxqkssj, 'MM月dd日')}} {{dateFormat(getSysConfig().bxqjssj, 'MM月dd日')}}</span> <span>{{getSysConfig().flag1}} {{dateFormat(getSysConfig().bxqkssj, 'MM月dd日')}} {{dateFormat(getSysConfig().bxqjssj, 'MM月dd日')}}</span>
</div> </div>
<a-row :gutter="[16,16]"> <a-row :gutter="[16,16]">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
<j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
</a-col>
<!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" /> <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" /> <a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" />
</a-col> </a-col> -->
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
<j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw" placeholder="请选择院系" style="width: 100%;"/> <j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw" placeholder="请选择院系" style="width: 100%;"/>
</a-col> </a-col>
@ -60,12 +63,13 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
import { getSysConfig } from '/@/views/site/utils/index'; import { getSysConfig } from '/@/views/site/utils/index';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '', pj: '', pageSize: 10,pageNo:1 }); const queryParam = ref<any>({ pj: '', pageSize: 10,pageNo:1 });
// //
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; queryParam.value.xnxq = getSysConfig().flag1
queryParam.value.endDate = dateFormat(new Date(), format) // const format = 'yyyy-MM-dd';
// queryParam.value.endDate = dateFormat(new Date(), format)
onSearch() onSearch()
}); });
const listRef = ref(); const listRef = ref();

View File

@ -12,12 +12,15 @@
<span>{{getSysConfig().flag1}} {{dateFormat(getSysConfig().bxqkssj, 'MM月dd日')}} {{dateFormat(getSysConfig().bxqjssj, 'MM月dd日')}}</span> <span>{{getSysConfig().flag1}} {{dateFormat(getSysConfig().bxqkssj, 'MM月dd日')}} {{dateFormat(getSysConfig().bxqjssj, 'MM月dd日')}}</span>
</div> </div>
<a-row :gutter="[16,16]"> <a-row :gutter="[16,16]">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
<j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
</a-col>
<!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" /> <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" /> <a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" />
</a-col> </a-col> -->
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
<j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw" placeholder="请选择院系" style="width: 100%;"/> <j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw" placeholder="请选择院系" style="width: 100%;"/>
</a-col> </a-col>
@ -60,12 +63,13 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
import { getSysConfig } from '/@/views/site/utils/index'; import { getSysConfig } from '/@/views/site/utils/index';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '', pageSize: 10 }); const queryParam = ref<any>({ pageSize: 10 });
// //
onMounted(() => { onMounted(() => {
const format = 'yyyy-MM-dd'; // const format = 'yyyy-MM-dd';
queryParam.value.endDate = dateFormat(new Date(), format) // queryParam.value.endDate = dateFormat(new Date(), format)
queryParam.value.xnxq = getSysConfig().flag1
onSearch() onSearch()
}); });
const listRef = ref(); const listRef = ref();

View File

@ -50,6 +50,9 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-if="list.length==0" style="text-align: center;">
<span style="color:#c8c8c8;">暂无数据</span>
</a-col>
</a-row> </a-row>
</a-card> </a-card>
<addModalPage ref="tingKeZuJiAddModal"/> <addModalPage ref="tingKeZuJiAddModal"/>
@ -58,7 +61,7 @@
import { ref, reactive, computed, onMounted, createVNode,h } from 'vue'; import { ref, reactive, computed, onMounted, createVNode,h } from 'vue';
import { TeamOutlined } from '@ant-design/icons-vue'; import { TeamOutlined } from '@ant-design/icons-vue';
// import { dateUtil, formatToDate } from '/@/utils/dateUtil'; // import { dateUtil, formatToDate } from '/@/utils/dateUtil';
import { getUserId } from '/@/views/site/utils/index'; import { getUserId,getSysConfig } from '/@/views/site/utils/index';
import { downloadByUrl } from '/@/utils/file/download'; import { downloadByUrl } from '/@/utils/file/download';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
@ -152,7 +155,7 @@ function newFunction() {
if(width<800){ if(width<800){
pageSize = 1; pageSize = 1;
} }
listApi({ pageSize: pageSize, isdeleted: 0, userid: getUserId(), isOrderByNow: true }).then(res => { listApi({ pageSize: pageSize, isdeleted: 0, userid: getUserId(), isOrderByNow: true,startTime:getSysConfig().bxqkssj,endTime:getSysConfig().bxqjssj }).then(res => {
list.value = (res?.records) ?? []; list.value = (res?.records) ?? [];
}); });
} }