Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

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 }));
+export const createProject = (obj) => http.post('/admin/project/edit', {
-
+	"attach": obj.attach,
-// 测试方法
+	"beginTime": obj.beginTime,
-// import * as api from '../../api/index'
+	"boeFlag": obj.boeFlag,
-// api.getStemInfo(4).then(res => {
+	"category": obj.category,
-// 	console.log(res)
+	"courseSyncFlag": obj.courseSyncFlag,
-// }).catch(err => {
+	"endTime": obj.endTime,
-// 	console.log(err)
+	"level": obj.level,
-// })
+	"manager": obj.manager,
-
+	"managerId": obj.managerId,
-// 获取字典列表
+	"name": obj.name,
-export const getList = (pageno, pagesize) => http.post('/dict/getList', {
+	"notice": obj.notice,
-	"dictCode": "",
+	"noticeFlag": obj.noticeFlag,
-	"pageNo": pageno,
+	"parentId": obj.parentId,
-	"pageSize": pagesize
+	"picUrl": obj.picUrl,
-})
+	"projectId": obj.projectId,
-
+	"remark": obj.remark,
-// 测试方法
+	"sourceBelongId": obj.sourceBelongId,
-// import * as api from '../../api/index'
+	"status": obj.status,
-// api.getList(0,0).then(res => {
+	"systemId": obj.systemId,
-// 	console.log(res)
+	"templateId": obj.templateId,
-// }).catch(err => {
+	"type": obj.type
-// 	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)
-// })

src/components/drawers/AddGroup.vue

@@ -26,7 +26,7 @@
           <div class="inname">小组名称:</div>
           <div class="in">
             <a-input
-              v-model:value="value"
+              v-model:value="valuen"
               placeholder="请输入小组名称"
               style="border-radius: 8px; height: 40px"
             />
@@ -42,7 +42,7 @@
           <div class="inname">小组长:</div>
           <div class="in">
             <a-input
-              v-model:value="value"
+              v-model:value="valueg"
               placeholder="请输入小组长"
               style="border-radius: 8px; height: 40px"
             />
@@ -68,7 +68,10 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({});
+    const state = reactive({
+      valuen: "",
+      valueg: "",
+    });
     const closeDrawer = () => {
       ctx.emit("update:Avisible", false);
     };

src/components/drawers/SubsetManage.vue

@@ -20,7 +20,7 @@
         <div>
           <div class="groupin">
             <a-input
-              v-model:value="value"
+              v-model:value="value1"
               placeholder="好好学习小组"
               style="border-radius: 8px; height: 40px"
             />
@@ -28,7 +28,7 @@
           </div>
           <div class="groupin">
             <a-input
-              v-model:value="value"
+              v-model:value="value2"
               placeholder="全能小组"
               style="border-radius: 8px; height: 40px"
             />
@@ -36,7 +36,7 @@
           </div>
           <div class="groupin">
             <a-input
-              v-model:value="value"
+              v-model:value="value3"
               placeholder="宇宙第一最强小组"
               style="border-radius: 8px; height: 40px"
             />
@@ -75,6 +75,9 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       Avisible: false,
+      value1: "",
+      value2:"",
+      value3: "",
     });
     const closeDrawer = () => {
       ctx.emit("update:Svisible", false);

src/views/projectcenter/ProjectManage.vue

@@ -342,7 +342,7 @@
             <div class="inname">项目名称:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value1"
                 show-count
                 :maxlength="30"
                 placeholder="请输入项目名称"
@@ -360,7 +360,7 @@
             <div class="inname">分类:</div>
             <div class="in">
               <a-select
-                v-model:value="value"
+                v-model:value="value2"
                 placeholder="四个养成"
                 style="border-radius: 8px; height: 40px"
               />
@@ -376,7 +376,7 @@
             <div class="inname">项目经理:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value3"
                 placeholder="请选择项目经理"
                 style="border-radius: 8px; height: 40px"
               />
@@ -392,7 +392,7 @@
             <div class="inname">资源归属:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value4"
                 style="border-radius: 8px; height: 40px"
               />
             </div>
@@ -456,7 +456,7 @@
             <div class="inname">子项目名称:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value5"
                 placeholder="请输入项目名称"
                 style="border-radius: 8px; height: 40px"
               />
@@ -472,7 +472,7 @@
             <div class="inname">分类:</div>
             <div class="in">
               <a-select
-                v-model:value="value"
+                v-model:value="value6"
                 placeholder="四个养成"
                 style="border-radius: 8px; height: 40px"
               />
@@ -488,7 +488,7 @@
             <div class="inname">子项目经理:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value7"
                 placeholder="自动带出 可编辑"
                 style="border-radius: 8px; height: 40px"
               />
@@ -504,7 +504,7 @@
             <div class="inname">资源归属:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="value8"
                 style="border-radius: 8px; height: 40px"
               />
             </div>
@@ -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,

src/views/projectcenter/TaskPage.vue

@@ -458,7 +458,7 @@
                       "
                     >
                       <div class="groupname" style="width: 42px">姓名：</div>
-                      <a-input v-model:value="value" placeholder="请输入姓名" />
+                      <a-input v-model:value="valuestun" placeholder="请输入姓名" />
                     </div>
                     <div
                       style="
@@ -470,7 +470,7 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                        v-model:value="value"
+                        v-model:value="valuestug"
                         placeholder="请输入小组名称"
                       />
                     </div>
@@ -484,7 +484,7 @@
                     >
                       <div class="groupname" style="width: 42px">部门：</div>
                       <a-select
-                        v-model:value="value"
+                        v-model:value="valuestub"
                         placeholder="请选择部门"
                       />
                     </div>
@@ -497,7 +497,7 @@
                     >
                       <div class="groupname" style="width: 42px">学员：</div>
                       <a-select
-                        v-model:value="value"
+                        v-model:value="valuegood"
                         placeholder="是否为优秀学员"
                         :options="goodstuList"
                       />
@@ -579,7 +579,7 @@
                   <div class="groupleft">
                     <div class="groupname">小组名称：</div>
                     <a-input
-                      v-model:value="value"
+                      v-model:value="valuestugn"
                       placeholder="请输入小组名称"
                     />
                   </div>
@@ -1162,7 +1162,7 @@
             <div class="inname">小组名称:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="valueaddg"
                 placeholder="请输入小组名称"
                 style="border-radius: 8px; height: 40px"
               />
@@ -1178,7 +1178,7 @@
             <div class="inname">小组长:</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="valueaddm"
                 placeholder="请输入小组长"
                 style="border-radius: 8px; height: 40px"
               />
@@ -1754,12 +1754,18 @@ export default {
       checkedd2: false, //设置按钮2
       radioV1: "",
       radioV2: "",
-      activeKey: "1",
+      activeKey: "1",//1:概览 2.任务...
-      activeKey1: "8",
+      activeKey1: "8",//8:学员管理 9：小组管理
       activeKey2: "3",
       inputValue: 5,
       inputValue2: 5,
       inputValue3: 5,
+      valueaddm: "",//创建小组输入小组长
+      valueaddg:"",//创建小组输入名称
+      valuestun:"",//学员管理姓名
+      valuegood:"",
+      valuestub:"",//学员管理部门
+      valuestug:"",//学员管理小组名称
       valueName: "", //排行榜输入姓名
       valueDate: "", //排行榜输入日期
       noticeChecked: true,

src/views/research/ResearchManage.vue

@@ -105,7 +105,7 @@
             <div class="inname">调研名称</div>
             <div class="in">
               <a-input
-                v-model:value="value"
+                v-model:value="valuen"
                 show-count
                 :maxlength="15"
                 style="border-radius: 8px"
@@ -262,6 +262,7 @@ export default {
       tableDataTotal: 20,
       pageSize: 10,
       value1: " ",
+      valuen: "",
       value2: ref(),
       valueE: ref(" "),
       valueEE: ref(" "),