hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-24 18:22:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'develop', 'develop', 'develop' and 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-09 16:09:21 +08:00
parent 1faca0b6c3 a3026152b0
commit 3a58a9679b
14 changed files with 954 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -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);
});

4
src/api/config.js
View File

@@ -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);

10
src/components/drawers/AddActive.vue
View File

@@ -83,6 +83,8 @@
</div>
<div class="btnbox">
<a-range-picker
show-time
format="YYYY-MM-DD hh:mm:ss"
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
@@ -357,8 +359,8 @@ export default {
state.radioV1 = Number(res.data.data.standardSettings);
state.time = [
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm:ss"),
];
})
.catch(() => {});
@@ -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, //活动开始前多少分钟签到

16
src/components/drawers/AddEval.vue
View File

@@ -49,7 +49,9 @@
<span style="margin-right: 3px">有效期：</span>
</div>
<div class="btnbox">
<a-range-picker style="width: 424px" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
<a-range-picker
show-time
style="width: 424px" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
@@ -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,

1
src/components/drawers/AddFaceteach.vue
View File

@@ -116,6 +116,7 @@
</div>
<div class="btnbox">
<a-range-picker
show-time
v-model:value="chooseTime"
:placeholder="[' 开始时间', ' 结束时间']"
/>

11
src/components/drawers/AddHomework.vue
View File

@@ -62,9 +62,10 @@
<div class="btnbox">
<a-form-item has-feedback label="提交时间" name="choosedTime">
<a-range-picker
show-time
style="width: 424px; margin-left: 35px"
v-model:value="formState.choosedTime"
format="YYYY-MM-DD"
format="YYYY-MM-DD hh:mm:ss"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</a-form-item>
@@ -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;
})

11
src/components/drawers/AddTest.vue
View File

@@ -133,8 +133,9 @@
</div>
<a-form-item has-feedback label="考试时间" name="choosedTime">
<a-range-picker
show-time
v-model:value="formState.choosedTime"
format="YYYY-MM-DD"
format="YYYY-MM-DD hh:mm:ss"
style="width: 424px; margin-left: 35px"
:placeholder="[' 开始时间', ' 结束时间']"
/>
@@ -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,

14
src/components/vote/AddVote.vue
View File

@@ -104,6 +104,8 @@
</div>
<div class="btnbox">
<a-range-picker
show-time
format="YYYY-MM-DD HH:mm:ss"
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
@@ -397,8 +399,8 @@ export default {
state.ascriptionId = res.data.data.ascriptionId;
state.ballotId = res.data.data.ballotId;
state.time = [
dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
dayjs(res.data.data.voteStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.voteEndTime, "YYYY-MM-DD HH:mm:ss"),
];
state.totalVoteNum = res.data.data.votesTotal; //总票数
state.partakeNum = res.data.data.numberOfInvolved; //参与数
@@ -481,15 +483,15 @@ export default {
// return message.warning("请上传投票基数");
// }
if (state.time != undefined) {
state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss");
state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss");
}
let obj = {
voteId: props.edit ? props.EditVoteId : 0,
voteName: state.inputV1,
voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss"),
voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss"),
ballotId: state.ballotId,
baseVote: state.basevote,
voteExplain: state.textV1,

13
src/views/courselibrary/courseModal.vue
View File

@@ -21,7 +21,7 @@
</div>
<div style="margin-right: 57px; cursor: pointer">
<img
@click="visibleClose"
@click="noEditClose"
style="width: 22px; height: 22px"
src="@/assets/images/basicinfo/close22.png"
/>
@@ -338,7 +338,7 @@
</div>
</div>
<div class="m_btn">
<div class="btn btn5" @click="visibleClose">
<div class="btn btn5" @click="noEditClose">
<div class="btnText">取消</div>
</div>
<div class="btn btn6" @click="handlePush">
@@ -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'

4
src/views/learningpath/LearningPath.vue
View File

@@ -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) => {

40
src/views/learningpath/LevelAdd.vue
View File

@@ -854,7 +854,12 @@
<div
v-for="item in fileList"
:key="item.uid"
style="width:500px;display:flex;justify-content:space-between;align-items:center;"
style="
width: 500px;
display: flex;
justify-content: space-between;
align-items: center;
"
class="docListStyle"
>
<img
@@ -867,9 +872,17 @@
"
alt=""
/>
<span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
item.name
}}</span>
<span
style="
font: oblique bold 16px Sans-serif;
width: 300px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.name }}</span
>
<span
style="color: #4ea6ff; cursor: pointer"
@click="deFile(item.uid)"
@@ -1280,7 +1293,7 @@ import TestManage from "../../components/drawers/TestManage";
import FaceManage from "../../components/drawers/FaceManage";
import WorkManage from "../../components/drawers/WorkManage";
import SeeStu from "../../components/drawers/SeeStu";
// import { useRoute } from "vue-router";
import { useRouter } from "vue-router";
// import { useStore } from "vuex";
import { storage } from "../../api/storage";
import { getRouterOverview } from "@/api/indexLearningPath";
@@ -1308,7 +1321,7 @@ export default {
TwoDimensionalCode,
},
setup() {
// const routers = useRoute();
const router = useRouter();
// const store = useStore();
const state = reactive({
routerId: storage.get("routerId")
@@ -1844,8 +1857,8 @@ export default {
if (res.status === 200) {
// console.log("获取关卡、任务、学员统计数据", res.data);
// 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) => {
@@ -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";

1
src/views/projectcenter/ProjectAdd.vue
View File

@@ -112,6 +112,7 @@
<div class="in">
<a-range-picker
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"

4
src/views/projectcenter/ProjectManage.vue
View File

@@ -1022,8 +1022,8 @@ export default {
api.getProjectCount(object.projectId).then((res) => {
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 = {

1717
src/views/projectcenter/TaskPage.vue
View File

File diff suppressed because it is too large Load Diff