hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-18 15:26:48 +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-06 14:24:41 +08:00
parent 1ad265babc 7043d76bad
commit f25da7acbd
8 changed files with 332 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/config.js
View File

@@ -55,10 +55,10 @@ http.interceptors.response.use(
if (code === 0 || code === 200) { if (code === 0 || code === 200) {
return response; return response;
} else { } else {
if (code === 1000) { // if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self'); // window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self'); // // window.open("http://111.231.196.214:12013/manage/login", '_self');
} // }
console.log("api %o", msg); console.log("api %o", msg);
} }
return response; return response;

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

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

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

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

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

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

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

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

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

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

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

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