diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js
new file mode 100644
index 00000000..c1b3b4db
--- /dev/null
+++ b/src/api/indexAudit.js
@@ -0,0 +1,13 @@
+import http from "./config";
+
+//获取待审核面授课列表
+export const list = (obj) => http.post('/admin/offcourse/list', obj)
+
+//获取待审核项目列表
+export const projlist = (obj) => http.post('/admin/project/list', obj)
+
+//获取已审核项目列表
+export const listView = (obj) => http.post('/admin/project/listView', obj)
+
+//获取面授课已审核列表
+export const courseListView = (obj) => http.post('/admin/offcourse/listReview', obj)
\ No newline at end of file
diff --git a/src/api/indexNotice.js b/src/api/indexNotice.js
index c6eb8fa7..19a34f98 100644
--- a/src/api/indexNotice.js
+++ b/src/api/indexNotice.js
@@ -6,7 +6,7 @@ import http from "./config";
// projectId: projectId,
// }
// });
-export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
+export const noticeList = (projectId) => http.post(`http://localhost:8080/manageApi/admin/project/noticeList?projectId=` + projectId + ``)
//发布项目公告
export const publishNotice = (obj) => http.post('/admin/project/publishNotice', obj)
diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
index a9837852..be42523c 100644
--- a/src/api/indexTemplate.js
+++ b/src/api/indexTemplate.js
@@ -4,11 +4,11 @@ import http from "./config";
//编辑项目模板
export const templateEdit = (obj) => http.post('/admin/project/template/edit',obj);
// 模板详情
-export const templateDetail = (id) => http.get(`/admin/project/template/edit?projectTemplateId=${id}`);
+export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
// 删除阶段
-export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id});
+export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage?stageId=${id}`);
//删除任务
-export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask`,{projectTaskIds:id});
+export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask?projectTaskIds=${id}`);
// 移动任务到阶段
export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj);
// 新建或编辑阶段
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 293ac1e7..22c806dc 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -150,8 +150,10 @@ export default {
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
- const afterVisibleChange = () => {
- getAllCaseText()
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
+ getAllCaseText()
+ }
};
const tableDataFunc = () => {
const columns = [
@@ -182,6 +184,9 @@ export default {
return columns;
};
const onSelectChange = (selectedRowKeys,selectedRows)=> {
+ if(selectedRowKeys.length>2){
+ return
+ }
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
};
@@ -251,18 +256,6 @@ export default {
});
} else if (props.isLevel == 2) {
if(state.apiTaskList.length > 1){
- // for((item,index) in state.apiTaskList){
- // apiTask
- // .addTask({
- // "courseId": item.caseId,
- // "duration": 0,
- // "flag": true,
- // "name": item.caseName,
- // "projectId": props.projectId,
- // "projectTaskId": props.projectTaskId,
- // "stageId": props.chooseStageId,
- // "type": 3,
- // })
for(let i = 0;i <= state.apiTaskList.length;i++){
apiTask
.addTask({
@@ -455,6 +448,9 @@ export default {
.ant-table-selection-column {
padding: 0px !important;
padding-left: 15px !important;
+ .ant-table-selection{
+ display: none;
+ }
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 0a58aef2..2f3ece39 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -215,6 +215,8 @@ export default {
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
+ evaluationTypeId: state.evaluationTypeId,
+ evaluationTypeName: state.evaluationTypeName,
type: 10,
})
.then(( ) => {
@@ -230,6 +232,8 @@ export default {
name: res.data.data.evaluationName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
+ evaluationTypeId: state.evaluationTypeId,
+ evaluationTypeName: state.evaluationTypeName,
type: 10,
})
.then(( ) => {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 82c24cf7..e16ef4d4 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -78,15 +78,16 @@
-
-
+
+ 选择试卷
+
+
{{ paperName }}
+
@@ -709,8 +716,8 @@ export default {
.catch(() => {
message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
});
- } else if (props.isLevel == 3) {
- console.log("");
+ } else if (props.isLevel == 3) {
+ console.log("");
}
};
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 5bb04782..257dbd95 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -36,7 +36,7 @@
搜索
-
+
@@ -50,7 +50,7 @@
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
- :row-selection="{ selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}"
+ :row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}"
/>
{
- state.evaluationTypeName = record.title
- state.evaluationTypeId = record.quiz_code
- };
- const onSelectChange = (selectedRowKeys)=> {
+ // const onSelect = (record)=> {
+ // state.evaluationTypeName = record.title
+ // state.evaluationTypeId = record.quiz_code
+ // };
+ const onSelectChange = (selectedRowKeys,selectedRows)=> {
+ if(state.selectedRowKeys.length>1){
+ return
+ }
state.selectedRowKeys = selectedRowKeys
+ state.evaluationTypeName = selectedRows[0].record.title
+ state.evaluationTypeId = selectedRows[0].quiz_code
}
const closeDrawer = () => {
ctx.emit("update:EvalListVisible", false);
};
- const afterVisibleChange = () => {
- getAllEvalText();
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
+ getAllEvalText();
+ }
};
const checkFinish =() =>{
let EvListDate = {
@@ -204,15 +211,24 @@
.catch(()=>{
})
}
+ //重置测评列表
+ const resetData = ()=> {
+ state.currentPage = 1;
+ state.tableData = [];
+ state.selectedRowKeys = [];
+ state.evaluationTypeId = null;
+ state.evaluationTypeName = "";
+ getAllEvalText();
+ }
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
onSelectChange,
- onSelect,
getTableDataList,
checkFinish,
changePagination,
+ resetData,
};
},
};
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index c87e5671..c9040848 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -98,7 +98,6 @@
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
- onSelect: onSelect,
}"
/>
@@ -194,12 +193,20 @@ export default {
selectedRowKeys: [],
tabledata: [
{
+ key:1,
workNum:1,
status:"已完成",
operation:"",
},
{
- workNum:1,
+ key:2,
+ workNum:2,
+ status:"未完成",
+ operation:"",
+ },
+ {
+ key:3,
+ workNum:2,
status:"未完成",
operation:"",
}
@@ -341,18 +348,21 @@ export default {
const closeDrawer = () => {
ctx.emit("update:Fvisible", false);
};
- const afterVisibleChange = () => {
- getManageList()
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
+ getManageList()
+ }
+
};
const selectProjectName = (value) => {
state.projectName = value;
};
const onSelectChange = (selectedRowKeys) => {
- state.selectedRowKeys = selectedRowKeys;
+ if(selectedRowKeys.length > 2){
+ return
+ }
+ state.selectedRowKeys = selectedRowKeys;
};
- const onSelect = (record) => {
- console.log(record);
- }
const allStuOver = ()=> {
state.ASOvervisible = true
@@ -457,7 +467,6 @@ export default {
closeDrawer,
afterVisibleChange,
onSelectChange,
- onSelect,
allStuOver,
showEntryScore,
godie,
@@ -672,7 +681,6 @@ export default {
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
- // padding-left: 45px !important;
}
.ant-pagination-item,
.ant-pagination-prev,
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
new file mode 100644
index 00000000..e8c0b1c3
--- /dev/null
+++ b/src/components/drawers/ProjectAudit.vue
@@ -0,0 +1,412 @@
+
+
+
+
+
+
+
+
+
+
+
项目名称:
+
+ {{ name }}
+
+
+
+
封面图:
+
+
+
+
+
+
项目时间:
+
+ {{ startTime }} ~ {{ endTime }}
+
+
+
+
项目经理:
+
+ {{ manager }}
+
+
+
+
资源归属:
+
+ {{ sourceBelong }}
+
+
+
+
项目说明:
+
+ {{ remark }}
+
+
+
+
同步学习记录:
+
+
同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
+
+
+
+
项目级别:
+
+ {{ level }}
+
+
+
+
培训体系:
+
+ {{ systemId }}
+
+
+
+
+
+
+
+
+ 详情{{ showDetail ? "折叠" : "展开" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index 74cdee07..5141cb5b 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -126,8 +126,10 @@
ctx.emit("update:STvisible", false);
};
- const afterVisibleChange = () => {
+ const afterVisibleChange = (bol) => {
+ if (bol == true) {
getManageList()
+ }
};
const tableDataFunc = ()=> {
@@ -186,6 +188,9 @@
state.SelectTestData = record
};
const onSelectChange = (selectedRowKeys) => {
+ if(selectedRowKeys.length>1){
+ return
+ }
state.selectedRowKeys = selectedRowKeys;
}
@@ -232,7 +237,7 @@
});
};
- //搜索任务列表
+ //搜索任务列表 没接口
const searchTaskList = () => {
let objser = {
name: "",
@@ -264,9 +269,12 @@
//重置任务列表
const resetTaskList = () => {
- state.name = "";
- state.projectName = "";
- state.tabledata = [];
+ state.inputPname = "";
+ state.inputCname = "";
+ state.tableData = [];
+ state.selectedRowKeys = [];
+ state.SelectTestData = [];
+ state.currentPage = 1;
getManageList();
};
return {
@@ -398,6 +406,12 @@
}
}
.tab {
+
+ .ant-table-selection-column {
+ .ant-table-selection{
+ display: none;
+ }
+ }
th.h {
background-color: #eff4fc !important;
}
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 6d753120..54cf82fd 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -394,8 +394,11 @@ export default {
const closeDrawer = () => {
ctx.emit("update:TMvisible", false);
};
- const afterVisibleChange = () => {
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
getManageList();
+ }
+
};
const selectProjectName = (value, index) => {
console.log("value", value, index);
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 4dfb6a1c..c4a18e21 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -345,8 +345,10 @@ export default {
const closeDrawer = () => {
ctx.emit("update:Tvisible", false);
};
- const afterVisibleChange = () => {
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
getManageList();
+ }
};
const selectProjectName = (value) => {
state.projectName = value;
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index cf404496..8916b350 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -299,8 +299,10 @@ export default {
const closeDrawer = () => {
ctx.emit("update:Wvisible", false);
};
- const afterVisibleChange = () => {
- getManageList();
+ const afterVisibleChange = (bol) => {
+ if ( bol == true ) {
+ getManageList();
+ }
};
const selectProjectName = (value) => {
state.projectName = value;
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 99a1c9c6..3a4855b4 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -16,7 +16,7 @@
-
+
-
+
@@ -66,16 +66,31 @@
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
+ :scroll="{ x: 1300 }"
:pagination="false"
/>
+
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index d8cf1d7b..20882d2a 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -6,26 +6,471 @@
* @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
-
+
-
+
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 56931cc2..171c254c 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -6,26 +6,473 @@
* @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
-
+
-
+
\ No newline at end of file
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 9b6a10ff..9ca65c2e 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -5,12 +5,11 @@
-
{{ projectInfo.name || "-" }}
+
{{projectInfo.name || '-'}}
-
项目经理:{{ projectInfo.manager || "-" }}
+
项目经理:{{projectInfo.manager || '-'}}
- 起止时间:{{ projectInfo.beginTime || "-" }} 至
- {{ projectInfo.endTime || "-" }}
+ 起止时间:{{projectInfo.beginTime || '-'}} 至 {{projectInfo.endTime || '-'}}
@@ -34,7 +33,7 @@
-
返回
@@ -56,7 +55,7 @@
任务大纲
批量面授报名
-
+
-
+
+
当前设计下,学员可以获得
-
-
- 基本信息
- 编辑
-
-
+
+
+
+
+
+
-
模板名称:
+
项目名称:
-
+
{{ projectInfo.name }}
封面图:
-
-
-
+
-
模板时间:
+
项目时间:
-
+
{{ projectInfo.beginTime }} ~ {{ projectInfo.endTime }}
项目经理:
-
+
{{ projectInfo.manager }}
资源归属:
-
+
{{ projectInfo.sourceBelong }}
-
模板说明:
+
项目说明:
-
+
{{ projectInfo.remark }}
同步学习记录:
-
-
+ 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
项目级别:
-
+
{{ projectInfo.level }}
-
培训分类:
+
培训体系:
-
+
{{ projectInfo.systemId }}
-
@@ -47,14 +46,13 @@
return triggerNode.parentNode || document.body;
}
"
- v-model:value="classifySelect"
- placeholder="四个养成"
+ v-model:value="projectInfo.category"
+ placeholder="管理者"
style="width: 100%"
:options="classifyList"
@change="classificationChange"
allowClear
showSearch
- :disabled="viewDetail ? true : false"
>
@@ -88,7 +86,6 @@
action="/api/file/upload"
:before-upload="beforeUpload"
@change="handleChange"
- :disabled="viewDetail ? true : false"
>
@@ -146,7 +141,7 @@
return triggerNode.parentNode || document.body;
}
"
- :value="classifySelect1"
+ :value="projectInfo.manager"
mode="multiple"
placeholder="请选择项目经理"
style="width: 100%"
@@ -154,7 +149,6 @@
@change="classificationChange1"
allowClear
showSearch
- :disabled="viewDetail ? true : false"
>
@@ -175,11 +169,10 @@
return triggerNode.parentNode || document.body;
}
"
- v-model:value="classifySelect2"
- placeholder="自动带出 可修改"
+ v-model:value="projectInfo.sourceBelongId"
+ placeholder="项目一"
:options="classifyList2"
@change="classificationChange2"
- :disabled="viewDetail ? true : false"
/>
@@ -189,12 +182,11 @@
@@ -205,8 +197,7 @@