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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-06 14:46:33 +08:00
parent e179da897c 21699f2c52
commit eddf03ee75
14 changed files with 430 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
package-lock.json generated
View File

@@ -13,6 +13,7 @@
"ant-design-vue": "^3.2.12",
"axios": "^1.1.3",
"core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1",
@@ -4949,9 +4950,9 @@
}
},
"node_modules/dayjs": {
"version": "1.11.5",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
"version": "1.11.6",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
},
"node_modules/debug": {
"version": "4.3.4",
@@ -15686,9 +15687,9 @@
}
},
"dayjs": {
"version": "1.11.5",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
"version": "1.11.6",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
},
"debug": {
"version": "4.3.4",

BIN
src/assets/del.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

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

@@ -47,11 +47,12 @@
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-key="(record) => record.assessmentId"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
filterMultiple:false
/>
@@ -74,7 +75,7 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { reactive, toRefs, watch } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
@@ -94,12 +95,20 @@ export default {
type: Boolean,
default: false,
},
assessmentName:{
type:String,
assessmentName: {
type: String,
default: null,
}
},
},
setup(props, ctx) {
watch(
props,
(newVal) => {
state.selectedRowKeys = [newVal.assessmentId];
},
{ deep: true }
);
const state = reactive({
assessmentVisible: false,
assessment: null,
@@ -109,18 +118,17 @@ export default {
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
assessmentId:null,
assessmentName:null,
assessmentId: null,
assessmentName: null,
});
const closeDrawer = () => {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true);
};
const afterVisibleChange = (bool) => {
console.log("state getAllInvistText", bool,"======",props.titleTag);
if (props.assessmentVisible&&bool) {
console.log("state getAllInvistText", bool, "======", props.titleTag);
if (props.assessmentVisible && bool) {
getAllInvistText();
}
};
@@ -162,9 +170,8 @@ export default {
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.assessment =selectedRows;
state.assessment = selectedRows;
/* state.assessmentId = selectedRows.assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
@@ -172,7 +179,7 @@ export default {
console.log("state.assessment",state.assessment);
state.selectedRowKeys = [];
closeDrawer();*/
},
},
};
// const onSelectChange = (selectedRowKeys) => {
// if(selectedRowKeys.length>2){return}
@@ -182,15 +189,13 @@ export default {
const onSelectChange = (selectedRowKeys, selectRow) => {
console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectRow;
console.log(selectRow)
state.assessment =selectRow[0];
console.log(selectRow);
state.assessment = selectRow[0];
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
state.selectedRowKeys = [];
closeDrawer();
};
@@ -251,7 +256,7 @@ export default {
getAllInvistText,
resetInvist,
handelChangePage,
onSelectChange
onSelectChange,
};
},
};

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

