From 699b0f69f68d138cfad63c038d523f42e516721d Mon Sep 17 00:00:00 2001 From: dongwug Date: Wed, 12 Oct 2022 11:44:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=92=8C=20=E7=82=B9=E5=87=BB=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 656 +++++++++++-------- 1 file changed, 375 insertions(+), 281 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 58fd3297..63ce8758 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -385,8 +385,8 @@ :pagination="false" /> -->
{ - // console.log(text); - return ( -
- 签到 - 编辑 - 管理 - - 更多 -
-
-
-
- ); - }, - }, -]; -const columns5 = [ { title: '序号', width: 200, @@ -1195,7 +1032,155 @@ const columns5 = [ align: "center", }, ]; +const columns2 = [ + { + title: "姓名", + dataIndex: "projectName", + key: "projectName", + width: "16%", + align: "center", + }, + { + title: "工号", + dataIndex: "numb", + key: "numb", + width: "16%", + align: "center", + }, + { + title: "报名时间", + dataIndex: "applytime", + key: "applytime", + width: "16%", + align: "center", + }, + { + title: "签到时间", + dataIndex: "signtime", + key: "signtime", + width: "16%", + align: "center", + }, + { + title: "状态", + dataIndex: "status", + key: "status", + width: "16%", + align: "center", + }, + { + title: "操作", + dataIndex: "opacation", + key: "opacation", + width: "16%", + align: "center", + }, +]; +const columns4 = [ + { + title: "开课名称", + dataIndex: "projectName", + key: "projectName", + width: "30%", + align: "center", + }, + { + title: "地点", + dataIndex: "address", + key: "address", + width: "30%", + align: "center", + }, + { + title: "状态", + dataIndex: "status", + key: "status", + width: "40%", + align: "center", + }, +]; +const columns5 = [ + { + title: "姓名", + dataIndex: "name", + key: "name", + width: "18%", + align: "center", + }, + { + title: "归属组织", + dataIndex: "organization", + key: "organization", + width: "18%", + align: "center", + }, + { + title: "岗位", + dataIndex: "position", + key: "position", + width: "18%", + align: "center", + }, + { + title: "拥有权限", + dataIndex: "authority", + key: "authority", + width: "18%", + align: "center", + }, + { + title: "操作", + dataIndex: "opacation", + key: "opacation", + width: "30%", + align: "center", + }, +]; const columns6 = [ + { + title: "序号", + dataIndex: "num", + key: "num", + width: "10%", + align: "center", + }, + { + title: "归属组织", + dataIndex: "organization", + key: "organization", + width: "12%", + align: "center", + }, + { + title: "场地", + dataIndex: "address", + key: "saddress", + width: "12%", + align: "center", + }, + { + title: "开始时间", + dataIndex: "starttime", + key: "starttime", + width: "20%", + align: "center", + }, + { + title: "创建时间", + dataIndex: "createtime", + key: "createtime", + width: "20%", + align: "center", + }, + { + title: '操作', + width: '20%', + dataIndex: "operation", + key: 'operation', + align: "center", + }, +]; +const columns7 = [ { title: '序号', width: 200, @@ -1280,7 +1265,7 @@ export default defineComponent({ setup() { const current = ref(["mail"]); const state = reactive({ - tableData: [ + tableData1: [ { key: "1", num: 1, @@ -1393,6 +1378,14 @@ export default defineComponent({ signtime: "-", status: "已通过", }, + { + key: 2, + projectName: "", + numb: "", + applytime: "2022-07-20 14:00:00", + signtime: "2022-09-26 13:30:30", + status: "已完成", + }, ], tableData3: [ { @@ -1403,14 +1396,6 @@ export default defineComponent({ signtime: "-", status: "已通过", }, - { - key: 2, - projectName: "", - numb: "", - applytime: "2022-07-20 14:00:00", - signtime: "2022-09-26 13:30:30", - status: "已完成", - }, ], tableData4: [ { @@ -1579,6 +1564,17 @@ export default defineComponent({ currentPage: 1, tableDataTotal: 100, pageSize: 10, + of_hs: false, + hideshow: true, + bs_hs: true, + ft_hs:false, + om_1: false, + ftm_1:false, + om_ckxq: false, + gpm_hs:false, + stm_hs: false, + cstm_hs:false, + sm_hs:false, }); // const tableDataFunc = () => { // const columns = [ @@ -1747,22 +1743,31 @@ export default defineComponent({ }; const getTableDate = () => { - let data = state.tableData; - data.map((value) => { + let datas = state.tableData1; + datas.map((value) => { { //单层项目 - value.operation = ( + value.operation = (
{value.status === "已审核" ? (
-
开课
+
{ + state.stm_hs = true; + }}>开课
-
管理
+
{ + if (value.courseform === '线上') { + state.om_1 = true; + } else if (value.courseform === '面授') { + state.ftm_1 = true; + } + }}>管理
@@ -1771,14 +1776,16 @@ export default defineComponent({
- -
权限名单
+
{ + state.gpm_hs = true; + }}>权限名单
-
开课
+
{ + state.stm_hs = true; + }}>开课
@@ -1853,7 +1863,9 @@ export default defineComponent({ dropdownClassName="tabledropdown" > -
权限名单
+
{ + state.gpm_hs = true; + }}>权限名单
-
开课
+
{ + state.stm_hs = true; + }}>开课
@@ -1898,7 +1913,10 @@ export default defineComponent({ {value.status === "审核未通过" ? (
-
开课
+
{ + state.stm_hs = true; + }}>开课
@@ -1919,7 +1937,9 @@ export default defineComponent({ dropdownClassName="tabledropdown" > -
权限名单
+
{ + state.gpm_hs = true; + }}>权限名单
{ + let datas = state.tableData6; + datas.map((value) => { + { + //单层项目 + value.operation = ( +
+
+
- return { - onftvalue, - current, - ...toRefs(state), - fileList, - loading, - imageUrl, - columns1, - columns2, - columns3, - columns4, - columns5, - columns6, - // tableDataFunc, - handleChange, - beforeUpload, - getTableDate, - getTableDate2, +
签到
+ +
编辑
+ +
{ + state.sm_hs = true; + }}>管理
+ +
+ + +
复制
+
+ +
{ + console.log("点击了"); + }} + > + 取消 +
+
+
+
+
+
+ +
+ ); + } + }); + state.tableData = datas; }; - }, + getTableDate3(); - data() { + const onftvalue = ref(); const options1 = ref([ { value: "value1", @@ -2072,19 +2128,6 @@ export default defineComponent({ }, ]); - const state = reactive({ - of_hs: false, - hideshow: true, - bs_hs: true, - ft_hs:false, - om_1: false, - ftm_1:false, - om_ckxq: false, - gpm_hs:false, - stm_hs: false, - cstm_hs:false, - sm_hs:false, - }); const of_hShow = () => { if (state.of_hs == false) { @@ -2145,9 +2188,25 @@ export default defineComponent({ const sm_exit = () => { state.sm_hs = false; }; - return { + onftvalue, + current, ...toRefs(state), + fileList, + loading, + imageUrl, + columns1, + columns2, + + columns4, + columns5, + columns6, + columns7, + // tableDataFunc, + handleChange, + beforeUpload, + getTableDate, + getTableDate2, options1, options2, of_hShow, @@ -2168,6 +2227,32 @@ export default defineComponent({ sm_exit, }; }, + + // data() { + + + // // return { + // // ...toRefs(state), + // // options1, + // // options2, + // // of_hShow, + // // of_exit, + // // hideShow, + // // bs_hShow, + // // bs_unhShow, + // // createft, + // // ft_exit, + // // om_exit, + // // ftm_exit, + // // ckxq_hs, + // // ftsr_exit, + // // gpm_exit, + // // stm_exit, + // // createkk, + // // cstm_exit, + // // sm_exit, + // // }; + // }, }); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index f4173b9a..1da63768 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -163,6 +163,7 @@ const columns = [ key: "operation", width: 300, align: "center", + fixed: "right", }, ]; From 4973a0ff044ba1009e79544dedb812cad46efa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Wed, 12 Oct 2022 14:39:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86table=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 82e2d1e9..5a9da26d 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1966,7 +1966,7 @@ export default defineComponent({
-
+
撤回
@@ -2059,8 +2059,10 @@ export default defineComponent({
-
-
删除
+
+
+ 删除 +
) : (