diff --git a/src/App.vue b/src/App.vue
index 1836c14e..ed41e2ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
- console.log("版本0.9.7------------");
+ console.log("版本0.9.8------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
diff --git a/src/api/config.js b/src/api/config.js
index adba7185..f766c84b 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-09 10:04:32
+ * @LastEditTime: 2022-12-09 14:39:01
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
- // window.open("https://u-pre.boe.com/web/", '_self');
+ window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 0a3cd2c9..aca5b52d 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -83,6 +83,8 @@
{});
@@ -454,11 +456,11 @@ export default {
activityAddress: state.inputV3, //活动地址
activityDuration: state.inputV2, //活动时长
activityExplain: state.textV2, //活动说明
- activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
+ activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss"), //活动结束时间
activityId: props.edit ? props.EditActiveId : 0, //活动ID
activityName: state.inputV1, //活动名称
activityNotice: state.textV1, //活动公告
- activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), //活动开始时间
+ activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss"), //活动开始时间
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index a5e57e88..fe39d694 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -49,7 +49,9 @@
有效期:
@@ -241,8 +243,8 @@ export default {
state.evaluationTypeName = res.data.data.evaluationTypeName;
state.evaluationTypeId = res.data.data.evaluationTypeId;
state.time = res.data.data.evaluationStartTime ? [
- dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
- dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
+ dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD HH:mm:ss"),
+ dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm:ss"),
] : undefined;
state.description = res.data.data.evaluationExplain;
})
@@ -279,9 +281,9 @@ export default {
}
let objei = {
evaluationName: state.inputV1,
- evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD") : "",
+ evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationId: props.edit ? Number(props.EditEvalId) : 0,
- evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD") : "",
+ evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description,
@@ -317,9 +319,9 @@ export default {
}
let obj = {
evaluationName: state.inputV1,
- evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD") : "",
+ evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationId: props.evaluationId,
- evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD") : "",
+ evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description,
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 4f88e2d7..ef068b98 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -116,6 +116,7 @@
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 3dc2a0f6..deebbf2c 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -62,9 +62,10 @@
@@ -328,8 +329,8 @@ export default {
// 新增任务
const updteHomeWork = () => {
let obj = {
- submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
- submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+ submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD hh:mm:ss"),
+ submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD hh:mm:ss"),
workEnclosureAddress: state.workEnclosureAddress
? state.workEnclosureAddress
: "",
@@ -379,8 +380,8 @@ export default {
formState.workName = res.data.data.workName;
formState.workRequirement = res.data.data.workRequirement;
formState.choosedTime = [
- dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"),
- dayjs(res.data.data.submitEndTime, "YYYY-MM-DD"),
+ dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm:ss"),
+ dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm:ss"),
];
state.addLoading = false;
})
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index e838c5b7..45b8a7e2 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -133,8 +133,9 @@
@@ -604,8 +605,8 @@ export default {
res.data.data.examinationStartTime
) {
formState.choosedTime = [
- dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD"),
- dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD"),
+ dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
+ dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
];
state.addLoading = false;
} else {
@@ -622,7 +623,7 @@ export default {
let obj = {
examinationDuration: formState.examinationDuration,
examinationEndTime: dayjs(formState.choosedTime[1]).format(
- "YYYY-MM-DD"
+ "YYYY-MM-DD HH:mm:ss"
),
examinationExplain: formState.examinationExplain,
examinationId: props.edit ? props.EditTestId : 0,
@@ -631,7 +632,7 @@ export default {
examinationPaperId: 0,
// examinationPaperName: formState.choosedTest,
examinationStartTime: dayjs(formState.choosedTime[0]).format(
- "YYYY-MM-DD"
+ "YYYY-MM-DD HH:mm:ss"
),
passLine: formState.passLine,
questionArrangement: formState.questionArrangement,
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index fd8b4d9d..0fca3549 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -104,6 +104,8 @@

@@ -338,7 +338,7 @@
-
+
@@ -424,6 +424,13 @@ export default defineComponent({
emit("visibleClose");
};
+ // 未编辑直接离开的 不予刷新
+ const noEditClose = () => {
+ state.ft_hs = false;
+ ft_exit();
+ emit("noEdit");
+ }
+
expose({
visibleOpen,
visibleClose,
@@ -735,7 +742,7 @@ export default defineComponent({
handleTagClose,
handlePush,
reviewClick,
-
+ noEditClose,
editorRef,
valueHtml,
mode: "simple", // 或 'simple'
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 8382fc9c..b5482a93 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -867,8 +867,8 @@ export default {
console.log("获取关卡、任务、学员统计数据", res.data);
if (res.status === 200) {
// state.routeStudentsNum = res.data.students;
- state.routeChapters = res.data.chapters;
- state.routeTasks = res.data.tasks;
+ state.routeChapters = res.data.data.chapters;
+ state.routeTasks = res.data.data.tasks;
}
})
.catch((err) => {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f960acdf..0408fd13 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -854,7 +854,12 @@
![]()
-
{{
- item.name
- }}
+
{{ item.name }}
{
@@ -2295,7 +2308,16 @@ export default {
);
const totask = () => {
- state.activeKey = "2";
+ // console.log("state.taskSyllabus", state.taskSyllabus);
+ router.push({
+ path: "/leveladddetail",
+ });
+ // if (state.taskSyllabus.length===1) {
+ // if(state.taskSyllabus[0].taskList.length===0){
+ // // /leveladddetail
+ // }
+ // }
+ // state.activeKey = "2";
};
const tostudent = () => {
state.activeKey = "3";
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 7f1f2918..4c5abd66 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -112,6 +112,7 @@
{
console.log("获取关卡、任务、学员统计数据", res.data);
// state.projectStudentsNum = res.data.students;
- state.projectStages = res.data.stages;
- state.projectTasks = res.data.tasks;
+ state.projectStages = res.data.data.stages;
+ state.projectTasks = res.data.data.tasks;
});
//获取学员总数
let obj = {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e95626e9..d9252df5 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3,7 +3,7 @@
-
![]()
+
{{ name }}
@@ -12,13 +12,13 @@
{{ act }}
{{ act }}
{{ act }}
{{ act }}
@@ -126,9 +126,9 @@
-->
{
routered.push({
path: `/taskadd`,
@@ -205,16 +205,16 @@
});
}
"
- style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+ style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
>
-

+
-

+
-

+
添加任务
@@ -222,18 +222,18 @@
快速添加任务/阶段
-

+
-

+
-

+
添加学员
@@ -271,27 +271,27 @@
{{
- projectInfoOverview.totalStudentCnt
- }}
+ projectInfoOverview.totalStudentCnt
+ }}
总人数
{{
- projectInfoOverview.studyStudentCnt
- }}
+ projectInfoOverview.studyStudentCnt
+ }}
学习人数
{{
- projectInfoOverview.completeStudentCnt
- }}
+ projectInfoOverview.completeStudentCnt
+ }}
完成人数
{{
- projectInfoOverview.onlineCourseCnt
- }}%
在线课程数
@@ -299,8 +299,8 @@
{{
- projectInfoOverview.offLineCourseCnt
- }}%
面授课程数
@@ -308,8 +308,8 @@
{{
- projectInfoOverview.completeRatio
- }}%
总完成率
@@ -324,13 +324,13 @@
-->
{{ item.stage }}
@@ -344,28 +344,28 @@
@@ -376,8 +376,8 @@
@@ -386,8 +386,8 @@
@@ -415,12 +415,12 @@
批量面授报名
-->
@@ -437,8 +437,8 @@
-->
必修
选修
@@ -540,29 +540,29 @@
{{
item.finishStuCnt && item.finishStuCnt !== null
- ? item.finishStuCnt
- : 0
+ ? item.finishStuCnt
+ : 0
}}/{{
item.totalStuCnt && item.totalStuCnt !== null
- ? item.totalStuCnt
- : 0
+ ? item.totalStuCnt
+ : 0
}}人
{{
+ >{{
(item.finishStuCnt && item.finishStuCnt !== null
- ? item.finishStuCnt
- : 0 / item.totalStuCnt &&
+ ? item.finishStuCnt
+ : 0 / item.totalStuCnt &&
item.totalStuCnt !== null
- ? item.totalStuCnt
- : 0) * 100
+ ? item.totalStuCnt
+ : 0) * 100
}}%
@@ -593,9 +593,9 @@
考勤
-->
二维码
@@ -630,22 +630,22 @@
-

+
-

+
-

+
创建任务
@@ -656,8 +656,8 @@
{
routered.push({
path: `/taskadd`,
@@ -665,16 +665,16 @@
});
}
"
- style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+ style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
>
-

+
-

+
-

+
添加任务
@@ -693,7 +693,7 @@
-

+
添加学员
@@ -792,12 +792,12 @@
导入学员
-->
-

+
批量删除
-

+
已选择
@@ -812,15 +812,15 @@
@@ -854,24 +854,24 @@
-

+
创建小组
@@ -883,25 +883,25 @@
{{ item.groupName }}
. . .. . .
编辑
删除
@@ -911,11 +911,11 @@
组长:{{ item.leaderName }}
@@ -1415,19 +1428,19 @@
@@ -1451,31 +1464,31 @@
小组长:
@@ -1528,11 +1541,11 @@
@@ -1560,11 +1573,11 @@
@@ -1593,12 +1606,12 @@
@@ -1628,11 +1641,11 @@
@@ -1657,21 +1670,21 @@
-
+
@@ -1736,20 +1749,20 @@
@@ -1776,11 +1789,11 @@
@@ -1807,11 +1820,11 @@
@@ -1841,11 +1854,11 @@
@@ -1872,18 +1885,18 @@