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,
+	"status": obj.status,
+	"systemId": obj.systemId,
+	"templateId": obj.templateId,
+	"type": obj.type
 })
-
-// 测试方法
-// 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)
-// })

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/ProjectAdd.vue

@@ -4,109 +4,87 @@
 		<div class="header">
 			<span class="title">创建/编辑单层项目</span>
 			<router-link to="/projectmanage" class="goback">
-        <span class="return"></span
+				<span class="return"></span><span class="returntext">返回</span>
-        ><span class="returntext">返回</span></router-link
+			</router-link>
-      >
 		</div>
 		<div class="content">
 			<div class="main">
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目名称</div>
 					</div>
 					<div class="in">
-            <a-input v-model:value="valueE" placeholder="请输入项目名称" show-count
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-                :maxlength="30"/>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">分类</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="triggerNode => {
-              :value="classifySelect"
+							return triggerNode.parentNode || document.body
-              placeholder="四个养成"
+						}" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-              style="width: 100%"
+							@change="classificationChange" allowClear showSearch>
-              :options="classifyList"
+						</a-select>
-              allowClear
-              showSearch
-            ></a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">封面图</div>
 					</div>
-          <div
+					<div class="box" style="
-            class="box"
-            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
               border-radius: 5px;
               cursor: pointer;
-            "
+							overflow: hidden;
-          >
+            ">
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
+							<img style="width: 100px;height: 100px;margin-bottom: 4px;margin-right: 4px;" v-if="imageUrl"
+								:src="imageUrl" alt="avatar" />
+							<div v-else>
+								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
+								<!-- <plus-outlined v-else></plus-outlined> -->
 								<div class="box1"></div>
 								<div class="box2"></div>
+								<!-- <div class="ant-upload-text"></div> -->
+							</div>
+						</a-upload>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目时间</div>
 					</div>
 
 					<div class="in">
-            <a-range-picker
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']"
-              separator="至"
+							style="width: 100%; height: 40px; border-radius: 5px" show-time @change="onRangeChange" />
-              :placeholder="['      开始时间', '        结束时间']"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目经理</div>
 					</div>
 					<div class="in select">
-            <a-select
+						<a-select :getPopupContainer="triggerNode => {
-              :value="classifySelect"
+							return triggerNode.parentNode || document.body
-              placeholder="请选择项目经理"
+						}" :value="classifySelect1" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1" allowClear
-              style="width: 100%"
+							showSearch>
-              :options="classifyList"
+						</a-select>
-              allowClear
-              showSearch
-            ></a-select>
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">资源归属</div>
 					</div>
 
@@ -119,12 +97,7 @@
 						<div class="inname" style="margin-top: 13px">项目说明</div>
 					</div>
 					<div class="in">
-            <a-textarea
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-              v-model:value="valuei"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count :maxlength="200"
-            />
 					</div>
 				</div>
 				<div class="name name2">
@@ -132,84 +105,59 @@
 						<div class="inname">同步学习记录</div>
 					</div>
 					<div class="in">
-            <a-radio v-model:checked="checked"
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">项目级别</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">培训体系</div>
 					</div>
 					<div class="in">
-            <a-input
+						<a-input v-model:value="valueE" placeholder="集团级/组织级/现地级/部门级" />
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
 					</div>
 				</div>
 				<div class="name">
 					<div class="namebox">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">是否BOEU实施</div>
 					</div>
 					<div class="in">
-            <a-radio v-model:checked="checked"
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
-              ><span
-                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">BOEU实施</span></a-radio>
-                >BOEU实施</span
-              ></a-radio
-            >
 					</div>
 				</div>
 				<div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
-            <img
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
 						<div class="inname">附件</div>
 					</div>
 					<div class="filebox">
 						<div>
-              <img
+							<img class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-                class="fileimg"
+							<a-upload v-model:file-list="fileList1" name="file" action="/api/file/upload" :headers="headers"
-                src="../../assets/images/projectadd/enclosure.png"
+								@change="handleChange1">
-              />
+								<!-- <a-button> -->
+								<!-- <upload-outlined></upload-outlined> -->
 								<span class="filetext">上传附件</span>
