From a4eeed94e26869d469d881cc9598e9932a372136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Thu, 27 Oct 2022 15:01:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E7=9A=84value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddGroup.vue | 9 ++++++--- src/components/drawers/SubsetManage.vue | 9 ++++++--- src/views/projectcenter/ProjectManage.vue | 24 +++++++++++++++-------- src/views/projectcenter/TaskPage.vue | 24 ++++++++++++++--------- src/views/research/ResearchManage.vue | 3 ++- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/src/components/drawers/AddGroup.vue b/src/components/drawers/AddGroup.vue index 6a419f89..ab8493ea 100644 --- a/src/components/drawers/AddGroup.vue +++ b/src/components/drawers/AddGroup.vue @@ -26,7 +26,7 @@
小组名称:
@@ -42,7 +42,7 @@
小组长:
@@ -68,7 +68,10 @@ export default { }, }, setup(props, ctx) { - const state = reactive({}); + const state = reactive({ + valuen: "", + valueg: "", + }); const closeDrawer = () => { ctx.emit("update:Avisible", false); }; diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue index f271587b..2ba850b6 100644 --- a/src/components/drawers/SubsetManage.vue +++ b/src/components/drawers/SubsetManage.vue @@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@
@@ -36,7 +36,7 @@
@@ -75,6 +75,9 @@ export default { setup(props, ctx) { const state = reactive({ Avisible: false, + value1: "", + value2:"", + value3: "", }); const closeDrawer = () => { ctx.emit("update:Svisible", false); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 1cce8990..9ab6c056 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -342,7 +342,7 @@
项目名称:
分类:
@@ -376,7 +376,7 @@
项目经理:
@@ -392,7 +392,7 @@
资源归属:
@@ -456,7 +456,7 @@
子项目名称:
@@ -472,7 +472,7 @@
分类:
@@ -488,7 +488,7 @@
子项目经理:
@@ -504,7 +504,7 @@
资源归属:
@@ -746,6 +746,14 @@ export default { components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip }, setup() { const state = reactive({ + value1: "", + value2: "", + value3: "", + value4: "", + value5: "", + value6: "", + value7: "", + value8: "", projectNameList: [ { id: 1, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 60d7c9dd..bd70416b 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -453,7 +453,7 @@ " >
姓名：
- +
小组名称：
@@ -479,7 +479,7 @@ >
部门：
@@ -492,7 +492,7 @@ >
学员：
@@ -574,7 +574,7 @@
小组名称：
@@ -1157,7 +1157,7 @@
小组名称:
@@ -1173,7 +1173,7 @@
小组长:
@@ -1689,12 +1689,18 @@ export default { checkedd2: false, //设置按钮2 radioV1: "", radioV2: "", - activeKey: "1", - activeKey1: "8", + activeKey: "1",//1:概览 2.任务... + activeKey1: "8",//8:学员管理 9：小组管理 activeKey2: "3", inputValue: 5, inputValue2: 5, inputValue3: 5, + valueaddm: "",//创建小组输入小组长 + valueaddg:"",//创建小组输入名称 + valuestun:"",//学员管理姓名 + valuegood:"", + valuestub:"",//学员管理部门 + valuestug:"",//学员管理小组名称 valueName: "", //排行榜输入姓名 valueDate: "", //排行榜输入日期 noticeChecked: true, diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 1a6ae94f..36f3d455 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -105,7 +105,7 @@
调研名称
Date: Thu, 27 Oct 2022 15:33:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E5=8D=95=E5=B1=82?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 62 +- src/views/projectcenter/ProjectAdd.vue | 1156 +++++++++++++----------- 2 files changed, 669 insertions(+), 549 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 1297c5d5..acd6f5c5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,5 +1,5 @@ import http from "./config"; -import qs from 'qs'; +// import qs from 'qs'; /** @@ -37,39 +37,27 @@ import qs from 'qs'; // 接口-请求 -// 根据投票ID获取题干信息 -export const getStemInfo = (stemId) => http.post('/vote/queryStemByStemId', qs.stringify({ stemId: stemId })); - -// 测试方法 -// import * as api from '../../api/index' -// api.getStemInfo(4).then(res => { -// console.log(res) -// }).catch(err => { -// console.log(err) -// }) - -// 获取字典列表 -export const getList = (pageno, pagesize) => http.post('/dict/getList', { - "dictCode": "", - "pageNo": pageno, - "pageSize": pagesize -}) - -// 测试方法 -// import * as api from '../../api/index' -// api.getList(0,0).then(res => { -// console.log(res) -// }).catch(err => { -// console.log(err) -// }) - -// 根据活动ID获取活动信息接口 -export const getActivityList = (activityId) => http.get('/activity', { params: { "activityId": activityId } }) - -// 测试方法 -// import * as api from '../../api/index' -// api.getActivityList(4).then(res => { -// console.log(res) -// }).catch(err => { -// console.log(err) -// }) \ No newline at end of file +// 创建编辑单层项目 +export const createProject = (obj) => http.post('/admin/project/edit', { + "attach": obj.attach, + "beginTime": obj.beginTime, + "boeFlag": obj.boeFlag, + "category": obj.category, + "courseSyncFlag": obj.courseSyncFlag, + "endTime": obj.endTime, + "level": obj.level, + "manager": obj.manager, + "managerId": obj.managerId, + "name": obj.name, + "notice": obj.notice, + "noticeFlag": obj.noticeFlag, + "parentId": obj.parentId, + "picUrl": obj.picUrl, + "projectId": obj.projectId, + "remark": obj.remark, + "sourceBelongId": obj.sourceBelongId, + "status": obj.status, + "systemId": obj.systemId, + "templateId": obj.templateId, + "type": obj.type +}) \ No newline at end of file diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 26a58d10..49d3a85e 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -1,537 +1,669 @@