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

src/api/index.js

@@ -37,11 +37,8 @@ import http from "./config";
 
 // 接口-请求
 
-// 创建编辑单层项目
+// 创建编辑单层项目（type=3）/ 多层项目（type=1）/ 多层子项目（type=2）
 export const createProject = (obj) => http.post('/admin/project/edit', obj)
 
-// 创建多层项目
-export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj)
-
 // 获取项目列表
 export const getProjectList = (obj) => http.post('/admin/project/list', obj)

src/views/projectcenter/ProjectAdd.vue

@@ -81,12 +81,12 @@
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">项目经理</div>
 					</div>
-					<div class="in select">
+					<div class="in">
 						<a-select :getPopupContainer="
 							(triggerNode) => {
 								return triggerNode.parentNode || document.body;
 							}
-						" :value="classifySelect1" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
+						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
 							@change="classificationChange1" allowClear showSearch>
 						</a-select>
 					</div>
@@ -97,8 +97,13 @@
 						<div class="inname">资源归属</div>
 					</div>
 
-					<div class="in">
+					<div class="in select">
-						<a-input v-model:value="valueE" placeholder="自动带出 可修改" />
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
+							@change="classificationChange2" />
 					</div>
 				</div>
 				<div class="name name2">
@@ -126,8 +131,13 @@
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">项目级别</div>
 					</div>
-					<div class="in">
+					<div class="in select">
-						<a-input v-model:value="valueE1" placeholder="集团级/组织级/现地级/部门级" />
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
+							placeholder="集团级/组织级/现地级/部门级" />
 					</div>
 				</div>
 				<div class="name">
@@ -135,8 +145,13 @@
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">培训体系</div>
 					</div>
-					<div class="in">
+					<div class="in select">
-						<a-input v-model:value="valueE2" placeholder="集团级/组织级/现地级/部门级" />
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
+							placeholder="集团级/组织级/现地级/部门级" />
 					</div>
 				</div>
 				<div class="name">
@@ -177,9 +192,14 @@
 			</div>
 			<div class="template">
 				<div class="name">
-					<div class="inname" style="width: 50px">模板</div>
+					<div class="inname" style="width: 50px">模版</div>
 					<div class="in select" style="margin-left: 2px">
-						<a-select v-model:value="value1" placeholder="请选择模板" :size="size" style="width: 100%" :options="options">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
 						</a-select>
 					</div>
 				</div>
@@ -340,13 +360,66 @@ export default {
 		let manager = "";
 		let managerId = "";
 		const classificationChange1 = (key) => {
-			console.log(`selected ${key}`);
+			console.log(`selected ${key}`, classifyList1);
-			console.log(classifyList1.value[key - 1].label)
+			let mstr = '';
-			manager = String(classifyList1.value[key - 1].label)
+			let midstr = '';
-			managerId = String(key)
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ',';
+					mstr += classifyList1.value[i].label + ',';
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr)
+			manager = mstr;
+			managerId = midstr;
 		};
 
 		// 资源归属 sourceBelongId 后续给接口
+		const classifyList2 = ref([
+			{ value: 1, label: '项目一' },
+			{ value: 2, label: '项目二' },
+			{ value: 3, label: '项目三' },
+		]);
+
+		const classificationChange2 = (key) => {
+			console.log(`selected ${key}`, classifyList2);
+		}
+
+		// 项目级别
+		const classifyList3 = ref([
+			{ value: 1, label: '集团级' },
+			{ value: 2, label: '组织级' },
+			{ value: 3, label: '现地级' },
+			{ value: 4, label: '部门级' },
+		]);
+		const classificationChange3 = (key) => {
+			console.log(`selected ${key}`, classifyList3);
+		}
+
+		// 培训体系
+		const classifyList4 = ref([
+			{ value: 1, label: '集团级' },
+			{ value: 2, label: '组织级' },
+			{ value: 3, label: '现地级' },
+			{ value: 4, label: '部门级' },
+		]);
+		const classificationChange4 = (key) => {
+			console.log(`selected ${key}`, classifyList4);
+		}
+
+		// 模版
+		const classifyList5 = ref([
+			{ value: 1, label: '模版一' },
+			{ value: 2, label: '模版二' },
+			{ value: 3, label: '模版三' },
+			{ value: 4, label: '模版四' },
+		]);
+		const classificationChange5 = (key) => {
+			console.log(`selected ${key}`, classifyList5);
+		}
 
 		// 项目说明
 		const remark = ref('');
