解决冲突

2025-12-15 22:06:45 +08:00 · 2023-02-19 20:30:13 +08:00
parent 0231a33572 3e84518fc6
commit 73a29eb4c6
2 changed files with 189 additions and 175 deletions
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -12,7 +12,9 @@
  >
    <div class="drawerMain">
      <div class="header">
-        <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}直播</div>
+        <div class="headerTitle">
+          {{ taskIndex >= 0 ? "编辑" : "添加" }}直播
+        </div>
        <img
          style="width: 29px; height: 29px; cursor: pointer"
          src="../../assets/images/basicinfo/close.png"
@@ -189,7 +191,8 @@
              <span style="margin-right: 3px">回放设置：</span>
            </div>
            <div class="btnbox">
-              <a-switch v-model:checked="formData.livePlayback"
+              <a-switch
+                v-model:checked="formData.livePlayback"
                @change="getchange(formData.livePlayback)"
              />
            </div>
@@ -281,8 +284,7 @@
              <span style="margin-right: 3px">评估：</span>
            </div>
            <div class="btnbox2">
-              <a-checkbox
-                  v-model:checked="formData.isEvaluate"
+              <a-checkbox v-model:checked="formData.isEvaluate"
                >需要评估
              </a-checkbox>
            </div>
@@ -290,13 +292,18 @@
          <div v-if="formData.isEvaluate" class="main_item">
            <div class="signbox"></div>
            <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>
              </AddInvistRoot>

              <div v-if="formData.assessmentId">
                <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>
              </div>
            </div>
@@ -317,43 +324,43 @@
  </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref} from "vue";
+import { defineEmits, defineProps, ref } from "vue";
 import dayjs from "dayjs";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 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";

 const removePG = () => {
-  formData.value.assessmentId = ''
-  formData.value.assessmentName = ''
+  formData.value.assessmentId = "";
+  formData.value.assessmentName = "";
 };
-const getchange=(mess)=> {
+const getchange = (mess) => {
  console.log(mess); //输出true或者false
 };
 const props = defineProps({
  type: Number,
-  taskList: []
-})
-const visible = ref(false)
+  taskList: [],
+});
+const visible = ref(false);
 const formData = ref({
-  liveName: '',
-  liveLink: '',
-  liveStartTime: '',
-  liveEndTime: '',
-  liveNotice: '',
-  liveDuration: '',
-  liveTeacherId: '',
-  liveTeacherName: '',
-  liveCover: '',
-  beforeSignIn:'',
-  afterSignIn:'',
-  isEvaluate:'',
-  assessmentId:'',
-  assessmentName:'',
-  livePlayback:'',
-})
-const emit = defineEmits({})
+  liveName: "",
+  liveLink: "",
+  liveStartTime: "",
+  liveEndTime: "",
+  liveNotice: "",
+  liveDuration: "",
+  liveTeacherId: "",
+  liveTeacherName: "",
+  liveCover: "",
+  beforeSignIn: "",
+  afterSignIn: "",
+  isEvaluate: "",
+  assessmentId: "",
+  assessmentName: "",
+  livePlayback: "",
+});
+const emit = defineEmits({});
 const taskIndex = ref(-1);
 const dateTime = ref([]);

@@ -361,67 +368,67 @@ const rulesRef = ref({
  liveName: [
    {
      required: true,
-      message: '请输入直播名称',
+      message: "请输入直播名称",
    },
  ],
  liveLink: [
    {
-      type: 'url',
+      type: "url",
      required: true,
-      message: '请输入直播链接',
+      message: "请输入直播链接",
    },
  ],
  liveStartTime: [
    {
      required: true,
-      message: '请选择开始时间',
+      message: "请选择开始时间",
    },
  ],
  liveEndTime: [
    {
      required: true,
-      message: '请选择结束时间',
+      message: "请选择结束时间",
    },
  ],
  liveNotice: [
    {
      required: true,
-      message: '请输入直播公告',
+      message: "请输入直播公告",
    },
  ],
  liveDuration: [
    {
      required: true,
-      message: '请输入直播时长',
+      message: "请输入直播时长",
    },
  ],
  liveTeacherId: [
    {
      required: true,
-      message: '请选择直播教师',
+      message: "请选择直播教师",
    },
  ],
  liveTeacherName: [
    {
      required: true,
-      message: '请选择直播教师',
+      message: "请选择直播教师",
    },
  ],
  liveCover: [
    {
      required: true,
-      message: '请上传直播封面',
+      message: "请上传直播封面",
    },
  ],
 });

