diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index f5d872d8..26e1769e 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -1,286 +1,297 @@ \ No newline at end of file + diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index c9061de7..f91322d2 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -2,8 +2,7 @@
重置
- -
- -
创建项目
-
+ +
+ +
创建项目
+
@@ -109,7 +109,7 @@
- -
+
- 请选择项目类别 + 请选择项目类别
-
+
- -
-
-
-
单层子项目
-
-
-
-
-
-
多层子项目
+ +
+
+
+ +
+
+ +
+
+ 单层子项目 +
+
+
+
+ +
+
+ +
+
+ +
+
+ 多层子项目 +
+
@@ -153,22 +196,39 @@
-
+
- 添加阶段 + 请选择项目类别
-
+
- -
-
-
-
-
单层项目
-
不包含子项目,直接填写项目基础信息后创建任务
+ +
+
+ +
+
+ +
+
+ +
+
+ 单层项目 +
+
+ 不包含子项目,直接填写项目基础信息后创建任务
- -
-
-
-
-
多层项目
-
包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务
+ +
+
+ +
+
+ +
+
+ +
+
+ 多层项目 +
+
+ 包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务 +
+
@@ -208,19 +300,33 @@ wrapClassName="doublepro" width="624px" height="476px" + > +
-
+ 创建多层项目 -
- 创建多层项目 -
-
- -
+
+
+ +
@@ -234,7 +340,8 @@
@@ -252,7 +359,7 @@
@@ -268,7 +375,7 @@
@@ -283,13 +390,13 @@
- 取消 - 确定 + 取消 + 确定
@@ -306,24 +413,40 @@ wrapClassName="doublesonpro" width="624px" height="476px" + > +
-
+ 创建多层子项目 -
- 创建多层项目 -
-
- -
+
+
+ +
-
- 项目归属: - 管理者进阶 +
+ 项目归属: + 管理者进阶
@@ -337,7 +460,7 @@
@@ -353,7 +476,7 @@
@@ -369,7 +492,7 @@
@@ -384,13 +507,13 @@
- 取消 - 确定 + 取消 + 确定
@@ -739,7 +862,6 @@ export default { doublesonpro: false, }); - onMounted(() => { // console.log("执行"); }); @@ -788,10 +910,15 @@ export default {
- { - state.sonproject = true; - }}>创建子项目 + { + state.sonproject = true; + }} + > + 创建子项目 +
- 创建班级 + + 创建班级 +
- 创建班级 + + 创建班级 + 复制
) : item.state === "已结束" ? ( @@ -1005,7 +1136,7 @@ export default { a.operation = a.state === "草稿" ? (
- + 编辑
- + 编辑
- + {value.state === "草稿" ? ( + 编辑 + ) : ( + + )}
{ state.sonproject = true; - }; const closeModal = () => { state.sonproject = false; - }; - + const showModal1 = () => { - state.estabish = true; }; const closeModal1 = () => { state.estabish = false; - }; - const showModal2 = () => { + const showModal2 = () => { state.doublepro = true; state.estabish = false; }; const closeModal2 = () => { state.doublepro = false; - }; - const showModal3 = () => { + const showModal3 = () => { state.doublesonpro = true; state.sonproject = false; }; const closeModal3 = () => { state.doublesonpro = false; - }; return { ...toRefs(state), @@ -1818,45 +1947,44 @@ export default { width: 80%; height: 40px; .ant-select-selector { - border-radius: 8px; - // height: 120%; - width: 100%; - height: 40px; - } + border-radius: 8px; + // height: 120%; + width: 100%; + height: 40px; + } } } - - } - .pubtn { - display: flex; - justify-content: center; - margin-top: 25px; - //margin-bottom: 29px; - .pubtn1 { - width: 100px; - height: 40px; - margin-right: 16px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: rgba(78, 166, 255, 1); - font-size: 14px; - //line-height: 36px; - align-items: center; - background: rgba(255, 255, 255, 1) - } - .pubtn2 { - width: 100px; - height: 40px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: #FFFFFF; - font-size: 14px; - align-items: center; - //line-height: 36px; - background: #409EFF; - } + } + .pubtn { + display: flex; + justify-content: center; + margin-top: 25px; + //margin-bottom: 29px; + .pubtn1 { + width: 100px; + height: 40px; + margin-right: 16px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: rgba(78, 166, 255, 1); + font-size: 14px; + //line-height: 36px; + align-items: center; + background: rgba(255, 255, 255, 1); + } + .pubtn2 { + width: 100px; + height: 40px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: #ffffff; + font-size: 14px; + align-items: center; + //line-height: 36px; + background: #409eff; + } } } } @@ -1900,45 +2028,44 @@ export default { width: 100%; height: 40px; .ant-select-selector { - border-radius: 8px; - // height: 120%; - width: 100%; - height: 40px; - } + border-radius: 8px; + // height: 120%; + width: 100%; + height: 40px; + } } } - - } - .pubtn { - display: flex; - justify-content: center; - margin-top: 25px; - //margin-bottom: 29px; - .pubtn1 { - width: 100px; - height: 40px; - margin-right: 16px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: rgba(78, 166, 255, 1); - font-size: 14px; - //line-height: 36px; - align-items: center; - background: rgba(255, 255, 255, 1) - } - .pubtn2 { - width: 100px; - height: 40px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: #FFFFFF; - font-size: 14px; - align-items: center; - //line-height: 36px; - background: #409EFF; - } + } + .pubtn { + display: flex; + justify-content: center; + margin-top: 25px; + //margin-bottom: 29px; + .pubtn1 { + width: 100px; + height: 40px; + margin-right: 16px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: rgba(78, 166, 255, 1); + font-size: 14px; + //line-height: 36px; + align-items: center; + background: rgba(255, 255, 255, 1); + } + .pubtn2 { + width: 100px; + height: 40px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: #ffffff; + font-size: 14px; + align-items: center; + //line-height: 36px; + background: #409eff; + } } } } @@ -1947,49 +2074,49 @@ export default { .sonproject { .ant-modal { .ant-modal-body { - padding: 0 !important; + padding: 0 !important; .modalMain { display: flex; justify-content: center; margin-top: 48px; //margin-bottom: 40px; .taskbox { - width: 310px; - height: 160px; - border-radius: 10px; - position: relative; - margin-bottom: 80px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 44px; - left: 40px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 66px; - left: 136px; - font-size: 20px; - font-weight: 700; - //line-height: 36px; - } - .centermain { - color: rgba(135, 139, 146, 1); - font-size: 14px; - position: absolute; - left: 144px; - bottom: 49px; - } + width: 310px; + height: 160px; + border-radius: 10px; + position: relative; + margin-bottom: 80px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 44px; + left: 40px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 66px; + left: 136px; + font-size: 20px; + font-weight: 700; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + position: absolute; + left: 144px; + bottom: 49px; + } } } } @@ -1998,7 +2125,7 @@ export default { .estabish { .ant-modal { .ant-modal-body { - padding: 0 !important; + padding: 0 !important; .modalMain { display: flex; flex-direction: column; @@ -2006,61 +2133,61 @@ export default { margin-top: 48px; //margin-bottom: 40px; .taskbox { - width: 438px; - height: 160px; - border-radius: 10px; - position: relative; - margin-bottom: 24px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 44px; - left: 40px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 42px; - left: 120px; - font-size: 20px; - font-weight: 500; - //line-height: 36px; - } - .centerbox1 { - position: absolute; - top: 32px; - left: 120px; - font-size: 20px; - font-weight: 500; - //line-height: 36px; - } - .centermain { - color: rgba(135, 139, 146, 1); - font-size: 14px; - line-height: 20px; - position: absolute; - width: 252px; - left: 120px; - top: 78px; - } - .centermain1 { - color: rgba(135, 139, 146, 1); - font-size: 14px; - line-height: 20px; - position: absolute; - width: 252px; - left: 120px; - top: 68px; - } + width: 438px; + height: 160px; + border-radius: 10px; + position: relative; + margin-bottom: 24px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 44px; + left: 40px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 42px; + left: 120px; + font-size: 20px; + font-weight: 500; + //line-height: 36px; + } + .centerbox1 { + position: absolute; + top: 32px; + left: 120px; + font-size: 20px; + font-weight: 500; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + line-height: 20px; + position: absolute; + width: 252px; + left: 120px; + top: 78px; + } + .centermain1 { + color: rgba(135, 139, 146, 1); + font-size: 14px; + line-height: 20px; + position: absolute; + width: 252px; + left: 120px; + top: 68px; + } } } } diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 01c9e58c..90823948 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -2,7 +2,12 @@
-
阶段
+
+ 阶段 +
添加阶段
@@ -29,7 +34,10 @@
- +
管理者进阶-腾飞班
@@ -66,11 +74,11 @@
-
在线
+
在线
- +
@@ -84,7 +92,7 @@
- +
@@ -182,12 +190,15 @@
-
任务列表
- -
- - 批量删除 -
+
任务列表
+ +
+ + 批量删除 +
@@ -232,7 +243,7 @@
- +
@@ -249,45 +260,97 @@ width="624px" height="388px" > -
+
添加阶段
-
+
-
+
-
-
阶段名称:
-
-
- -
+
+
阶段名称:
+
+
+ +
-
-
阶段说明:
-
-
- -
+
+
阶段说明:
+
+
+ +
-
- - +
+ +
@@ -299,7 +362,7 @@ import { reactive, toRefs, onMounted, onUnmounted } from "vue"; import AddOnline from "../../components/drawers/AddOnline.vue"; import EditOnline from "../../components/drawers/EditOnline.vue"; -import AddFaceteach from "../../components/drawers/AddFaceteach.vue" +import AddFaceteach from "../../components/drawers/AddFaceteach.vue"; const drawercolumns = [ { title: "项目名称", @@ -339,287 +402,285 @@ const drawercolumns = [ }, ]; export default { - name: "LevelAddDetail", - components: { - AddOnline, - EditOnline, - AddFaceteach, - }, - setup() { - const state = reactive({ - projectNameList: [ + name: "LevelAddDetail", + components: { + AddOnline, + EditOnline, + AddFaceteach, + }, + setup() { + const state = reactive({ + projectNameList: [ + { + id: 1, + value: "项目一", + label: "项目一", + }, + { + id: 2, + value: "项目二", + label: "项目二", + }, + { + id: 3, + value: "项目三", + label: "项目三", + }, + { + id: 4, + value: "项目四", + label: "项目四", + }, + ], + projectNameList2: [ + { + id: 1, + value: "删除任务", + label: "删除任务", + }, + { + id: 2, + value: "移动任务到关卡", + label: "移动任务到关卡", + }, + ], + level: [ + { + id: "1", + tit: "阶段1", + name: "腾飞班1基础", + }, + { + id: "2", + tit: "阶段2", + name: "腾飞班基础", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + ], + tableData: [ + { + key: 1, + lei: "在线", + // state: "已发布", + creater: "管理者课程", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 2, + lei: "面授", + // state: "草稿", + creater: "管理者面授", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 1, + lei: "在线", + // state: "已发布", + creater: "管理者课程", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 3, + lei: "作业", + // state: "已停用", + creater: "管理者作业", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 4, + lei: "考试", + // state: "草稿", + creater: "管理者考试", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 5, + lei: "案例", + // state: "草稿", + creater: "腾飞班1案例", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: true, + checkedd: false, + }, + { + key: 4, + lei: "考试", + // state: "草稿", + creater: "管理者考试", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 5, + lei: "案例", + // state: "草稿", + creater: "腾飞班1案例", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: true, + checkedd: false, + }, + ], + drawertableData: [ + { + key: 1, + projectName: "管理者进阶", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "1-1", + projectName: "管理者进阶-腾飞班", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ { - id: 1, - value: "项目一", - label: "项目一", + key: "1-1-1", + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", }, + ], + }, + ], + }, + { + key: 2, + projectName: "管理者进阶", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "2-1", + projectName: "管理者进阶-腾飞班", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ { - id: 2, - value: "项目二", - label: "项目二", + key: "2-1-1", + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", }, - { - id: 3, - value: "项目三", - label: "项目三", - }, - { - id: 4, - value: "项目四", - label: "项目四", - }, - ], - projectNameList2: [ - { - id: 1, - value: "删除任务", - label: "删除任务", - }, - { - id: 2, - value: "移动任务到关卡", - label: "移动任务到关卡", - }, - ], - level: [ - { - id: "1", - tit: "阶段1", - name: "腾飞班1基础", - }, - { - id: "2", - tit: "阶段2", - name: "腾飞班基础", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - ], - tableData: [ - { - key: 1, - lei: "在线", - // state: "已发布", - creater: "管理者课程", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 2, - lei: "面授", - // state: "草稿", - creater: "管理者面授", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 1, - lei: "在线", - // state: "已发布", - creater: "管理者课程", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 3, - lei: "作业", - // state: "已停用", - creater: "管理者作业", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 4, - lei: "考试", - // state: "草稿", - creater: "管理者考试", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 5, - lei: "案例", - // state: "草稿", - creater: "腾飞班1案例", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: true, - checkedd: false, - }, - { - key: 4, - lei: "考试", - // state: "草稿", - creater: "管理者考试", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 5, - lei: "案例", - // state: "草稿", - creater: "腾飞班1案例", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: true, - checkedd: false, - }, - ], - drawertableData: [ - { - key: 1, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "1-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "1-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - }, - ], - }, - { - key: 2, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "2-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "2-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - }, - ], - }, - { - key: 3, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 4, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 5, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 6, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 7, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - currentPage: 1, - tableDataTotal: 100, - pageSize: 10, - visible: false, - visible2: false, - visible3: false, - stage: false, - selectedRowKeys: [], - }); - const selectProjectName = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName2 = (value, index) => { - console.log("value", value, index); - }; - const afterVisibleChange = (bool) => { - console.log("visible", bool); - }; - const tableDataFunc = () => { - const columns = [ - { - title: "类型", - dataIndex: "state", - // width: "30%", - key: "state", - width: 60, - align: "left", - className: "classify", - scopedSlots: { customRender: "action" }, - customRender: (text) => { - // console.log(text.record.checked1); - return (
-
{ - console.log("点击了"); - }}>
+ ], + }, + ], + }, + { + key: 3, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 4, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 5, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: "1-1-1", + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + currentPage: 1, + tableDataTotal: 100, + pageSize: 10, + visible: false, + visible2: false, + visible3: false, + stage: false, + selectedRowKeys: [], + }); + const selectProjectName = (value, index) => { + console.log("value", value, index); + }; + const selectProjectName2 = (value, index) => { + console.log("value", value, index); + }; + const afterVisibleChange = (bool) => { + console.log("visible", bool); + }; + const tableDataFunc = () => { + const columns = [ + { + title: "类型", + dataIndex: "state", + // width: "30%", + key: "state", + width: 60, + align: "left", + className: "classify", + scopedSlots: { customRender: "action" }, + customRender: (text) => { + // console.log(text.record.checked1); + return ( +
+
{ + console.log("点击了"); + }} + >
{text.record.lei} {/** @@ -628,62 +689,77 @@ export default { {text.record.lei} */} -
); - }, - }, - { - title: "任务名称", - dataIndex: "creater", - // width: "30%", - key: "creater", - width: 200, - align: "center", - className: "h", - }, - { - title: "必修/选修", - dataIndex: "pubtime", - key: "pubtime", - // width: 100, - align: "center", - className: "h", - scopedSlots: { customRender: "action" }, - customRender: (text) => { - // console.log(text.record.checked1); - return (
+
+ ); + }, + }, + { + title: "任务名称", + dataIndex: "creater", + // width: "30%", + key: "creater", + width: 200, + align: "center", + className: "h", + }, + { + title: "必修/选修", + dataIndex: "pubtime", + key: "pubtime", + // width: 100, + align: "center", + className: "h", + scopedSlots: { customRender: "action" }, + customRender: (text) => { + // console.log(text.record.checked1); + return ( +
- { - console.log("点击了"); - text.record.checked1 = !text.record.checked1; - }}/> + { + console.log("点击了"); + text.record.checked1 = !text.record.checked1; + }} + />
-
+
必修
选修
-
); - }, - }, - { - title: "时长", - dataIndex: "cretime", - key: "cretime", - // width: 100, - align: "center", - className: "h", - }, - { - title: "操作", - className: "h", - dataIndex: "opacation", - key: "opacation", - // width: 100, - align: "center", - scopedSlots: { customRender: "action" }, - customRender: () => { - return (
+
+ ); + }, + }, + { + title: "时长", + dataIndex: "cretime", + key: "cretime", + // width: 100, + align: "center", + className: "h", + }, + { + title: "操作", + className: "h", + dataIndex: "opacation", + key: "opacation", + // width: 100, + align: "center", + scopedSlots: { customRender: "action" }, + customRender: () => { + return ( +
{ @@ -695,189 +771,187 @@ export default { 删除
-
); - }, - }, - ]; - return columns; - }; - const onSelectChange = (selectedRowKeys) => { - console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; - }; - // const getClientHeight = () => { - // state.rightheight = - // document.getElementsByClassName("addhead")[0].offsetHeight + - // document.getElementsByClassName("mid")[0].offsetHeight + - // document.getElementsByClassName("boom")[0].offsetHeight + - // 40 + - // "px"; - // }; - const showModal = () => { - state.stage = true; - }; - const closeModal = () => { - state.stage = false; - }; - onMounted(() => { - document.getElementsByTagName("main")[0].style.background = - "rgb(245, 247, 250,1)"; - document.getElementsByTagName("main")[0].style.boxShadow = "none"; - }); - onUnmounted(() => { - document.getElementsByTagName("main")[0].style.background = "#ffffff"; - document.getElementsByTagName("main")[0].style.boxShadow = - "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; - }); - const showDrawerOnline = () => { - state.visible = true; - - }; - const showDrawerFaceteach = () => { - state.visible3 = true; - console.log(state.visible3); - }; - return { - ...toRefs(state), - selectProjectName, - selectProjectName2, - tableDataFunc, - showModal, - closeModal, - // showDrawer, - afterVisibleChange, - drawercolumns, - onSelectChange, - showDrawerOnline, - showDrawerFaceteach, - }; - }, +
+ ); + }, + }, + ]; + return columns; + }; + const onSelectChange = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + // const getClientHeight = () => { + // state.rightheight = + // document.getElementsByClassName("addhead")[0].offsetHeight + + // document.getElementsByClassName("mid")[0].offsetHeight + + // document.getElementsByClassName("boom")[0].offsetHeight + + // 40 + + // "px"; + // }; + const showModal = () => { + state.stage = true; + }; + const closeModal = () => { + state.stage = false; + }; + onMounted(() => { + document.getElementsByTagName("main")[0].style.background = + "rgb(245, 247, 250,1)"; + document.getElementsByTagName("main")[0].style.boxShadow = "none"; + }); + onUnmounted(() => { + document.getElementsByTagName("main")[0].style.background = "#ffffff"; + document.getElementsByTagName("main")[0].style.boxShadow = + "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; + }); + const showDrawerOnline = () => { + state.visible = true; + }; + const showDrawerFaceteach = () => { + state.visible3 = true; + console.log(state.visible3); + }; + return { + ...toRefs(state), + selectProjectName, + selectProjectName2, + tableDataFunc, + showModal, + closeModal, + // showDrawer, + afterVisibleChange, + drawercolumns, + onSelectChange, + showDrawerOnline, + showDrawerFaceteach, + }; + }, }; \ No newline at end of file + diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 844b5995..1384fded 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -1,97 +1,173 @@ - \ No newline at end of file + diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index af79859e..4d32ae84 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -23,6 +23,7 @@
+ Option A