@@ -438,10 +511,14 @@ export default {
 			api.createProject(obj).then(res => {
 				console.log(res)
 				if (res.status == 200 && res.data.code == 200) {
-					router.push({
+					message.destroy();
-						path: '/taskpage',
+					message.success("创建成功")
-						query: { id: res.data.data.projectId }
+					setTimeout(() => {
-					});
+						router.push({
+							path: '/taskpage',
+							query: { id: res.data.data.projectId }
+						});
+					}, 1000);
 				} else {
 					message.destroy();
 					message.error("创建失败，请检查当前网络状态。")
@@ -459,6 +536,10 @@ export default {
 			classifyList,
 			classificationChange,
 			classificationChange1,
+			classificationChange2,
+			classificationChange3,
+			classificationChange4,
+			classificationChange5,
 			fileList,
 			fileList1,
 			loading,
@@ -469,6 +550,10 @@ export default {
 			beforeUpload1,
 			onRangeChange,
 			classifyList1,
+			classifyList2,
+			classifyList3,
+			classifyList4,
+			classifyList5,
 			remark,
 			changeChecked,
 			changeChecked1,

src/views/projectcenter/TaskAdd.vue

@@ -539,6 +539,7 @@ import AddVote from "../../components/drawers/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
+import * as apiExternal from "../../api/indexExternalChain";
 import * as apidiscuss from "../../api/indexDiscuss";
 import * as apiactivity from "../../api/indexActivity";
 import * as apieval from "../../api/indexEval";
@@ -674,6 +675,7 @@ export default {
           haspub: false,
           checked1: false,
           checkedd: false,
+          id: "ssss",
         },
         {
           key: 2,
@@ -858,6 +860,7 @@ export default {
       isactive: -1,
       isActive: false,
       deleteLiveID: null, //删除直播id
+      deleteExternalID: null, //删除外链id
       deleteEvalID: null, //测评
       deleteInvistID: null, //评估
       deleteDiscussID: null, //删除讨论id
@@ -1034,7 +1037,22 @@ export default {
           console.log(err);
         });
     };
-    //删除讨论
+
+    //删除外链
+    const deleteExternalChain = () => {
+      let obj = {
+        linkId: state.deleteExternalID,
+      };
+      apiExternal
+        .deleteLink(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
     const deleteDiscuss = () => {
       let obj = {
         discussId: state.deleteDiscussID,
@@ -1130,7 +1148,7 @@ export default {
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
-        evaluationId:state.deleteEvalID,
+        evaluationId: state.deleteEvalID,
       };
       apieval
         .deleteEvaluationById(obj)
@@ -1145,10 +1163,48 @@ export default {
         });
     };
 
+    //编辑测评信息
+    const editEvalPath = () => {
+      // if (!state.inputV1) return message.info("请输入测评名称");
+      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
+      // state.createLoading = true;
+      let obj = {
+        createTime: "",
+        createUser: 0,
+        evaluationEndTime: "",
+        evaluationFlag: "",
+        evaluationId: "",
+        evaluationName: "",
+        evaluationPictureAddress: "",
+        evaluationStartTime: "",
+        evaluationTag: "",
+        evaluationTypeId: 0,
+        evaluationTypeName: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      apieval
+        .updateEvaluation(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+            // state.createLoading = false;
+            // state.currentPage = 1;
+            // router.push("/leveladd");
+            // getLearnPath();
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("修改失败", err);
+          // state.createLoading = false;
+        });
+    };
+
     //删除评估测试
     const deleteInvistText = () => {
       let obj = {
-        evaluationId:state.deleteInvistID,
+        evaluationId: state.deleteInvistID,
       };
       apiinvist
         .deleteAppraise(obj)
@@ -1162,7 +1218,7 @@ export default {
           console.log("删除失败", err);
         });
     };
-    
+
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1293,8 +1349,10 @@ export default {
       deleteDiscuss,
       editDiscuss,
       deleteEvalText,
+      deleteExternalChain,
       deleteActivity,
       editActivity,
+      editEvalPath,
       deleteInvistText,
     };
   },