+								<!-- </a-button> -->
+							</a-upload>
 						</div>
 						<div class="support">
 							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
@@ -221,67 +169,213 @@
 				<div class="name">
 					<div class="inname" style="width: 50px">模板</div>
 					<div class="in select" style="margin-left: 2px">
-            <a-select
+						<a-select v-model:value="value1" placeholder="请选择模板" :size="size" style="width: 100%" :options="options">
-              v-model:value="value1"
+						</a-select>
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            ></a-select>
 					</div>
 				</div>
 			</div>
 		</div>
 		<div class="footer">
 			<div class="btn">
-        <router-link to="/taskpage"
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-          type="primary"
+				<a-button class="btn2">取消</a-button>
-          class="btn1"
-          >确定</router-link
-        >
-        <a-button
-          class="btn2"
-          >取消</a-button
-        >
 			</div>
 		</div>
 	</div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, ref } from "vue";
+import { message } from 'ant-design-vue';
+import * as api from "../../api/index";
+
 export default {
 	name: "projectAdd",
 	setup() {
 		const state = reactive({
-      classifyList: [
-        {
-          id: 1,
-          name: "分类一",
-          label: "分类一",
-        },
-        {
-          id: 2,
-          name: "分类二",
-          label: "分类二",
-        },
-        {
-          id: 3,
-          name: "分类三",
-          label: "分类三",
-        },
-        {
-          id: 4,
-          name: "分类四",
-          label: "分类四",
-        },
-      ],
 			classifySelect: null,
 			classifySelectId: null,
+			checked: false,
+			checked1: false
 		});
+
+		const projectName = ref('');
+
+		const classifyList = ref([
+			{ value: 1, label: '管理者' },
+			{ value: 2, label: '领军者' },
+			{ value: 3, label: '产业人' },
+		]);
+
+		let projectType = "";
+
+		const classificationChange = (value) => {
+			console.log(`selected ${value}`);
+			projectType = value;
+		};
+
+		function getBase64(img, callback) {
+			const reader = new FileReader();
+			reader.addEventListener('load', () => callback(reader.result));
+			reader.readAsDataURL(img);
+		}
+
+		const fileList = ref([]);
+		const fileList1 = ref([]);
+		const loading = ref(false);
+		const imageUrl = ref('');
+
+		const handleChange = (info) => {
+			if (info.file.status === 'uploading') {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === 'done') {
+				console.log('上传图片返回的信息 %o', info)
+				// Get this url from response in real world.
+				getBase64(info.file.originFileObj, (base64Url) => {
+					imageUrl.value = base64Url;
+					loading.value = false;
+				});
+			}
+			if (info.file.status === 'error') {
+				loading.value = false;
+				message.error('upload error');
+			}
+		};
+
+		const handleChange1 = (info) => {
+			if (info.file.status === 'uploading') {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === 'done') {
+				console.log('上传附件返回的信息 %o', info)
+
+			}
+			if (info.file.status === 'error') {
+				loading.value = false;
+				message.error('upload error');
+			}
+		};
+
+		const beforeUpload = (file) => {
+			const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+			if (!isJpgOrPng) {
+				message.error('You can only upload JPG file!');
+			}
+			const isLt2M = file.size / 1024 / 1024 < 1;
+			if (!isLt2M) {
+				message.error('Image must smaller than 1MB!');
+			}
+			return isJpgOrPng && isLt2M;
+		};
+
+		const onRangeChange = (value, dateString) => {
+			console.log('Selected Time: ', value);
+			// 项目时间选择函数
+			console.log('Formatted Selected Time: ', dateString);
+		};
+
+		// 项目经理 后续接口调用
+		const classifyList1 = ref([
+			{ value: 1, label: '李俊国' },
+			{ value: 2, label: '将小米' },
+			{ value: 3, label: '刘孟君' },
+		]);
+
+		// 资源归属 sourceBelongId 后续给接口
+
+		// 项目说明
+		const remark = ref('');
+
+
+		const changeChecked = () => {
+			console.log(state.checked)
+			state.checked ? state.checked = false : state.checked = true;
+		}
+
+		const changeChecked1 = () => {
+			console.log(state.checked1)
+			state.checked1 ? state.checked1 = false : state.checked1 = true;
+		}
+
+		const errorMsgs = {
+			"name": "请输入项目名称",
+			"type": "请选择项目分类",
+			"picUrl": "请上传项目封面图",
+			"beginTime": "请选择项目开始时间",
+			"endTime": "请选择项目结束时间",
+			"manager": "请选择项目经理",
+			"managerId": "请选择项目经理",
+			"sourceBelongId": "请选择资源归属",
+			"level": "请填写项目级别",
+			"systemId": "请填写项目培训体系",
+			"boeFlag": "请选择是否BOE实施",
+			"attach": "请上传附件"
+		}
+
+		const createProject = () => {
+			let obj = {
+				"attach": "1",
+				"beginTime": 0,
+				"boeFlag": 0,
+				"category": 0,
+				"courseSyncFlag": 0,
+				"endTime": 0,
+				"level": 0,
+				"manager": "",
+				"managerId": "",
+				"name": projectName["value"],
+				"notice": "",
+				"noticeFlag": 0,
+				"parentId": 0,
+				"picUrl": "",
+				"projectId": 0,
+				"remark": remark["value"],
+				"sourceBelongId": 0,
+				"status": 0,
+				"systemId": 0,
+				"templateId": 0,
+				"type": projectType
+			}
+			console.log('提交的数据格式 %o', obj)
+
+			for (let i in obj) {
+				console.log(obj[i])
+				if (obj[i] === "") {
+					message.destroy()
+					message.info(errorMsgs[i])
+					return
+				}
+			}
+
+			api.createProject(obj).then(res => {
+				console.log(res)
+			}).catch(err => {
+				console.log(err)
+			})
+		};
+
 		return {
 			...toRefs(state),
+			projectName,
+			classifyList,
+			classificationChange,
+			fileList,
+			fileList1,
+			loading,
+			imageUrl,
+			handleChange,
+			handleChange1,
+			beforeUpload,
+			onRangeChange,
+			classifyList1,
+			remark,
+			changeChecked,
+			changeChecked1,
+			createProject
 		};
-  },
+	}
 };
 </script>
 <style lang="scss">
