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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-17 20:50:43 +08:00
parent 9b8d2a700d 94e0982817
commit 85f84ddee4
21 changed files with 144 additions and 111 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"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time show-time
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px;" style="width: 400px; height: 40px; border-radius: 8px;"
v-model:value="time" v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
@@ -367,8 +367,8 @@ export default {
state.radioV1 = Number(res.data.data.standardSettings); state.radioV1 = Number(res.data.data.standardSettings);
state.time = [ state.time = [
dayjs(res.data.data.activityStartTime, "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:ss"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD HH:mm"),
]; ];
}) })
.catch(() => {}); .catch(() => {});
@@ -468,11 +468,11 @@ export default {
activityAddress: state.inputV3, //活动地址 activityAddress: state.inputV3, //活动地址
activityDuration: state.inputV2, //活动时长 activityDuration: state.inputV2, //活动时长
activityExplain: state.textV2, //活动说明 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 activityId: props.edit ? props.EditActiveId : 0, //活动ID
activityName: state.inputV1, //活动名称 activityName: state.inputV1, //活动名称
activityNotice: state.textV1, //活动公告 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: "", //活动逻辑删除标识 activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到 afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到 beforeSignIn: state.inputV4, //活动开始前多少分钟签到

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

@@ -51,7 +51,7 @@
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time 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="[' 开始时间', ' 结束时间']" /> :placeholder="[' 开始时间', ' 结束时间']" />
</div> </div>
</div> </div>
@@ -251,8 +251,8 @@ export default {
state.evaluationTypeName = res.data.data.evaluationTypeName; state.evaluationTypeName = res.data.data.evaluationTypeName;
state.evaluationTypeId = res.data.data.evaluationTypeId; state.evaluationTypeId = res.data.data.evaluationTypeId;
state.time = res.data.data.evaluationStartTime ? [ state.time = res.data.data.evaluationStartTime ? [
dayjs(res.data.data.evaluationStartTime, "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:ss"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm"),
] : undefined; ] : undefined;
state.description = res.data.data.evaluationExplain; state.description = res.data.data.evaluationExplain;
state.type = res.data.data.type; state.type = res.data.data.type;
@@ -290,9 +290,9 @@ export default {
} }
let objei = { let objei = {
evaluationName: state.inputV1, 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, 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, evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName, evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description, evaluationExplain: state.description,
@@ -329,9 +329,9 @@ export default {
} }
let obj = { let obj = {
evaluationName: state.inputV1, 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, 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, evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName, evaluationTypeName: state.evaluationTypeName,
evaluationExplain: state.description, evaluationExplain: state.description,

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

@@ -540,8 +540,8 @@ export default {
console.log("获取的数据", res); console.log("获取的数据", res);
state.inputV1 = res.data.data.liveName; state.inputV1 = res.data.data.liveName;
state.time = [ state.time = [
dayjs(res.data.data.liveStartTime, "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:ss"), dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
]; ];
console.log(state.time); 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="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">考试排序：</span> <span style="margin-right: 3px">试题排列：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group <a-radio-group

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

@@ -164,19 +164,27 @@ export default {
.queryAppraiseDetailById({ assessmentId: props.assessmentId }) .queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => { .then((res) => {
console.log("查询评估xinxi ", res); console.log("查询评估xinxi ", res);
let info = res.data.data; 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 = { let obj = {
assessmentId: info.assessmentId, assessmentId: info.assessmentId,
name: info.assessmentName, name: info.assessmentName,
num: info.essayQuestionVoList num: num,
? 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,
creator: info.createUser ? info.createUser : "-", creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"), 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 data = tableData;
let array = []; let array = [];
data.map((value, index) => { 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 = { let obj = {
key: index, key: index,
assessmentId: value.assessmentId, assessmentId: value.assessmentId,
num:value.essayQuestionVoList num: num,
? 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,
name: value.assessmentName ? value.assessmentName : "-", name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-", creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"), 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, //岗位 gangw: value.userInfoBo.jobName, //岗位
completeStageCnt: value.completeStageCnt, //当前完成阶段数 completeStageCnt: value.completeStageCnt, //当前完成阶段数
totalStageCnt: value.totalStageCnt, //总阶段数 totalStageCnt: value.totalStageCnt, //总阶段数
//progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对 progress: value.completeStageCnt + "/" + value.totalStageCnt,
progress: 0 + "/" + value.totalStageCnt,
stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间 stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
}; };

28
src/components/drawers/ProjectAudit.vue
View File

@@ -43,9 +43,15 @@
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>项目说明：</span></div> <div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span> <ProjectLevel v-model:value="projectInfo.level" :tag="true"></ProjectLevel>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main">
<TrainClass v-model:value="projectInfo.systemId" :tag="true"></TrainClass>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
@@ -66,18 +72,6 @@
></a-switch> ></a-switch>
</div> </div>
</div> </div>
<div class="set_content">
<div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main">
<ProjectLevel v-model:value="projectInfo.level" :disabled="true"></ProjectLevel>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main">
<TrainClass v-model:value="projectInfo.systemId" :disabled="true"></TrainClass>
</div>
</div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div> <div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main"> <div class="setc_main">
@@ -89,6 +83,12 @@
></a-switch> ></a-switch>
</div> </div>
</div> </div>
<div class="set_content">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_main">
<span style="color: #999999">{{ projectInfo.remark }}</span>
</div>
</div>
</div> </div>
</div> </div>

10
src/components/project/OrgClass.vue
View File

@@ -29,7 +29,11 @@ import {useStore} from "vuex";
const store = useStore(); const store = useStore();
const props = defineProps({ const props = defineProps({
value: String value: String,
disabled: {
type: Boolean,
default: false
}
}) })
const emit = defineEmits({}) const emit = defineEmits({})
@@ -38,9 +42,9 @@ const options = computed(() => store.state.orgtreeList)
const id = computed(() => { const id = computed(() => {
return props.value return props.value
}) })
console.log("store.state.orgtreeList",store.state.orgtreeList);
function change(key, obj) { function change(key, obj) {
console.log(obj[0],key,props.value); console.log(obj[0], key, props.value);
emit('update:name', obj[0]) emit('update:name', obj[0])
emit('update:value', key) emit('update:value', key)
} }

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,8 @@
<div class="projectAdd"> <div class="projectAdd">
<div class="header"> <div class="header">
<span class="title" <span class="title"
>{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span >{{ projectInfo.projectId ? "编辑" : "创建"
}}{{ ptojectType == "3" ? "班级" : "项目" }}</span
> >
<div <div
@click="backPage" @click="backPage"
@@ -103,7 +104,7 @@
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime" v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px" style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange" @change="timeChange"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
/> />
@@ -315,7 +316,7 @@ export default {
classifyList5: [], classifyList5: [],
courseSyncFlag: false, courseSyncFlag: false,
auditDescription: "", auditDescription: "",
ptojectType: null, ptojectType: "",
}); });
// 封面图选择 // 封面图选择
@@ -715,10 +716,12 @@ export default {
.name2 { .name2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
.description { .description {
margin-top: 14px; margin-top: 14px;
margin-left: 11px; margin-left: 11px;
} }
.ant-input-textarea { .ant-input-textarea {
.ant-input { .ant-input {
height: 88px; height: 88px;

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

@@ -46,6 +46,7 @@
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime">创建时间：</div> <div class="addTime">创建时间：</div>
<a-range-picker <a-range-picker
show-time
v-model:value="searchParam.valueDate" v-model:value="searchParam.valueDate"
format="YYYY-MM-DD" format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px" style="border-radius: 8px; height: 40px; margin-left: 5px"
@@ -1566,7 +1567,7 @@ export default {
parentId: value.record.projectId, parentId: value.record.projectId,
name: value.record.name, name: value.record.name,
sourceBelongId: value.record.sourceBelongId, sourceBelongId: value.record.sourceBelongId,
sourceBelongame: value.record.sourceBelongName, sourceBelongName: value.record.sourceBelongName,
manager: value.record.manager, manager: value.record.manager,
managerId: value.record.managerId, managerId: value.record.managerId,
systemId: value.record.systemId, systemId: value.record.systemId,

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

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

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

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

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

@@ -3588,7 +3588,7 @@ export default {
console.log("审核信息是什么", res.data.data.projectAuditLogDtoList); console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
let dataset = res.data.data.projectAuditLogDtoList; let dataset = res.data.data.projectAuditLogDtoList;
state.passInfo = dataset[dataset.length-1]; state.passInfo = dataset[dataset.length-1];
state.isPass = true;
/** /**
for (let i = 0; i < dataset.length; i++) { for (let i = 0; i < dataset.length; i++) {
if (dataset[i].status == -5) { if (dataset[i].status == -5) {

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

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

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

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