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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
This commit is contained in:
yuping
2022-12-17 17:41:47 +08:00
parent c1983082a5 94e0982817
commit d057c9b66c
18 changed files with 121 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@
<div class="btnbox">
<a-range-picker
show-time
format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px;"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
@@ -367,8 +367,8 @@ export default {
state.radioV1 = Number(res.data.data.standardSettings);
state.time = [
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm"),
];
})
.catch(() => {});
@@ -468,11 +468,11 @@ export default {
activityAddress: state.inputV3, //活动地址
activityDuration: state.inputV2, //活动时长
activityExplain: state.textV2, //活动说明
activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss"), //活动结束时间
activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm"), //活动结束时间
activityId: props.edit ? props.EditActiveId : 0, //活动ID
activityName: state.inputV1, //活动名称
activityNotice: state.textV1, //活动公告
activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss"), //活动开始时间
activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到

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

@@ -51,7 +51,7 @@
<div class="btnbox">
<a-range-picker
show-time
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
@@ -251,8 +251,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 HH:mm:ss"),
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm"),
] : undefined;
state.description = res.data.data.evaluationExplain;
state.type = res.data.data.type;
@@ -290,9 +290,9 @@ export default {
}
let objei = {
evaluationName: state.inputV1,
evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm") : "",
evaluationId: props.edit ? Number(props.EditEvalId) : 0,
evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm") : "",
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description,
@@ -329,9 +329,9 @@ export default {
}
let obj = {
evaluationName: state.inputV1,
evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm") : "",
evaluationId: props.evaluationId,
evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm") : "",
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description,

4
src/components/drawers/AddLive.vue
View File

@@ -540,8 +540,8 @@ export default {
console.log("获取的数据", res);
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
];
console.log(state.time);

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

@@ -244,7 +244,7 @@
<div class="main_item">
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">考试排序：</span>
<span style="margin-right: 3px">试题排列：</span>
</div>
<div class="btnbox">
<a-radio-group

26
src/components/drawers/AssessmentAll.vue
View File

@@ -164,19 +164,27 @@ export default {
.queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => {
console.log("查询评估xinxi ", res);
let info = res.data.data;
let n1 = info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 ;
let n2 = info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0;
let n3 = info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0;
let n4 = info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0;
let num = n1 + n2 + n3 +n4;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 + info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0 + info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0 + info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0,
num: num,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};

25
src/components/drawers/AssessmentList.vue
View File

@@ -182,18 +182,25 @@ export default {
let data = tableData;
let array = [];
data.map((value, index) => {
let n1 = value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 ;
let n2 = value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0;
let n3 = value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0;
let n4 = value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0;
let num = n1 + n2 + n3 +n4;
let obj = {
key: index,
assessmentId: value.assessmentId,
num:value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 + value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0 + value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0 + value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),

4
src/components/drawers/MemberList.vue
View File

@@ -330,8 +330,8 @@ export default {
gangw: value.userInfoBo.jobName, //岗位
completeStageCnt: value.completeStageCnt, //当前完成阶段数
totalStageCnt: value.totalStageCnt, //总阶段数
//progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对
progress: 0 + "/" + value.totalStageCnt,
progress: value.completeStageCnt + "/" + value.totalStageCnt,
stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
};

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

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

10
src/views/courselibrary/CoursewareManage.vue
View File

@@ -1719,8 +1719,8 @@
:placeholder="[' 课程开始时间', ' 课程结束时间']"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
moment('00:00', 'HH:mm'),
moment('23:59', 'HH:mm'),
],
}"
/>
@@ -1949,7 +1949,7 @@
<a-range-picker
style="width: 440px; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm"
v-model:value="xjkkinputV3"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
@@ -4936,8 +4936,8 @@ export default defineComponent({
state.checked1 = item.applyFlag === 1 ? true : false;
state.filesList = item.attach ? item.attach.split(",") : [];
state.xjkkinputV3 = [
dayjs(item.beginTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(item.endTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(item.beginTime, "YYYY-MM-DD HH:mm"),
dayjs(item.endTime, "YYYY-MM-DD HH:mm"),
];
options4CurId.value = item.teacherId;
// (state.regisCom = item.completeType.split(",")[0] == "1" ? true : false),

6
src/views/courselibrary/CoursewareManage_Old.vue
View File

@@ -2247,7 +2247,7 @@
<a-range-picker
style="width: 440px; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm"
v-model:value="xjkkinputV3"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
@@ -4875,8 +4875,8 @@ export default defineComponent({
state.checked1 = item.applyFlag === 1 ? true : false;
state.filesList = item.attach ? item.attach.split(",") : [];
state.xjkkinputV3 = [
dayjs(item.beginTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(item.endTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(item.beginTime, "YYYY-MM-DD HH:mm"),
dayjs(item.endTime, "YYYY-MM-DD HH:mm"),
];
options4CurId.value = item.teacherId;
// (state.regisCom = item.completeType.split(",")[0] == "1" ? true : false),

9
src/views/examine/ProjectReviewed.vue
View File

@@ -52,15 +52,10 @@
<div class="inpbox1">
<a-range-picker
v-model:value="valueDate"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
],
}"
show-time
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
format="YYYY/MM/DD HH:mm"
/>
</div>
</div>

17
src/views/learningpath/LevelAddDetail.vue
View File

@@ -380,6 +380,7 @@
</div>
<div class="lin"></div>
</div>
<!-- TODO1216
<div class="item" @click="showDrawerAddDiscuss">
<div class="itcon">
<div class="img">
@@ -401,7 +402,7 @@
/>
</div>
<div class="lin"></div>
</div>
</div>-->
<div class="item" @click="showDrawerAddActive">
<div class="itcon">
<div class="img">
@@ -474,13 +475,14 @@
</div>
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddVote">
<div class="itcon">
<div class="img">
<img src="../../assets/images/leveladd/tou.png" />
</div>
<div class="text">投票</div>
<!-- 添加投票侧弹窗 -->
<div>
<add-vote
v-model:addvoteVisible="addvotevisible"
@@ -494,10 +496,11 @@
v-model:routerTaskId="routerTaskId"
/>
</div>
<!-- 添加投票侧弹窗 -->
</div>
<div class="lin"></div>
</div>
-->
<div class="item" @click="showDrawerAddProj">
<div class="itcon">
<div class="img">
@@ -1049,11 +1052,11 @@ import AddOnline from "../../components/drawers/AddOnline.vue";
import AddCase from "../../components/drawers/AddCase.vue";
import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.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";
@@ -1077,12 +1080,12 @@ export default {
AddOnline,
AddCase,
AddHomework,
AddDiscuss,
//AddDiscuss,
AddActive,
AddTest,
AddEval,
AddInvist,
AddVote,
//AddVote,
AddLive,
AddRef,
draggable,

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

@@ -98,14 +98,14 @@
<div class="in">
<a-range-picker
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
:disabled="viewDetail ? true : false"
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:disabled="viewDetail ? true : false"
/>
</div>
</div>

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

@@ -46,6 +46,7 @@
<div class="select addTimeBox">
<div class="addTime">创建时间：</div>
<a-range-picker
show-time
v-model:value="searchParam.valueDate"
format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px"

2
src/views/projectcenter/SonProject.vue
View File

@@ -94,7 +94,7 @@
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:disabled="viewDetail ? true : false"
/>

28
src/views/projectcenter/TaskAdd.vue
View File

@@ -316,6 +316,7 @@
<!-- 添加外链侧弹窗 -->
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddDiscuss">
<div class="itcon">
<div class="img">
@@ -323,7 +324,7 @@
</div>
<div class="text">讨论</div>
</div>
<!-- 添加讨论侧弹窗 -->
<div>
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
@@ -336,9 +337,10 @@
@changeData="updateTableData"
/>
</div>
<!-- 添加讨论侧弹窗 -->
<div class="lin"></div>
</div>
-->
<div class="item" @click="showDrawerAddActive">
<div class="itcon">
<div class="img">
@@ -405,16 +407,18 @@
v-model:EditInvistId="EditInvistId"
/>
</div>
<!-- 添加评估侧弹窗 -->
<div class="lin"></div>
</div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddVote">
<div class="itcon">
<div class="img">
<img src="../../assets/images/leveladd/tou.png" />
</div>
<div class="text">投票</div>
<!-- 添加投票侧弹窗 -->
<div>
<add-vote
v-model:addvoteVisible="addvotevisible"
@@ -430,10 +434,12 @@
v-model:ballotId="ballotId"
/>
</div>
<!-- 添加投票侧弹窗 -->
</div>
</div>
</div>
-->
</div>
<div class="boom">
<div class="boomcen">
<div class="onerow">
@@ -1052,11 +1058,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.vue";
//import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexTaskadd";
import * as apistage from "../../api/indexStage";
@@ -1076,11 +1082,11 @@ export default {
AddTest,
AddLive,
AddRef,
AddDiscuss,
// AddDiscuss,
AddActive,
AddEval,
AddInvist,
AddVote,
//AddVote,
// UnlockMode,
},
setup() {

26
src/views/projectcenter/temTask.vue
View File

@@ -329,6 +329,7 @@
<!-- 添加外链侧弹窗 -->
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddDiscuss">
<div class="itcon">
<div class="img">
@@ -336,7 +337,7 @@
</div>
<div class="text">讨论</div>
</div>
<!-- 添加讨论侧弹窗 -->
<div>
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
@@ -349,10 +350,10 @@
v-model:projectTaskId="projectTaskId"
@changeData="updateTableData"
/>
</div>
<!-- 添加讨论侧弹窗 -->
</div>
<div class="lin"></div>
</div>
</div>-->
<div class="item" @click="showDrawerAddActive">
<div class="itcon">
<div class="img">
@@ -425,13 +426,15 @@
<!-- 添加评估侧弹窗 -->
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddVote">
<div class="itcon">
<div class="img">
<img src="../../assets/images/leveladd/tou.png" />
</div>
<div class="text">投票</div>
<!-- 添加投票侧弹窗 -->
<div>
<add-vote
v-model:addvoteVisible="addvotevisible"
@@ -447,9 +450,12 @@
v-model:ballotId="ballotId"
/>
</div>
<!-- 添加投票侧弹窗 -->
</div>
</div>
-->
</div>
<div class="boom">
<div class="boomcen">
@@ -1069,11 +1075,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.vue";
//import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable";
@@ -1131,11 +1137,11 @@ export default {
AddTest,
AddLive,
AddRef,
AddDiscuss,
//AddDiscuss,
AddActive,
AddEval,
AddInvist,
AddVote,
//AddVote,
// UnlockMode,
},
setup() {

2
src/views/projectcenter/templateAdd.vue
View File

@@ -82,7 +82,7 @@
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
/>
</div>