From 9aa40d39771192c1327cb915fa614c37c8573b7d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 2 Aug 2024 15:12:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 4e4ea0cb..f49db81e 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -39,6 +39,15 @@ > +
+ +
{ state.pageNo=1 state.pageSize=10 @@ -235,6 +250,7 @@ export default { // publishTime: state.publishTime, startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", + status: state.searchStatus, }; const res = await api.boeuCourseListPageV2(params); if (res) { @@ -449,6 +465,7 @@ export default { state.type = null; state.createName = ""; state.publishTime = []; + state.searchStatus = null; getTableData(); }; const exportList = () => { @@ -663,6 +680,7 @@ export default { exportDetailClick, getOption, searchData, + StateList, }; }, }; From 5538124e727e3a360d57c7861188e611fd15be84 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 8 Aug 2024 09:43:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index f49db81e..258c5292 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -183,9 +183,9 @@ export default { typeOption:[] }); const StateList = ref([ - {value:'0',label:'全部'}, + {value:'',label:'全部'}, {value:'1',label:'面授'}, - {value:'2',label:'在线'}, + {value:'0',label:'在线'}, ]) const searchData=async()=>{ state.pageNo=1 @@ -250,7 +250,7 @@ export default { // publishTime: state.publishTime, startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", - status: state.searchStatus, + courseType: state.searchStatus, }; const res = await api.boeuCourseListPageV2(params); if (res) { From 366de3d5e183ee0f86d97df64ff02b9c9bce6efc Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 16:04:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 362 ++++++++++++++++++-------------- 1 file changed, 209 insertions(+), 153 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 258c5292..8f08d674 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -3,6 +3,37 @@
+
+ + +
+
+ + +
+
+ +
-
- - +
+
+
+
搜索
+
+
+
+
重置
+
-
- - +
+ {{isShowChange?'展开':'收起'}} + +
-
- -
-
+
-
+
-
-
-
-
搜索
-
-
-
-
重置
-
-
+
@@ -161,8 +169,16 @@ import Cookies from "vue-cookies"; import downLoad from "../../utils/downLoad"; import { message } from "ant-design-vue"; import {useStore} from 'vuex' +import { + DownOutlined, + UpOutlined, +} from '@ant-design/icons-vue'; export default { name: "CurriculuM", + components: { + DownOutlined, + UpOutlined, + }, setup() { const store = useStore(); const state = reactive({ @@ -180,7 +196,8 @@ export default { allowClear: false, option: [], selectedRowKeys: [], - typeOption:[] + typeOption:[], + isShowChange: true, }); const StateList = ref([ {value:'',label:'全部'}, @@ -282,6 +299,17 @@ export default { align: "center", width: 120, }, + { + title: "内容分类", + dataIndex: "oneType", + ellipsis: true, + key: "oneType", + align: "center", + width: 300, + customRender({record:{oneType,twoType,threeType}}){ + return `${oneType ? oneType : ''}${twoType ? ' / '+twoType : ''}${threeType ? ' / '+threeType : ''}`; + } + }, { title: "课程类型", dataIndex: "courseType", @@ -298,110 +326,102 @@ export default { align: "center", width: 120, }, - { - title: "归属项目", - dataIndex: "projectName", - ellipsis: true, - key: "projectName", - align: "center", - width: 120, - }, - { - title: "归属路径图", - dataIndex: "routerName", - ellipsis: true, - key: "routerName", - align: "center", - width: 120, - }, - { - title: "一级分类", - dataIndex: "oneType", - ellipsis: true, - key: "oneType", - align: "center", - width: 120, - }, - { - title: "二级分类", - dataIndex: "twoType", - ellipsis: true, - key: "twoType", - align: "center", - width: 120, - }, - { - title: "三级分类", - dataIndex: "threeType", - ellipsis: true, - key: "threeType", - align: "center", - width: 120, - }, - { - title: "授课教师", - dataIndex: "teacher", - ellipsis: true, - key: "teacher", - align: "center", - width: 120, - }, - { - title: "开课次数", - dataIndex: "classTotal", - ellipsis: true, - key: "classTotal", - align: "center", - width: 120, - }, - { - title: "学习人数", - dataIndex: "learnerNumber", - ellipsis: true, - key: "learnerNumber", - align: "center", - width: 120, - }, - { - title: "评论数", - dataIndex: "commentTotal", - ellipsis: true, - key: "commentTotal", - align: "center", - width: 120, - }, - { - title: "点赞数", - dataIndex: "likesTotal", - ellipsis: true, - key: "likesTotal", - align: "center", - width: 120, - }, - { - title: "收藏数", - dataIndex: "collectionsTotal", - ellipsis: true, - key: "collectionsTotal", - align: "center", - width: 120, - }, - { - title: "平均评分", - dataIndex: "score", - ellipsis: true, - key: "score", - align: "center", - width: 120, - }, - { - title: "发布时间", - dataIndex: "publishTime", - ellipsis: true, - key: "publishTime", - align: "center", - width: 140, - }, + // { + // title: "归属项目", + // dataIndex: "projectName", + // ellipsis: true, + // key: "projectName", + // align: "center", + // width: 120, + // }, + // { + // title: "归属路径图", + // dataIndex: "routerName", + // ellipsis: true, + // key: "routerName", + // align: "center", + // width: 120, + // }, + // { + // title: "一级分类", + // dataIndex: "oneType", + // ellipsis: true, + // key: "oneType", + // align: "center", + // width: 120, + // }, + // { + // title: "二级分类", + // dataIndex: "twoType", + // ellipsis: true, + // key: "twoType", + // align: "center", + // width: 120, + // }, + // { + // title: "三级分类", + // dataIndex: "threeType", + // ellipsis: true, + // key: "threeType", + // align: "center", + // width: 120, + // }, + // { + // title: "授课教师", + // dataIndex: "teacher", + // ellipsis: true, + // key: "teacher", + // align: "center", + // width: 120, + // }, + // { + // title: "开课次数", + // dataIndex: "classTotal", + // ellipsis: true, + // key: "classTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "学习人数", + // dataIndex: "learnerNumber", + // ellipsis: true, + // key: "learnerNumber", + // align: "center", + // width: 120, + // }, + // { + // title: "评论数", + // dataIndex: "commentTotal", + // ellipsis: true, + // key: "commentTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "点赞数", + // dataIndex: "likesTotal", + // ellipsis: true, + // key: "likesTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "收藏数", + // dataIndex: "collectionsTotal", + // ellipsis: true, + // key: "collectionsTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "平均评分", + // dataIndex: "score", + // ellipsis: true, + // key: "score", + // align: "center", + // width: 120, + // }, { title: "发布状态", dataIndex: "publishStatus", @@ -410,14 +430,6 @@ export default { align: "center", width: 120, }, - { - title: "启用状态", - dataIndex: "enabled", - ellipsis: true, - key: "enabled", - align: "center", - width: 120, - }, { title: "创建人", dataIndex: "createName", @@ -426,6 +438,38 @@ export default { align: "center", width: 120, }, + { + title: "发布时间", + dataIndex: "publishTime", + ellipsis: true, + key: "publishTime", + align: "center", + width: 140, + }, + // { + // title: "发布状态", + // dataIndex: "publishStatus", + // ellipsis: true, + // key: "publishStatus", + // align: "center", + // width: 120, + // }, + { + title: "启用状态", + dataIndex: "enabled", + ellipsis: true, + key: "enabled", + align: "center", + width: 120, + }, + // { + // title: "创建人", + // dataIndex: "createName", + // ellipsis: true, + // key: "createName", + // align: "center", + // width: 120, + // }, { title: "操作", dataIndex: "operation", @@ -697,10 +741,22 @@ export default { margin-top: 30px; display: flex; flex-wrap: wrap; + position: relative; .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 220px) / 3); + width: calc((100% - 76px - 220px) / 5); + } + .right_btn{ + position: absolute; + right: 20px; + height: 40px; + line-height: 40px; + cursor: pointer; + .text{ + margin-right: 14px; + color:#4ea6ff; + } } .btnz { From 87172644f26997ff02f82e44179cd6e54d94d464 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 16:13:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9=E5=88=86=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 8f08d674..43b165a1 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -306,8 +306,8 @@ export default { key: "oneType", align: "center", width: 300, - customRender({record:{oneType,twoType,threeType}}){ - return `${oneType ? oneType : ''}${twoType ? ' / '+twoType : ''}${threeType ? ' / '+threeType : ''}`; + customRender({record:{oneType,twoType,threeType,allType}}){ + return allType; } }, { From 444c4758b07a262e5736b5333e5f056025285693 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 17:04:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9=E5=88=86=E7=B1=BB=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 43b165a1..b905cc0d 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -306,8 +306,8 @@ export default { key: "oneType", align: "center", width: 300, - customRender({record:{oneType,twoType,threeType,allType}}){ - return allType; + customRender({record:{oneType,twoType,threeType,type}}){ + return type.split('-').join(' / '); } }, { From 18dc3e96077776fd22b6b85d7a4f0f2acc4adc6b Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 17:21:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index b905cc0d..cdbae758 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -62,7 +62,7 @@
{{isShowChange?'展开':'收起'}} - +
@@ -271,8 +271,10 @@ export default { }; const res = await api.boeuCourseListPageV2(params); if (res) { - tableData.value = res.data.result.rows; - state.tableDataTotal = res.data.result.total; + if(res.data.status == 200){ + tableData.value = res.data.result.rows; + state.tableDataTotal = res.data.result.total; + } state.tableLoading = false; } };