diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
new file mode 100644
index 00000000..8ee7b715
--- /dev/null
+++ b/src/components/drawers/AddProject.vue
@@ -0,0 +1,443 @@
+
+
+
+
+
+
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 338437fd..2d283673 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -486,6 +486,19 @@
/>
@@ -1055,6 +1033,7 @@ import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.vue";
import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
+import AddProject from "../../components/drawers/AddProject.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import * as api from "../../api/indexLevel";
import { GetRouterDetail } from "../../api/indexTask";
@@ -1063,9 +1042,9 @@ import { storage } from "../../api/storage";
import { deleteStudyTask } from "../../api/indexStudy";
import draggable from "vuedraggable";
import { editTask } from "../../api/indexTaskadd";
-import * as apiProj from "../../api/index.js";
+
import { RouterEditTask } from "@/api/indexTask";
-import dayjs from "dayjs";
+
import { toDate } from "../../api/method";
import UnlockMode from "../../components/drawers/UnlockMode.vue";
export default {
@@ -1087,6 +1066,7 @@ export default {
draggable,
UnlockMode,
AddFaceteach,
+ AddProject,
},
setup() {
const state = reactive({
@@ -1267,7 +1247,7 @@ export default {
EditVoteId: "",
EditFaceId: "",
//项目
- EditProjId: "",
+ EditProjectId: "",
routerTaskId: "",
chapterId: "",
stageId: "",
@@ -1485,7 +1465,7 @@ export default {
//打开项目抽屉
const showDrawerAddProj = (id, eleId) => {
state.addprojvisible = true;
- state.EditActiveId = id;
+ state.EditProjectId = id;
state.routerTaskId = eleId;
};
//关闭项目抽屉
@@ -1557,11 +1537,7 @@ export default {
message.error(err);
});
};
- const afterProjVisibleChange = (bol) => {
- if(bol == true){
- getAllProjText()
- }
- };
+
const showAddStu = () => {
state.AddSvisible = true;
};
@@ -1947,69 +1923,7 @@ export default {
console.log("阶段改变", value, option);
state.removeStageId = option.chapterId;
};
- //项目抽屉用的
- const onProjSelectChange = (selectedRowKeys,selectedRows) => {
- state.selectedProjRowKeys = selectedRowKeys
- // if(selectedRowKeys.length>1){
- // return
- // }
- state.projId = selectedRows[0].projectId
- state.projName = selectedRows[0].name
- console.log(state.projId,'------------------');
- // console.log(selectedRowKeys,selectedRows);
- }
- const getTableDate = (data) => {
- let array = []
- data.map((value)=>{
- if(value.type == 3){
- let obj = {
- key: value.projectId,
- parentId:value.parentId,
- projectId:value.projectId,
- name: value.name,
- manager:value.manager,
- time: dayjs(value.createTime).format("YYYY-MM-DD"),
- }
- array.push(obj)
- }
- else {
- let obj = {
- key: value.projectId,
- parentId:value.parentId,
- name: value.name,
- manager:value.manager,
- time: dayjs(value.createTime).format("YYYY-MM-DD"),
- children: value.subList ? getTableDate(value.subList) : [] ,
- }
- array.push(obj)
- }
- })
- return array
- };
- //获取全部项目信息接口
- const getAllProjText = () => {
- apiProj
- .getProjectList({
- "beginTime": 0,
- "createName": "",
- "endTime": "",
- "manager": "",
- "name": "",
- "pageNo": 1,
- "pageSize": 10,
- "status": 0
- })
- .then((res) => {
- let arr = res.data.data.rows;
- if (res.status === 200) {
- state.drawertableData = getTableDate(arr);
- }
- })
- .catch(() => {
- message.destroy()
- message.error("获取全部项目信息接口失败")
- });
- };
+
//添加关卡项目
const updateTask = () => {
RouterEditTask({
@@ -2044,7 +1958,6 @@ export default {
tableDataFunc2,
showModal,
closeModal,
- afterProjVisibleChange,
showAddStu,
showImpStu,
// drawercolumns,
@@ -2084,9 +1997,7 @@ export default {
showChangeModal,
closeChangeModal,
handleChangeStage,
- onProjSelectChange,
- getTableDate,
- getAllProjText,
+
updateTask,
showDeleteChapter,
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index e271b643..68654ef3 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -99,6 +99,9 @@ export default defineComponent({
const state = reactive({
value1: null,
time:null,
+ currentPage: 1,
+ pageSize: 10,
+ total:0,
tableData1: [
{
key: "1",
@@ -168,9 +171,9 @@ export default defineComponent({
state.tableData = data;
};
const pagination = reactive({
- current: 1,
- total: 50,
- defaultPageSize: 10,
+ current: state.currentPage,
+ total: state.total,
+ defaultPageSize: state.pageSize,
onChange: (id) => { pagination.current = id; getLibraryList() },
})
getTableDate1();
@@ -181,14 +184,12 @@ export default defineComponent({
// 获取模板列表
const getLibraryList = () => {
- let date = Math.ceil(new Date(state.time).getTime() / 1000);
-
+ let date = Math.ceil(new Date(state.time).getTime() / 1000);
let obj = {
- // "create_time": state.time,
- "beginTime":date,
+ "createTime" : date==0?null:date,
"name": state.value1,
"pageNo": pagination.current,
- "pageSize": 10,
+ "pageSize": state.pageSize,
}
api.templateList(obj).then((res) => {
state.tableData1 = []