-const {resetFields, validate} = Form.useForm(formData, rulesRef);
+const { resetFields, validate } = Form.useForm(formData, rulesRef);

 const closeDrawer = () => {
-  visible.value = false
-  taskIndex.value = -1
-  dateTime.value = []
-  resetFields()
+  visible.value = false;
+  taskIndex.value = -1;
+  dateTime.value = [];
+  resetFields();
 };

 const range = (start, end) => {
@@ -433,12 +440,12 @@ const range = (start, end) => {
 };

 function timeChange(time, timeStr) {
-  formData.value.liveStartTime = timeStr[0]
-  formData.value.liveEndTime = timeStr[1]
+  formData.value.liveStartTime = timeStr[0];
+  formData.value.liveEndTime = timeStr[1];
 }

 const disabledDate = (current) => {
-  return current && current < dayjs().startOf('day');
+  return current && current < dayjs().startOf("day");
 };

 const disabledRangeTime = () => ({
@@ -448,38 +455,47 @@ const disabledRangeTime = () => ({
 });

 async function confirm() {
-  debugger
-  console.log("确定按钮:")
-  await validate().catch(({errorFields}) => {
+  debugger;
+  console.log("确定按钮:");
+  await validate().catch(({ errorFields }) => {
    message.warning(errorFields[0].errors.join());
-    throw Error("数据校验不通过")
+    throw Error("数据校验不通过");
  });
  if (taskIndex.value === -1) {
+<<<<<<< HEAD
    let list = props.taskList
    list.push(
            {name: formData.value.liveName,
              type: props.type,
              info: {...formData.value}
            })
+=======
+    const list = props.taskList;
+    list.push({
+      name: formData.value.liveName,
+      type: props.type,
+      info: { ...formData.value },
+    });
+>>>>>>> 3e84518fc6431b5650dd225e2a6ff09936fbffe0
  } else {
-    const data = props.taskList[taskIndex.value]
-    data.name = formData.value.liveName
-    data.info = formData.value
+    const data = props.taskList[taskIndex.value];
+    data.name = formData.value.liveName;
+    data.info = formData.value;
  }
-  emit('update:taskList', [...props.taskList])
-  closeDrawer()
+  emit("update:taskList", [...props.taskList]);
+  closeDrawer();
 }

 function openDrawer(i, row) {
-  row && (formData.value = {...row.info});
+  row && (formData.value = { ...row.info });
  row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
-  (i >= 0) && (taskIndex.value = i)
-  visible.value = true
+  i >= 0 && (taskIndex.value = i);
+  visible.value = true;
 }

-defineExpose({openDrawer})
+defineExpose({ openDrawer });

-const imageUrl = ref('')
+const imageUrl = ref("");
 const beforeUpload = (file) => {
  const isJpgOrPng =
    file.type === "image/jpg" ||
@@ -503,11 +519,9 @@ const beforeUpload = (file) => {
  formDatas.append("file", file);
  fileUp(formDatas).then((res) => {
    if (res.data.code === 200) {
-      console.log(res.data.data,45);
-        imageUrl.value = process.env.VUE_APP_FILE_PATH +res.data.data
-        formData.value.liveCover =process.env.VUE_APP_FILE_PATH + res.data.data
-
-
+      console.log(res.data.data, 45);
+      imageUrl.value = 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;
      // emit("src", { id: '', src: res.data.data });
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4429,35 +4429,35 @@ export default {
      let endTime = new Date().getTime(endTimes);
      switch (type) {
        case 1:
-          status == 3
+          status == -1
            ? (isEnd = true)
            : nowTime > endTime
            ? (isEnd = true)
            : (isEnd = false);
          break;
        case 3:
-          status == 3
+          status == -1
            ? (isEnd = true)
            : nowTime > endTime
            ? (isEnd = true)
            : (isEnd = false);
          break;
        case 5:
-          status == 3
+          status == -1
            ? (isEnd = true)
            : nowTime > endTime
            ? (isEnd = true)
            : (isEnd = false);
          break;
        case 7:
-          status == 3
+          status == -1
            ? (isEnd = true)
            : nowTime > endTime
            ? (isEnd = true)
            : (isEnd = false);
          break;
        case 10:
-          status == 3
+          status == -1
            ? (isEnd = true)
            : nowTime > endTime
            ? (isEnd = true)