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

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

Browse Source
This commit is contained in:
yuping
2022-12-16 13:55:00 +08:00
parent 9784f84db3 db5f335e1a
commit eaf36fe377
13 changed files with 196 additions and 150 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.14------------");
console.log("版本0.9.15------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

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

@@ -315,17 +315,7 @@
</a-tag>
</div>
<!-- 添加作业侧弹窗 -->
<div>
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@getWork="getWork"
:faceLevel="true"
v-model:EditWorkId="EditWorkId"
v-model:workName="workName"
/>
</div>
<!-- 添加作业侧弹窗 -->
</div>
<div class="main_item">
<div class="signbox">

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

@@ -328,8 +328,8 @@ export default {
// 新增任务
const updteHomeWork = () => {
let obj = {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"),
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm"),
workEnclosureAddress: state.workEnclosureAddress
? state.workEnclosureAddress
: "",
@@ -379,8 +379,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 HH:mm:ss"),
dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm"),
];
state.addLoading = false;
})

19
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
@@ -307,7 +307,7 @@ import STest from "./SelectTest.vue";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import dayjs from "dayjs";
import { toDate } from "@/api/method";
//import { toDate } from "@/api/method";
export default {
name: "AddTest",
@@ -446,8 +446,8 @@ export default {
state.test.questionArrangement
);
state.test.chooseTime = [
dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
];
state.paperName = state.test.examinationTestName;
// state.paperId=dayjs
@@ -487,14 +487,9 @@ export default {
// new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
// "Y-M-D h:m"
// );
state.test.examinationStartTime = toDate(
new Date(state.test.chooseTime[0].$d).getTime() / 1000,
"Y-M-D h:m"
);
state.test.examinationEndTime = toDate(
new Date(state.test.chooseTime[1].$d).getTime() / 1000,
"Y-M-D h:m"
);
state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format("YYYY-MM-DD HH:mm"),
state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format("YYYY-MM-DD HH:mm"),
state.test.examinationPaperId = state.paperId;
//TODO缺少paperName字段
state.test.examinationTestName = state.paperName;

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

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

9
src/components/project/NameInput.vue
View File

@@ -64,8 +64,13 @@ watch(modelV, () => {
function validateProName() {
emit('update:finished', false);
props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => {
emit('update:validate', res.data.data !== 1)
emit('update:finished', true);
if(props.value==""){
emit('update:validate', res.data.data === 1)
}else{
emit('update:validate', res.data.data !== 1)
emit('update:finished', true);
}
})
}

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

@@ -38,8 +38,9 @@ const options = computed(() => store.state.orgtreeList)
const id = computed(() => {
return props.value
})
console.log("store.state.orgtreeList",store.state.orgtreeList);
function change(key, obj) {
console.log(obj[0],key,props.value);
emit('update:name', obj[0])
emit('update:value', key)
}

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

@@ -2032,6 +2032,46 @@
/>
</div>
</div>
<div class="cstm_items main_item">
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showDrawerAddHomework">配置作业</button>
<div v-if="EditWorkId > 0">
<a-tag closable @close="logW" color="processing">
<span style="font-size: 14px; line-height: 33px">
{{ workName }}
</span>
</a-tag>
</div>
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@getWork="getWork"
:faceLevel="true"
v-model:EditWorkId="EditWorkId"
v-model:workName="workName"
/>
</div>
</div>
<div class="cstm_items main_item">
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showDrawerAddTest">配置考试</button>
<div v-if="EditTestId > 0">
<a-tag closable @close="logT" color="processing">
<span style="font-size: 14px; line-height: 33px">
{{ testName }}
</span>
</a-tag>
</div>
<add-test
v-model:addtestVisible="addtestvisible"
v-model:EditTestId="EditTestId"
v-model:testName="testName"
:faceLevel="true"
/>
</div>
</div>
<!--
<div class="cstm_items">
<div class="signbox">
@@ -2886,6 +2926,10 @@ import CourseModal from "./courseModal.vue";
import * as moment from "moment";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { codeUrl, toDate } from "../../api/method";
import { queryWorkDetailById } from "@/api/indexWork";
import { queryExaminationDetailById } from "@/api/indexExam";
import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
//列表表格
const columns1 = [
// {
@@ -3401,6 +3445,8 @@ export default defineComponent({
ProjPowerList,
ProjCheckShip,
AssessmentList,
AddHomework,
AddTest,
NameInput,
// VNodes: (_, {attrs}) => {
// return attrs.vnodes;
@@ -3671,11 +3717,16 @@ export default defineComponent({
addStudentList: null, //选中列表
newCourseName: null, //新建开课名称
EditWorkId:null,
assessment: {},
assessmentId: null,
workName:null,
EditTestId:null,
testName:null,
assessmentName: "",
assessmentVisible: false,
addhomeworkvisible:false,
addtestvisible:false,
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
@@ -4219,6 +4270,20 @@ export default defineComponent({
const showAssessment = () => {
state.assessmentVisible = true;
};
const showDrawerAddHomework = () => {
state.addhomeworkvisible = true;
};
const showDrawerAddTest = () => {
state.addtestvisible = true;
};
const logW = (e) => {
state.EditWorkId = null;
console.log(e);
};
const logT = (e) => {
state.EditTestId = null;
console.log(e);
};
const removePG = () => {
console.log("11111");
state.assessmentId = null;
@@ -4769,6 +4834,10 @@ export default defineComponent({
state.xjkkinputV4 = null;
state.checked1 = false;
state.checked4 = false;
state.EditTestId = null;
state.assessmentId = null;
state.EditWorkId = null;
removePG();
};
//保存开课
@@ -4795,6 +4864,8 @@ export default defineComponent({
endTime: endTime,
evalFlag: state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId),
testId: state.EditTestId,
homeWorkId: state.EditWorkId,
name: state.xjkkinputV1,
signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
// signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
@@ -4838,15 +4909,25 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data;
});
let obj = {
assessmentId: item.evaluateId,
};
if(item.evaluateId){
api
.queryAppraiseDetailById(obj)
.queryAppraiseDetailById({assessmentId: item.evaluateId})
.then((res) => {
state.assessmentName = res.data.data.assessmentName;
})
.catch();
}
if(item.homeWorkId){
queryWorkDetailById({workId:item.homeWorkId}).then((res)=>{
state.workName = res.data.data.workName;
});
}
if(item.testId){
queryExaminationDetailById({ examinationId: item.testId }).then((res)=>{
state.testName = res.data.data.examinationName;
});
}
console.log("res");
console.log("获取面授课详情", item);
@@ -4865,6 +4946,8 @@ export default defineComponent({
item.completeType.split(",")[1] == "1" ? true : false),
(state.checked4 = item.evalFlag === 1 ? true : false);
state.assessmentId = String(item.evaluateId);
state.EditTestId = String(item.testId);
state.EditWorkId = String(item.homeWorkId);
state.xjkkinputV1 = item.name;
if (item.signFlag === 1) {
//是否允许未报名的签到:1是0否
@@ -5763,7 +5846,8 @@ export default defineComponent({
faceManageChange,
openMessage,
showStuAdd,
showDrawerAddTest,
showDrawerAddHomework,
editorRef,
valueHtml,
mode: "simple", // 或 'simple'
@@ -5806,6 +5890,8 @@ export default defineComponent({
closeOnlineCoursevisible,
handlelookMs,
handleLook,
logW,
logT,
};
},
});

7
src/views/projectcenter/LibraryAdd.vue
View File

@@ -978,12 +978,15 @@ export default defineComponent({
console.log("data=====", data);
for (let i in data) {
console.log("what ------ > ", i, data);
if (data[i].taskList.length !== 0) {
// if (data[i].taskList.length !== 0) {
if(!data[i].name ){
continue;
}
state.taskSyllabus.push({
text: data[i].name ? data[i].name : "无阶段任务",
children: [],
});
}
// }
for (let j in data[i].taskList) {
state.taskSyllabus[i].children.push({

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

@@ -50,7 +50,7 @@
format="YYYY-MM-DD"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
/>
</div>
<div style="display: flex; margin-bottom: 20px">
@@ -827,7 +827,7 @@ import * as moment from "moment";
import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
import { validateName } from "@/api/index1";
import { toDate } from "../../api/method";
//import { toDate } from "../../api/method";
export default {
name: "projectManage",
@@ -1697,16 +1697,13 @@ export default {
beginTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? toDate(
new Date(state.searchParam.valueDate[0].$d).getTime() / 1000,
"Y-M-D")
? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
: "",
endTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? toDate(
new Date(state.searchParam.valueDate[1].$d).getTime() / 1000,
"Y-M-D")
? dayjs(state.searchParam.valueDate[1]).format("YYYY-MM-DD")
: "",
})
.then((res) => {

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

@@ -1390,73 +1390,7 @@ export default {
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd();
// let leng = res.data.data.stageList.length;
// if (leng > 0) {
// let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
//
// // console.log("stage",Object.prototype.toString.call(stage))
// if (stage != null) {
// console.log(stage);
// let stageList = res.data.data.stageList; //阶段数组
//
//
//
// let result = stageList.find((item) => item.stageId == stage);
// console.log("又找到了", result);
// if (result != null) {
// getTableData(result.taskList);
// } else {
// //没有选中的阶段时，获取全部的任务
// console.log(stage);
// let stageList = res.data.data.stageList; //阶段数组
// if (stageList != null) {
// let taskListAll;
// stageList.forEach((item) => {
// taskListAll = [...item.taskList];
// });
// console.log("taskListAll", taskListAll);
// getTableData(taskListAll);
// }
// }
// } else {
// console.log(stage);
// let stageList = res.data.data.stageList; //阶段数组
// if (stageList != null) {
// let taskListAll;
// stageList.forEach((item) => {
// taskListAll = [...item.taskList];
// });
// console.log("taskListAll", taskListAll);
// getTableData(taskListAll);
// }
// }
// // 每次都获取了第一条taskList
// // let arr = res.data.data.stageList[0].taskList;
// // console.log("任务列表", stage, arr);
// // getTableData(arr);
// }
// // //获取阶段列表
// let stagearr = res.data.data.stageList;
// // let arrlist = state.curLevel;
// console.log(stagearr, 111111);
// if (stagearr.length > 0) {
// getStageData(stagearr);
// // stagearr.map((value) => {
// // console.log(value);
// // // arrlist.push(value);
// // });
// }
// //给阶段id赋初始值
// let stageid = localStorage.getItem("stageId")
// ? localStorage.getItem("stageId")
// : null;
// if (stageid !== "null") {
// state.chooseStageId = stageid;
// } else {
// state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
// }
// let final = state.level.find((item) => item.id == state.chooseStageId);
// getTableData(final.taskList);
});
};

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

@@ -2647,6 +2647,7 @@ export default {
// 输入接入 -- start --
// 资源归属 sourceBelongId 后续给接口
state.bum = computed(() => {
console.log("基础信息 store.state.orgtreeList",store.state.orgtreeList);
return store.state.orgtreeList ? store.state.orgtreeList : [];
});

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

@@ -1396,38 +1396,26 @@ export default {
state.tableData = array;
console.log("state.tableData", state.tableData);
};
//把阶段放到level里
const getStageData = (tableData) => {
//把阶段放到level里
const getStageData = (tableData) => {
let data = tableData;
let array = [];
data.map((value) => {
let obj = {
id: value.templateStageId,
tit: value.name,
name: value.remark,
taskList: value.taskList,
value: value.templateStageId,
label: value.name,
};
array.push(obj);
console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0);
if (Number(value.templateStageId) > 0) {
let obj = {
id: value.templateStageId,
tit: value.name,
name: value.remark,
taskList: value.taskList,
value: value.templateStageId,
label: value.name,
courseId: value.courseId ? value.courseId : null,
};
array.push(obj);
}
});
console.log(array);
if (array[0].id == "0") {
state.level = [];
// state.tableData = array[0]
// 当无阶段任务出现时 显示当前数据
if (array[0].taskList.length !== 0) {
getTableData(array[0].taskList);
}
} else {
let datearr = [];
for (let i = 0; i < array.length; i++) {
if (array[i].id !== 0 && array[i].taskList.length !== 0) {
datearr.push(array[i]);
}
}
state.level = datearr;
}
state.level = array;
};
const tableDataFunc = () => {
@@ -1559,6 +1547,7 @@ export default {
};
//获取任务列表
/**
const getTask = () => {
state.tableData = [];
api
@@ -1587,8 +1576,11 @@ export default {
(item) => item.templateStageId == stage
);
console.log("又找到了", result);
changebgc(res.data.data.stageList[0].templateStageId);
getTableData(result.taskList);
if(result !=null ){
changebgc(res.data.data.stageList[0].templateStageId);
getTableData(result.taskList);
}
} else {
let arr = res.data.data.stageList[0].taskList;
console.log("任务列表", arr);
@@ -1597,10 +1589,7 @@ export default {
// state.isActive = true;
}
// 每次都获取了第一条taskList
// let arr = res.data.data.stageList[0].taskList;
// console.log("任务列表", stage, arr);
// getTableData(arr);
}
let stagearr = res.data.data.stageList;
let arrlist = state.curLevel;
@@ -1627,8 +1616,49 @@ export default {
.catch((err) => {
console.log("获取任务列表失败", err);
});
};*/
//获取任务列表
const getTask = async () => {
await api
.templateDetail(localStorage.getItem("projectTemplateId")).then((res) => {
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd();
});
};
function updateStageChoosd() {
console.log("updateStageChoosd");
console.log(state.chooseStageId);
if (
state.chooseStageId &&
state.stageList.find((e) => e.templateStageId == state.chooseStageId)
) {
getTableData(
state.stageList.find((e) => e.templateStageId == state.chooseStageId)
?.taskList
);
return;
}
state.chooseStageId = "";
const arr = state.stageList.filter((e) => e.name);
arr && arr.length && (state.chooseStageId = arr[0].templateStageId);
if (!state.chooseStageId) {
getTableData(state.stageList[0].taskList);
return;
}
console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList);
getTableData(
state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList
);
}
//获取修改、删除id（投票)
const changeVData = (data) => {
console.log("获取修改、删除id投票", data);
@@ -1920,7 +1950,10 @@ export default {
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
getTableData(final.taskList);
if(final !=null){
getTableData(final.taskList);
}
};
//选择单个任务