diff --git a/jeecgboot-vue3-master/public/resource/img/comp/jingsaibjc.png b/jeecgboot-vue3-master/public/resource/img/comp/jingsaibjc.png new file mode 100644 index 00000000..f8d22144 Binary files /dev/null and b/jeecgboot-vue3-master/public/resource/img/comp/jingsaibjc.png differ diff --git a/jeecgboot-vue3-master/src/assets/icons/gengduo.svg b/jeecgboot-vue3-master/src/assets/icons/gengduo.svg new file mode 100644 index 00000000..113b5e7d --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/gengduo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/status0.svg b/jeecgboot-vue3-master/src/assets/icons/status0.svg new file mode 100644 index 00000000..e62c0bac --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/status0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/status1.svg b/jeecgboot-vue3-master/src/assets/icons/status1.svg new file mode 100644 index 00000000..7334b41e --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/status1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/status2.svg b/jeecgboot-vue3-master/src/assets/icons/status2.svg new file mode 100644 index 00000000..1d010ced --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/status2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/status3.svg b/jeecgboot-vue3-master/src/assets/icons/status3.svg new file mode 100644 index 00000000..bba67e95 --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/status3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index f940e452..e2a634d3 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -1,528 +1,320 @@ - - /** - * 成绩汇总事件 - */ - async function cjhzgl(record) { - await cjhz({id: record.id}, handleSuccess); + diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList1.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList1.vue new file mode 100644 index 00000000..f940e452 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList1.vue @@ -0,0 +1,528 @@ + + + + + diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue new file mode 100644 index 00000000..3b223e82 --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue index 3c1df9e7..714de756 100644 --- a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue +++ b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue @@ -4,24 +4,28 @@
- {{ filterYearList[activeIndex] }} + {{ yearList[activeIndex].title }}
- +
@@ -29,10 +33,20 @@
点击添加比赛
- + @@ -44,19 +58,29 @@ import { Pagination } from 'ant-design-vue'; import { ref } from 'vue'; import cardItem from './components/cardItem.vue'; - import { list,deleteOne } from './AnnualComp.api'; + import { list, deleteOne, submit, enable, deactivate } from './AnnualComp.api'; import { useModal } from '/@/components/Modal'; + import { useMessage } from '/@/hooks/web/useMessage'; - const [registerModal, { openModal }] = useModal(); import AnnualCompModal from './components/AnnualCompModal.vue'; + import { getDictItems } from '/@/api/common/api'; + const [registerModal, { openModal }] = useModal(); + const { createMessage } = useMessage(); - const filterYearList = ref(['全部比赛', '2024年', '2023年', '其他年份']); const activeIndex = ref(0); - const current = ref(2); + const current = ref(1); // 搜索 const searchValue = ref(''); const onSearch = () => { console.log(searchValue.value); + const value = yearList.value.find((item) => item.title === searchValue.value); + console.log(value); + if (value) { + page.annualid = value.values; + getList(); + }else{ + createMessage.warn(`没有查询到${searchValue.value}年的信息`) + } }; // 单选 @@ -65,8 +89,18 @@ // 获取比赛列表 const raceList = ref([]); const total = ref(0); + const page = { + pageSize: 7, + pageNo: 1, + annualid: '', + }; const getList = async () => { - const res = await list({ pageSize: 7 }); + for (const key in page) { + if (!page[key]) { + delete page[key]; + } + } + const res = await list(page); console.log(res); raceList.value = res.records; total.value = res.total; @@ -100,18 +134,61 @@ isUpdate: true, showFooter: false, }); - } - /** + }; + /** * 删除事件 */ async function handleDelete(record) { - console.log(record,'record'); - + console.log(record, 'record'); + await deleteOne({ id: record.value.id }, handleSuccess); } + + // 提交事件 + const handleSubmit = async (record) => { + await submit({ id: record.value.id }, handleSuccess); + }; + // 启用事件 + const handleEnable = async (record) => { + await enable({ id: record.value.id }, handleSuccess); + }; + // 停用事件 + const handleDeactivate = async (record) => { + await deactivate({ id: record.value.id }, handleSuccess); + }; + // 分页 + const pageChange = (pageNo) => { + console.log(pageNo); + page.pageNo = pageNo; + getList(); + }; + + // 获取年度 + const yearList = ref([{ title: '全部比赛', value: '' }]); + const getDictItemsEvent = async () => { + const date = new Date().getTime(); + const res = await getDictItems('annual,annual_name,id?_t=' + date); + yearList.value = res.reverse(); + yearList.value.unshift({ title: '全部比赛', value: '' }); + }; + getDictItemsEvent(); + + // 年度筛选事件 + const filteryear = (id: any, index: number) => { + activeIndex.value = index; + page.annualid = id; + getList(); + };