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

解决冲突

Browse Source
This commit is contained in:
lpq
2023-02-19 20:30:13 +08:00
parent 0231a33572 3e84518fc6
commit 73a29eb4c6
2 changed files with 189 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,9 @@
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}直播</div> <div class="headerTitle">
{{ taskIndex >= 0 ? "编辑" : "添加" }}直播
</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"
@@ -189,7 +191,8 @@
<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="formData.livePlayback" <a-switch
v-model:checked="formData.livePlayback"
@change="getchange(formData.livePlayback)" @change="getchange(formData.livePlayback)"
/> />
</div> </div>
@@ -281,8 +284,7 @@
<span style="margin-right: 3px">评估：</span> <span style="margin-right: 3px">评估：</span>
</div> </div>
<div class="btnbox2"> <div class="btnbox2">
<a-checkbox <a-checkbox v-model:checked="formData.isEvaluate"
v-model:checked="formData.isEvaluate"
>需要评估 >需要评估
</a-checkbox> </a-checkbox>
</div> </div>
@@ -290,13 +292,18 @@
<div v-if="formData.isEvaluate" class="main_item"> <div v-if="formData.isEvaluate" class="main_item">
<div class="signbox"></div> <div class="signbox"></div>
<div class="btnbox"> <div class="btnbox">
<AddInvistRoot v-model:id="formData.assessmentId" v-model:name="formData.assessmentName"> <AddInvistRoot
v-model:id="formData.assessmentId"
v-model:name="formData.assessmentName"
>
<button class="xkbtn">选择评估</button> <button class="xkbtn">选择评估</button>
</AddInvistRoot> </AddInvistRoot>
<div v-if="formData.assessmentId"> <div v-if="formData.assessmentId">
<a-tag closable @close="removePG" color="processing"> <a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px">{{ formData.assessmentName }}</span> <span style="font-size: 14px; line-height: 33px">{{
formData.assessmentName
}}</span>
</a-tag> </a-tag>
</div> </div>
</div> </div>
@@ -317,43 +324,43 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup> <script setup>
import {defineEmits, defineProps, ref} from "vue"; import { defineEmits, defineProps, ref } from "vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue"; import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue";
import {Form, message} from "ant-design-vue"; import { Form, message } from "ant-design-vue";
import { fileUp } from "../../api/indexEval"; import { fileUp } from "../../api/indexEval";
const removePG = () => { const removePG = () => {
formData.value.assessmentId = '' formData.value.assessmentId = "";
formData.value.assessmentName = '' formData.value.assessmentName = "";
}; };
const getchange=(mess)=> { const getchange = (mess) => {
console.log(mess); //输出true或者false console.log(mess); //输出true或者false
}; };
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: [],
}) });
const visible = ref(false) const visible = ref(false);
const formData = ref({ const formData = ref({
liveName: '', liveName: "",
liveLink: '', liveLink: "",
liveStartTime: '', liveStartTime: "",
liveEndTime: '', liveEndTime: "",
liveNotice: '', liveNotice: "",
liveDuration: '', liveDuration: "",
liveTeacherId: '', liveTeacherId: "",
liveTeacherName: '', liveTeacherName: "",
liveCover: '', liveCover: "",
beforeSignIn:'', beforeSignIn: "",
afterSignIn:'', afterSignIn: "",
isEvaluate:'', isEvaluate: "",
assessmentId:'', assessmentId: "",
assessmentName:'', assessmentName: "",
livePlayback:'', livePlayback: "",
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
@@ -361,67 +368,67 @@ const rulesRef = ref({
liveName: [ liveName: [
{ {
required: true, required: true,
message: '请输入直播名称', message: "请输入直播名称",
}, },
], ],
liveLink: [ liveLink: [
{ {
type: 'url', type: "url",
required: true, required: true,
message: '请输入直播链接', message: "请输入直播链接",
}, },
], ],
liveStartTime: [ liveStartTime: [
{ {
required: true, required: true,
message: '请选择开始时间', message: "请选择开始时间",
}, },
], ],
liveEndTime: [ liveEndTime: [
{ {
required: true, required: true,
message: '请选择结束时间', message: "请选择结束时间",
}, },
], ],
liveNotice: [ liveNotice: [
{ {
required: true, required: true,
message: '请输入直播公告', message: "请输入直播公告",
}, },
], ],
liveDuration: [ liveDuration: [
{ {
required: true, required: true,
message: '请输入直播时长', message: "请输入直播时长",
}, },
], ],
liveTeacherId: [ liveTeacherId: [
{ {
required: true, required: true,
message: '请选择直播教师', message: "请选择直播教师",
}, },
], ],
liveTeacherName: [ liveTeacherName: [
{ {
required: true, required: true,
message: '请选择直播教师', message: "请选择直播教师",
}, },
], ],
liveCover: [ liveCover: [
{ {
required: true, required: true,
message: '请上传直播封面', message: "请上传直播封面",
}, },
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false;
taskIndex.value = -1 taskIndex.value = -1;
dateTime.value = [] dateTime.value = [];
resetFields() resetFields();
}; };
const range = (start, end) => { const range = (start, end) => {
@@ -433,12 +440,12 @@ const range = (start, end) => {
}; };
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.liveStartTime = timeStr[0] formData.value.liveStartTime = timeStr[0];
formData.value.liveEndTime = timeStr[1] formData.value.liveEndTime = timeStr[1];
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf("day");
}; };
const disabledRangeTime = () => ({ const disabledRangeTime = () => ({
@@ -448,38 +455,47 @@ const disabledRangeTime = () => ({
}); });
async function confirm() { async function confirm() {
debugger debugger;
console.log("确定按钮:") console.log("确定按钮:");
await validate().catch(({errorFields}) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过") throw Error("数据校验不通过");
}); });
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
<<<<<<< HEAD
let list = props.taskList let list = props.taskList
list.push( list.push(
{name: formData.value.liveName, {name: formData.value.liveName,
type: props.type, type: props.type,
info: {...formData.value} info: {...formData.value}
}) })
=======
const list = props.taskList;
list.push({
name: formData.value.liveName,
type: props.type,
info: { ...formData.value },
});
>>>>>>> 3e84518fc6431b5650dd225e2a6ff09936fbffe0
} else { } else {
const data = props.taskList[taskIndex.value] const data = props.taskList[taskIndex.value];
data.name = formData.value.liveName data.name = formData.value.liveName;
data.info = formData.value data.info = formData.value;
} }
emit('update:taskList', [...props.taskList]) emit("update:taskList", [...props.taskList]);
closeDrawer() closeDrawer();
} }
function openDrawer(i, row) { function openDrawer(i, row) {
row && (formData.value = {...row.info}); row && (formData.value = { ...row.info });
row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]); row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
(i >= 0) && (taskIndex.value = i) i >= 0 && (taskIndex.value = i);
visible.value = true visible.value = true;
} }
defineExpose({openDrawer}) defineExpose({ openDrawer });
const imageUrl = ref('') const imageUrl = ref("");
const beforeUpload = (file) => { const beforeUpload = (file) => {
const isJpgOrPng = const isJpgOrPng =
file.type === "image/jpg" || file.type === "image/jpg" ||
@@ -503,11 +519,9 @@ const beforeUpload = (file) => {
formDatas.append("file", file); formDatas.append("file", file);
fileUp(formDatas).then((res) => { fileUp(formDatas).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
console.log(res.data.data,45); console.log(res.data.data, 45);
imageUrl.value = process.env.VUE_APP_FILE_PATH +res.data.data imageUrl.value = process.env.VUE_APP_FILE_PATH + res.data.data;
formData.value.liveCover =process.env.VUE_APP_FILE_PATH + res.data.data formData.value.liveCover = process.env.VUE_APP_FILE_PATH + res.data.data;
// state.hasImgName = file.name; // state.hasImgName = file.name;
// emit("src", { id: '', src: res.data.data }); // emit("src", { id: '', src: res.data.data });

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

@@ -4429,35 +4429,35 @@ export default {
let endTime = new Date().getTime(endTimes); let endTime = new Date().getTime(endTimes);
switch (type) { switch (type) {
case 1: case 1:
status == 3 status == -1
? (isEnd = true) ? (isEnd = true)
: nowTime > endTime : nowTime > endTime
? (isEnd = true) ? (isEnd = true)
: (isEnd = false); : (isEnd = false);
break; break;
case 3: case 3:
status == 3 status == -1
? (isEnd = true) ? (isEnd = true)
: nowTime > endTime : nowTime > endTime
? (isEnd = true) ? (isEnd = true)
: (isEnd = false); : (isEnd = false);
break; break;
case 5: case 5:
status == 3 status == -1
? (isEnd = true) ? (isEnd = true)
: nowTime > endTime : nowTime > endTime
? (isEnd = true) ? (isEnd = true)
: (isEnd = false); : (isEnd = false);
break; break;
case 7: case 7:
status == 3 status == -1
? (isEnd = true) ? (isEnd = true)
: nowTime > endTime : nowTime > endTime
? (isEnd = true) ? (isEnd = true)
: (isEnd = false); : (isEnd = false);
break; break;
case 10: case 10:
status == 3 status == -1
? (isEnd = true) ? (isEnd = true)
: nowTime > endTime : nowTime > endTime
? (isEnd = true) ? (isEnd = true)