@@ -276,7 +276,7 @@ export default {
evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD") : "",
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationFlag: state.description,
evaluationExplain: state.description,
evaluationPictureAddress: "",
evaluationTag: "",
updateTime: "",

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

@@ -83,6 +83,7 @@
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
:assessmentId="assessmentId"
@checkedAss="getCheckedAss"
/>
</div>
@@ -157,10 +158,10 @@ export default {
type: Number,
default: null,
},
projectTemplateId:{
projectTemplateId: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
const state = reactive({
@@ -178,6 +179,7 @@ export default {
titleTag: false,
});
const getCheckedAss = (ass) => {
state.assessmentId = ass.assessmentId;
state.assessment = ass;
state.assessment1 = null;
};
@@ -207,7 +209,7 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.EditInvistId })
.then((res) => {
console.log(res)
console.log(res);
//更新讨论信息
state.assessment1 = res.data.data;
})

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

@@ -1,20 +1,20 @@
<!-- 直播抽屉 -->
<template>
<a-drawer
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}直播</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -23,18 +23,18 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
/>
</div>
</div>
@@ -44,13 +44,12 @@
</div>
<div class="textarea">
<a-textarea
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div>
</div>
@@ -58,19 +57,19 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时间：</span>
</div>
<div class="btnbox">
<a-range-picker
show-time
style="width: 424px"
v-model:value="time"
format="YYYY/MM/DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']"
show-time
style="width: 424px"
v-model:value="time"
format="YYYY/MM/DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
@@ -78,24 +77,24 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时长：</span>
</div>
<div class="btnbox">
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
:min="0"
:max="300"
:precision="0"
style="
width: 364px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2"
v-model:value="inputV2"
></a-input-number>
<span style="margin-left: 5px">分钟</span>
</div>
@@ -104,40 +103,42 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">授课老师：</span>
</div>
<div class="btnbox">
<ProjectManager v-model:value="memberValue.value"
v-model:name="memberValue.label"></ProjectManager>
<ProjectManager
v-model:value="memberValue.value"
v-model:name="memberValue.label"
></ProjectManager>
</div>
</div>
<div class="mbl_items2">
<div class="item_nam">
<div class="asterisk_icon">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 14px">直播封面</span>
</div>
<div class="item_inp">
<a-upload
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<img
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
/>
<div class="i_upload" v-else>
<div class="addimg">
@@ -157,10 +158,10 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
:maxlength="100"
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
:maxlength="100"
/>
</div>
</div>
@@ -169,7 +170,7 @@
<span style="margin-right: 3px">回放设置：</span>
</div>
<div class="btnbox">
<a-switch v-model:checked="switchC1"/>
<a-switch v-model:checked="switchC1" />
</div>
</div>
<div v-if="switchC1">
@@ -179,10 +180,10 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
:maxlength="100"
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
:maxlength="100"
/>
</div>
</div>
@@ -193,29 +194,28 @@
</div>
<div class="btnbox2">
<a-checkbox
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估
</a-checkbox
>
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估
</a-checkbox>
</div>
</div>
<div v-if="needEval" class="main_item">
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="(assessmentId > 0)">
<div v-if="assessmentId > 0">
<a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px"
>{{assessmentName}}</span
>
<span style="font-size: 14px; line-height: 33px">{{
assessmentName
}}</span>
</a-tag>
</div>
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
/>
</div>
</div>
@@ -233,32 +233,32 @@
<div class="timerbox">
<span>开始前：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV6"
v-model:value="inputV6"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV7"
v-model:value="inputV7"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
@@ -288,7 +288,7 @@
</div> -->
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">完成标准设置：</span>
@@ -303,18 +303,16 @@
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">其他设置：</span>
</div>
<div class="btnbox">
<a-checkbox
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成
</a-checkbox
>
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成
</a-checkbox>
</div>
</div>
</div>
@@ -327,18 +325,18 @@
</a-drawer>
</template>
<script>
import {reactive, toRefs, ref} from "vue";
import {message} from "ant-design-vue";
import { reactive, toRefs, ref } from "vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexLiveBroadcast";
import * as apiTask from "../../api/indexTaskadd";
import {toDate} from "@/api/method";
import {RouterEditTask} from "@/api/indexTask";
import {addTempTask} from "../../api/indexTaskadd";
import {getMemberInfo} from "@/api/index1";
import { toDate } from "@/api/method";
import { RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import { getMemberInfo } from "@/api/index1";
import dayjs from "dayjs";
import {fileUp} from "../../api/indexEval";
import { fileUp } from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue";
import {debounce} from "lodash-es";
import { debounce } from "lodash-es";
import ProjectManager from "@/components/project/ProjectManager";
// import { useRouter } from "vue-router";
@@ -402,7 +400,6 @@ export default {
type: Number,
default: null,
},
},
setup(props, ctx) {
// const router = useRouter();
@@ -441,7 +438,7 @@ export default {
needEval: false,
switchC2: false,
assessmentVisible: false,
assessmentName:"",
assessmentName: "",
});
const closeDrawer = () => {
ctx.emit("update:addliveVisible", false);
@@ -462,7 +459,7 @@ export default {
state.imageUrl = "";
state.needEval = false;
state.switchC2 = false;
state.assessmentId =null;
state.assessmentId = null;
ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
@@ -472,57 +469,60 @@ export default {
queryLive();
}
api
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
});
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
});
});
};
const queryLive = () => {
let d = props.EditLiveId;
api
.getLiveBroadcastInfor({liveId: d})
.then((res) => {
console.log("获取的数据",res)
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
];
console.log(state.time)
.getLiveBroadcastInfor({ liveId: d })
.then((res) => {
console.log("获取的数据", res);
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
];
console.log(state.time);
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == '1' ? true : false;
state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
})
.catch(() => {
//message.error(`查询失败`);
});
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === "1" ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == "1" ? true : false;
state.memberValue = {
value: res.data.data.liveTeacherId || "",
label: res.data.data.liveTeacherName || "",
};
})
.catch(() => {
//message.error(`查询失败`);
});
};
const cloradio1 = (value) => {
if (state.radioV1 === value.target._value) {
@@ -560,31 +560,31 @@ export default {
routerTaskId: props.routerTaskId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
console.log("props.projectTemplateId", props.projectTemplateId);
addTempTask({
@@ -596,18 +596,17 @@ export default {
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
};
const showAssessment = () => {
state.assessmentVisible = true;
};
//创建直播
const updateLiveBroadcast = () => {
@@ -624,7 +623,7 @@ export default {
message.destroy();
return message.warning("请输入直播时长");
}
if (state.memberValue.value=="") {
if (state.memberValue.value == "") {
message.destroy();
return message.warning("请选择授课教师");
}
@@ -638,17 +637,20 @@ export default {
return message.warning("直播时长需大于0");
}
let startTime = toDate(
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D h:m"
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D h:m"
);
let endTime = toDate(
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D h:m"
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D h:m"
);
state.obj = {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
assessmentId:
state.assessmentId == null || state.assessmentId == ""
? 0
: Number(state.assessmentId),
liveCover: state.imageUrl, //直播封面
liveDuration: Number(state.inputV2),
liveEndTime: endTime,
@@ -663,48 +665,46 @@ export default {
liveTeacherId: state.memberValue.value,
liveTeacherName: state.memberValue.label,
otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8,
signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0",
};
console.log('我是要更新的数据',state.obj )
console.log("我是要更新的数据", state.obj);
if (props.edit) {
api
.updateLiveBroadcastMessage(state.obj)
.then(async (res) => {
console.log(res)
message.destroy();
message.success("提交成功");
closeDrawer();
await updateTask(res);
})
.catch((err) => {
console.log(err)
});
.updateLiveBroadcastMessage(state.obj)
.then(async (res) => {
console.log(res);
message.destroy();
message.success("提交成功");
closeDrawer();
await updateTask(res);
})
.catch((err) => {
console.log(err);
});
} else {
api
.createLiveBroadcast(state.obj)
.then(async (res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {
});
.createLiveBroadcast(state.obj)
.then(async (res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {});
}
};
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
const isJpgOrPng =
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
if (!isJpgOrPng) {
message.destroy();
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
@@ -732,7 +732,7 @@ export default {
};
const templateScroll = (e) => {
console.log("滚动", e);
const {target} = e;
const { target } = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
@@ -758,20 +758,20 @@ export default {
pageSize: state.pageSize,
};
getMemberInfo(obj)
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
};
const handleSearch = debounce((memberValue) => {
console.log("fetching user", memberValue);
@@ -800,10 +800,10 @@ export default {
// 删除评估
const removePG = () => {
console.log("11111")
console.log("11111");
state.assessmentId = "";
state.isEvaluate = "0";
}
};
return {
...toRefs(state),
@@ -821,7 +821,7 @@ export default {
templateScroll,
handleSearch,
showAssessment,
removePG
removePG,
};
},
};

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

@@ -117,7 +117,7 @@ export default {
width: 74%;
display: flex;
justify-content: space-between;
margin-bottom: 20px;
margin-bottom: 66px;
.itemcontent {
width: 500px;
word-break: break-all;

6
src/components/project/ProjectManager.vue
View File

@@ -69,7 +69,7 @@ export default {
onMounted(() => {
console.log("onMounted");
// init()
init()
});
function getMember() {
@@ -138,13 +138,13 @@ export default {
} else {
state.managerArray = [];
}
getMemberData();
// getMemberData();
return;
}
if (!props.value) {
if (!(state.options && state.options.length)) {
state.options = [];
getMember();
// getMember();
}
return;
}

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

@@ -129,13 +129,22 @@
action="/manageApi/vote/baseVoteupload"
v-model:file-list="fileList"
> -->
<a-upload
:before-upload="beforeUpload"
:multiple="false"
:max-count="1"
v-model:file-list="fileList"
>
<a-upload :before-upload="beforeUpload" :max-count="1">
<button class="xkbtn">点击上传</button>
<template #itemRender="{ file, actions }">
<a-space v-if="file.type.indexOf('sheet') > -1">
<span :style="file.status === 'error' ? 'color: red' : ''">
{{ file.name }}
</span>
<a href="javascript:;" @click="actions.remove">
<img
src="../../assets/del.png"
alt="del"
style="width: 12px; height: 12px"
/>
</a>
</a-space>
</template>
</a-upload>
<div v-if="voteCount > 0">
<a-tag color="processing">
@@ -144,6 +153,8 @@
</span>
</a-tag>
</div>
<button class="xkbtn" @click="downloadTemplate">下载模板
</button>
</div>
</div>
<div class="main_item" style="margin-top: -25px">
@@ -286,36 +297,22 @@ export default {
// 限制文件格式上传
const beforeUpload = (file) => {
console.log(file);
if (file.type.indexOf("sheet") == -1) {
message.destroy();
message.error("请上传正确的文件格式");
console.log(state.fileList);
state.fileList = [];
return;
return false;
}
// let resFileList = [...info.fileList];
// resFileList.map((file) => {
// if (file.response) {
// // Component will show file.url as link
// file.url = file.response.url;
// console.log("file========", file);
// console.log("file========", file.response);
// state.voteCount = file.response.data;
// }
// });
const formData = new FormData();
formData.append("uploadFile", file);
baseVoteupload(formData).then((res) => {
if (res.data.code === 200) {
console.log(res);
state.basevote = res.data.data;
}
});
return false;
};
//删除题干信息接口
@@ -470,8 +467,14 @@ export default {
state.ballotId = null;
console.log(e);
};
function downloadTemplate() {
window.open('/manageApi/投票基础数据模版.xlsx')
}
return {
...toRefs(state),
downloadTemplate,
showDrawerCreVote,
afterVisibleChange,
closeDrawer,

20
src/components/vote/CreateVote.vue
View File

@@ -264,15 +264,17 @@ export default {
};
const handleDel = ({ id, curItem }) => {
// 接口删除
if (curItem.voteStemId) {
api.deleteVoteStem(curItem.voteStemId).then((res) => {
if (res.data.code === 200) {
virtualDel(id);
}
});
} else {
virtualDel(id);
if (state.allFormsData.length > 1) {
// 接口删除
if (curItem.voteStemId) {
api.deleteVoteStem(curItem.voteStemId).then((res) => {
if (res.data.code === 200) {
virtualDel(id);
}
});
} else {
virtualDel(id);
}
}
};
const virtualDel = (id) => {

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

@@ -270,7 +270,7 @@
:closable="false"
wrapClassName="modalStyle facteachModal"
width="80%"
@cancel="ft_exit"
@cancel="ft_exit_1"
>
<div class="modalHeader">
<div class="headerLeft">
@@ -283,7 +283,7 @@
</div>
<div style="margin-right: 57px; cursor: pointer">
<img
@click="ft_exit"
@click="ft_exit_1"
style="width: 22px; height: 22px"
src="../../assets/images/basicinfo/close22.png"
/>
@@ -672,7 +672,7 @@
:mode="mode"
/>
<Editor
style="height: 500px; overflow-y: hidden"
style="height: 300px; overflow-y: hidden"
v-model="valueHtml"
:defaultConfig="editorConfig"
:mode="mode"
@@ -682,14 +682,14 @@
</div>
</div>
<div class="m_btn">
<div class="btn btn5" @click="ft_exit">
<div class="btn btn5" @click="ft_exit_1">
<div class="btnText">取消</div>
</div>
<div class="btn btn6" v-if="isEdit == 0" @click="handlePush">
<div class="btnText">确定</div>
<div class="btnText">保存</div>
</div>
<div class="btn btn6" v-if="isEdit == 1">
<div class="btnText">已保存</div>
<div class="btnText">未提交</div>
</div>
<div class="btn btn6" @click="reviewClick">
<div class="btnText">提交审核</div>
@@ -3041,6 +3041,7 @@ import {
watch,
} from "vue";
import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
// import StuAdd from "../../components/drawers/StuAdd";
// import OwnPower from "../../components/drawers/OwnPower.vue";
// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
@@ -3836,16 +3837,16 @@ export default defineComponent({
const valueHtml = ref("");
// // 模拟 ajax 异步获取内容
onMounted(() => {
// setTimeout(() => {
// // valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
// console.log("toolbar222222222222222");
// console.log(editorRef.value);
// // const toolbar = DomEditor.getToolbar(editorRef.value);
// // const menu = editorRef.value.getAllMenuKeys();
// // const bar = toolbar.getConfig().toolbarKeys;
// // console.log(menu);
// // console.log(bar);
// }, 3500);
setTimeout(() => {
// valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
console.log("toolbar222222222222222");
console.log(editorRef.value);
// const toolbar = DomEditor.getToolbar(editorRef.value);
// const menu = editorRef.value.getAllMenuKeys();
// const bar = toolbar.getConfig().toolbarKeys;
// console.log(menu);
// console.log(bar);
}, 3500);
});
const toolbarConfig = {
@@ -3865,17 +3866,41 @@ export default defineComponent({
});
},
};
const handleCreated = (editor) => {
console.log("toolbar2222222222333333322222");
console.log(editorRef.value);
editorRef.value = editor; // 记录 editor 实例，重要！
};
// 组件销毁时，也及时销毁编辑器
onBeforeUnmount(() => {
const editor = editorRef.value;
if (editor == null) return;
editor.destroy();
});
const handleCreated = (editor) => {
editorRef.value = editor; // 记录 editor 实例，重要！
};
watch(
() => state,
(newVal) => {
console.log("newVal3333333333333333333");
console.log(newVal.ft_hs);
if (!newVal.ft_hs) {
console.log("newVal.ft_hs11111111111111");
// const editor = editorRef.value;
// if (editor == null) return;
// editor.destroy();
// router.go(0);
}
},
{
deep: true,
}
);
// 富文本 eeeeeeeeeeeeee
const route = useRoute();
console.log(route);
const router = useRouter();
console.log(router);
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
const isJpgOrPng =
@@ -4517,8 +4542,11 @@ export default defineComponent({
}
return count ? false : true;
};
const ft_exit = () => {
const ft_exit_1 = () => {
state.ft_hs = false;
router.go(0);
};
const ft_exit = () => {
state.ft_eidt = false;
state.hideshow = true;
@@ -4542,13 +4570,9 @@ export default defineComponent({
const handlelookMs = () => {
state.lookMs = false;
};
//保存面授课
const handlePush = (param) => {
//state.isEdit = 1;
console.log("========", state.addLoading);
console.log("state.imgList");
console.log(state.imgList);
let files = "";
if (state.imgList.length) {
state.imgList.forEach((item) => {
@@ -4556,7 +4580,7 @@ export default defineComponent({
});
}
files = files.slice(0, files.length - 1);
console.log(files);
console.log("filesfiles", files);
const postData = {
offcourseId: state.offcourseId, //不传代表新增
name: state.qdms_inputV1,
@@ -4594,9 +4618,10 @@ export default defineComponent({
edit(postData).then((res) => {
if (res.data.code === 200) {
getTableDate();
ft_exit();
// ft_exit_1();
rest();
state.addLoading = false;
state.isEdit = 1;
// console.log("res.data", res.data);
if (param === "review") {
//新建时点击审核按钮
@@ -5064,10 +5089,8 @@ export default defineComponent({
};
//获取教师
const getTea = async () => {
console.log("获取授课教师信息33333333333");
options4CurName.value = state.teacher;
options4CurId.value = state.teacherId;
const item1 = await getMemberInfoApi({
pageNo: state.currentPageTea1,
pageSize: state.pageSizeTea1,
@@ -5141,7 +5164,6 @@ export default defineComponent({
state.teacherId = item.teacherId;
state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher };
if (item.attach == "") {
state.imgList = [];
} else {
@@ -5411,6 +5433,8 @@ export default defineComponent({
//提交审核
const reviewClick = () => {
console.log("ft_eidt", state.ft_eidt);
handlePush("review");
/*
if (state.ft_eidt) {
//编辑面授课
submitReview();
@@ -5419,6 +5443,7 @@ export default defineComponent({
//shouke
handlePush("review");
}
*/
};
const submitReview = (id) => {
state.addLoading = true;
@@ -5434,7 +5459,7 @@ export default defineComponent({
handle(obj).then((res) => {
console.log("提交审核成功", res.data);
if (res.data.code === 200) {
ft_exit();
ft_exit_1();
rest();
getTableDate();
state.addLoading = false;
@@ -5586,6 +5611,7 @@ export default defineComponent({
bs_hShow,
createft,
ft_exit,
ft_exit_1,
om_exit,
ckxq_hs,
ftsr_exit,

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

@@ -68,35 +68,61 @@
/>
<div class="inname">封面图</div>
</div>
<div
:class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
cursor: pointer;
position: relative;
overflow: hidden;
"
v-for="(src, index) in projectPic"
:key="index"
@click="
() => {
projectInfo.picUrl = src;
}
"
>
<div class="in select" style="flex:1">
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="projectInfo.picUrl"
dropdownClassName="dropdown-style"
style="width: 440px"
placeholder="请选择"
:options="projectPic"
allowClear
></a-select>
<img
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src"
alt="avatar"
style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
v-if="projectInfo.picUrl"
:src="projectInfo.picUrl"
alt="avatar"
/>
<div class="i_bottom">
<span style="color: #999ba3">
高宽比为16:9 (如:800*450) png或jpg图片
</span>
</div>
</div>
<!-- <div-->
<!-- :class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"-->
<!-- style="-->
<!-- width: 100px;-->
<!-- height: 100px;-->
<!-- border-radius: 5px;-->
<!-- cursor: pointer;-->
<!-- position: relative;-->
<!-- overflow: hidden;-->
<!-- "-->
<!-- v-for="(src, index) in projectPic"-->
<!-- :key="index"-->
<!-- @click="-->
<!-- () => {-->
<!-- projectInfo.picUrl = src;-->
<!-- }-->
<!-- "-->
<!-- >-->
<!-- <img-->
<!-- style="-->
<!-- width: 100px;-->
<!-- height: 100px;-->
<!-- margin-bottom: 4px;-->
<!-- margin-right: 4px;-->
<!-- "-->
<!-- :src="src"-->
<!-- alt="avatar"-->
<!-- />-->
<!-- </div>-->
</div>
<div class="name">
<div class="namebox">
@@ -333,7 +359,7 @@ export default {
});
onMounted(() => {
state.projectPic = store.state.projectPic.map((e) => e.dictValue);
state.projectPic = store.state.projectPic.map((e) => ({value:e.dictValue,label:e.dictName}));
state.viewDetail = routers.query.viewDetail;
getProjectInfo();
getTemplate();

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

@@ -901,6 +901,7 @@ export default {
{value: 2, label: "审核通过"},
{value: 3, label: "已发布"},
{value: -2, label: "未通过"},
{value: -1, label: "已结束"}
]);
const searchReset = () => {
state.searchParam = {pageNo: 1, pageSize: 10};

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

@@ -2511,6 +2511,12 @@ export default {
let leng = res.data.data.stageList.length;
if (leng > 0) {
let taskarr = res.data.data.stageList;
console.log('11-22-33',taskarr)
if(taskarr.length==1){
if(taskarr[0].stageId == '0'){
taskarr[0].name = '无阶段任务'
}
}
state.taskSyllabus = taskarr;
}
}