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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-09 15:36:39 +08:00
parent 54f1a33184 f8966ad52f
commit ce0b939112
7 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,

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"