@@ -296,6 +390,7 @@ export default {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
+
 		.title {
 			color: #000000;
 			font-size: 18px;
@@ -304,10 +399,12 @@ export default {
 			padding-left: 37px;
 			//font-weight: 500;
 		}
+
 		.goback {
 			padding-right: 70px;
 			//padding-top: 37px;
 			position: relative;
+
 			.return {
 				display: inline-block;
 				width: 42px;
@@ -316,6 +413,7 @@ export default {
 				margin-right: 10px;
 				background-image: url("../../assets/images/projectadd/return.png");
 			}
+
 			.returntext {
 				display: inline-block;
 				position: absolute;
@@ -325,8 +423,10 @@ export default {
 			}
 		}
 	}
+
 	.content {
 		display: flex;
+
 		.main {
 			width: 50%;
 			display: flex;
@@ -335,12 +435,14 @@ export default {
 			//justify-content: center;
 			float: left;
 			border-right: 1px solid rgba(153, 155, 163, 0.3);
+
 			.name {
 				width: 78%;
 				// background-color: lightcoral;
 				display: flex;
 				margin-top: 20px;
 				align-items: center;
+
 				//height: 40px;
 				// border: 1px solid black;
 				.namebox {
@@ -349,19 +451,23 @@ export default {
 					align-items: center;
 					justify-content: flex-end;
 					flex-shrink: 0;
+
 					.nameimg {
 						width: 10px;
 						height: 10px;
 					}
 				}
+
 				.d {
 					margin-top: 8px;
 					font-size: 25px;
 					color: #ff4e4e;
 				}
+
 				.box {
 					position: relative;
 					margin-left: 14px;
+
 					.box1 {
 						position: absolute;
 						left: 50%;
@@ -371,6 +477,7 @@ export default {
 						margin-top: -5px;
 						border-top: 2px solid rgba(78, 166, 255, 1);
 					}
+
 					.box2 {
 						position: absolute;
 						left: 50%;
@@ -381,35 +488,42 @@ export default {
 						border-left: 2px solid rgba(78, 166, 255, 1);
 					}
 				}
+
 				.inname {
 					color: #6f6f6f;
 					font-size: 14px;
 					margin-left: 7px;
 				}
+
 				.in {
 					margin-left: 14px;
 					flex: 1;
+
 					// .ant-radio-wrapper {
 					// }
 					.ant-input-textarea-show-count {
 						position: relative;
 						height: 88px;
 					}
+
 					.ant-input-textarea-show-count::after {
 						position: absolute;
 						right: 10px;
 						bottom: 0px;
 					}
+
 					.ant-input {
 						border-radius: 8px;
 						// height: 120%;
 						width: 100%;
 						height: 40px;
 					}
+
 					.ant-input-affix-wrapper {
 						padding: 0 11px;
 						border-radius: 8px;
 					}
+
 					.ant-select-selector {
 						border-radius: 5px;
 						// height: 120%;
@@ -417,20 +531,24 @@ export default {
 						height: 40px;
 					}
 				}
+
 				.filebox {
 					margin-left: 14px;
 					flex: 1;
+
 					.fileimg {
 						width: 15px;
 						height: 15px;
 						margin-right: 6px;
 					}
+
 					.filetext {
 						font-size: 14px;
 						font-weight: 400;
 						color: #4ea6ff;
 						line-height: 36px;
 					}
+
 					.support {
 						font-size: 14px;
 						font-weight: 400;
@@ -441,9 +559,11 @@ export default {
 					}
 				}
 			}
+
 			.name2 {
 				display: flex;
 				align-items: flex-start;
+
 				.ant-input-textarea {
 					.ant-input {
 						height: 88px;
@@ -451,6 +571,7 @@ export default {
 				}
 			}
 		}
+
 		.template {
 			width: 50%;
 			display: flex;
@@ -458,6 +579,7 @@ export default {
 			align-items: center;
 			//justify-content: center;
 			float: right;
+
 			.name {
 				width: 78%;
 				// background-color: lightcoral;
@@ -465,27 +587,32 @@ export default {
 				margin-top: 20px;
 				align-items: center;
 				height: 40px;
+
 				// border: 1px solid black;
 				.d {
 					margin-top: 8px;
 					font-size: 25px;
 					color: #ff4e4e;
 				}
+
 				.inname {
 					color: #6f6f6f;
 					font-size: 14px;
 					margin-left: 7px;
 					width: 65px;
 				}
+
 				.in {
 					margin-left: 14px;
 					width: 81%;
+
 					.ant-input {
 						border-radius: 5px;
 						// height: 120%;
 						width: 100%;
 						height: 40px;
 					}
+
 					.ant-select-selector {
 						border-radius: 5px;
 						// height: 120%;
@@ -496,14 +623,17 @@ export default {
 			}
 		}
 	}
+
 	.footer {
 		width: 100%;
 		margin-top: 31px;
 		margin-bottom: 14px;
 		padding-bottom: 20px;
+
 		.btn {
 			display: flex;
 			justify-content: center;
+
 			.btn1 {
 				display: flex;
 				justify-content: center;
@@ -512,9 +642,10 @@ export default {
 				height: 40px;
 				border-radius: 8px;
 				background: #409EFF;
-        color:#FFFFFF;
+				color: #FFFFFF;
 				margin-right: 14px;
 			}
+
 			.btn2 {
 				display: flex;
 				justify-content: center;
@@ -524,9 +655,10 @@ export default {
 				border-radius: 8px;
 				border: 1px solid #409EFF;
 				background: #FFFFFF;
-        color:#409EFF;
+				color: #409EFF;
 			}
 		}
+
 		.text {
 			color: rgba(153, 155, 163, 1);
 			font-size: 14px;

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(" "),